summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2012-03-14 08:51:40 +0000
committerJannis Leidel <jannis@leidel.info>2012-03-14 08:51:40 +0000
commitf8446024bc1a15f7ffff90cb658a274fa0ca2a9a (patch)
treebf6bfd7dab0dddb17eb07d5da035e303524319c1
parent43cb17bbe50cb72ef9f10a9d959b1adc4d01c304 (diff)
Pulled the core translations updates from Transifex. Refs #17822.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/locale/ar/LC_MESSAGES/django.mobin19396 -> 18044 bytes
-rw-r--r--django/conf/locale/ar/LC_MESSAGES/django.po547
-rw-r--r--django/conf/locale/az/LC_MESSAGES/django.mobin6501 -> 15624 bytes
-rw-r--r--django/conf/locale/az/LC_MESSAGES/django.po807
-rw-r--r--django/conf/locale/bg/LC_MESSAGES/django.mobin19580 -> 21765 bytes
-rw-r--r--django/conf/locale/bg/LC_MESSAGES/django.po766
-rw-r--r--django/conf/locale/bn/LC_MESSAGES/django.mobin13109 -> 12628 bytes
-rw-r--r--django/conf/locale/bn/LC_MESSAGES/django.po568
-rw-r--r--django/conf/locale/bs/LC_MESSAGES/django.mobin13965 -> 13783 bytes
-rw-r--r--django/conf/locale/bs/LC_MESSAGES/django.po594
-rw-r--r--django/conf/locale/ca/LC_MESSAGES/django.mobin16453 -> 18033 bytes
-rw-r--r--django/conf/locale/ca/LC_MESSAGES/django.po556
-rw-r--r--django/conf/locale/cs/LC_MESSAGES/django.mobin16562 -> 18255 bytes
-rw-r--r--django/conf/locale/cs/LC_MESSAGES/django.po561
-rw-r--r--django/conf/locale/cy/LC_MESSAGES/django.mobin3322 -> 3936 bytes
-rw-r--r--django/conf/locale/cy/LC_MESSAGES/django.po547
-rw-r--r--django/conf/locale/da/LC_MESSAGES/django.mobin16055 -> 17704 bytes
-rw-r--r--django/conf/locale/da/LC_MESSAGES/django.po565
-rw-r--r--django/conf/locale/de/LC_MESSAGES/django.mobin16802 -> 18459 bytes
-rw-r--r--django/conf/locale/de/LC_MESSAGES/django.po566
-rw-r--r--django/conf/locale/el/LC_MESSAGES/django.mobin21577 -> 22035 bytes
-rw-r--r--django/conf/locale/el/LC_MESSAGES/django.po555
-rw-r--r--django/conf/locale/en/LC_MESSAGES/django.mobin356 -> 356 bytes
-rw-r--r--django/conf/locale/en/LC_MESSAGES/django.po8
-rw-r--r--django/conf/locale/en_GB/LC_MESSAGES/django.mobin14656 -> 17505 bytes
-rw-r--r--django/conf/locale/en_GB/LC_MESSAGES/django.po589
-rw-r--r--django/conf/locale/es/LC_MESSAGES/django.mobin15163 -> 18157 bytes
-rw-r--r--django/conf/locale/es/LC_MESSAGES/django.po589
-rw-r--r--django/conf/locale/es_AR/LC_MESSAGES/django.mobin16631 -> 15431 bytes
-rw-r--r--django/conf/locale/es_AR/LC_MESSAGES/django.po543
-rw-r--r--django/conf/locale/es_MX/LC_MESSAGES/django.mobin16605 -> 18286 bytes
-rw-r--r--django/conf/locale/es_MX/LC_MESSAGES/django.po553
-rw-r--r--django/conf/locale/et/LC_MESSAGES/django.mobin16130 -> 14945 bytes
-rw-r--r--django/conf/locale/et/LC_MESSAGES/django.po548
-rw-r--r--django/conf/locale/eu/LC_MESSAGES/django.mobin13140 -> 17803 bytes
-rw-r--r--django/conf/locale/eu/LC_MESSAGES/django.po642
-rw-r--r--django/conf/locale/fa/LC_MESSAGES/django.mobin15333 -> 17786 bytes
-rw-r--r--django/conf/locale/fa/LC_MESSAGES/django.po581
-rw-r--r--django/conf/locale/fi/LC_MESSAGES/django.mobin15034 -> 15207 bytes
-rw-r--r--django/conf/locale/fi/LC_MESSAGES/django.po584
-rw-r--r--django/conf/locale/fr/LC_MESSAGES/django.mobin16778 -> 18651 bytes
-rw-r--r--django/conf/locale/fr/LC_MESSAGES/django.po564
-rw-r--r--django/conf/locale/fy_NL/LC_MESSAGES/django.mobin4645 -> 3627 bytes
-rw-r--r--django/conf/locale/fy_NL/LC_MESSAGES/django.po527
-rw-r--r--django/conf/locale/ga/LC_MESSAGES/django.mobin17017 -> 15879 bytes
-rw-r--r--django/conf/locale/ga/LC_MESSAGES/django.po756
-rw-r--r--django/conf/locale/gl/LC_MESSAGES/django.mobin16536 -> 16451 bytes
-rw-r--r--django/conf/locale/gl/LC_MESSAGES/django.po544
-rw-r--r--django/conf/locale/he/LC_MESSAGES/django.mobin17930 -> 19007 bytes
-rw-r--r--django/conf/locale/he/LC_MESSAGES/django.po546
-rw-r--r--django/conf/locale/hi/LC_MESSAGES/django.mobin12032 -> 24224 bytes
-rw-r--r--django/conf/locale/hi/LC_MESSAGES/django.po723
-rw-r--r--django/conf/locale/hr/LC_MESSAGES/django.mobin16412 -> 15327 bytes
-rw-r--r--django/conf/locale/hr/LC_MESSAGES/django.po561
-rw-r--r--django/conf/locale/hu/LC_MESSAGES/django.mobin16805 -> 15984 bytes
-rw-r--r--django/conf/locale/hu/LC_MESSAGES/django.po549
-rw-r--r--django/conf/locale/id/LC_MESSAGES/django.mobin16309 -> 17899 bytes
-rw-r--r--django/conf/locale/id/LC_MESSAGES/django.po554
-rw-r--r--django/conf/locale/is/LC_MESSAGES/django.mobin16663 -> 17791 bytes
-rw-r--r--django/conf/locale/is/LC_MESSAGES/django.po550
-rw-r--r--django/conf/locale/it/LC_MESSAGES/django.mobin16237 -> 17937 bytes
-rw-r--r--django/conf/locale/it/LC_MESSAGES/django.po557
-rw-r--r--django/conf/locale/ja/LC_MESSAGES/django.mobin16535 -> 17173 bytes
-rw-r--r--django/conf/locale/ja/LC_MESSAGES/django.po554
-rw-r--r--django/conf/locale/ka/LC_MESSAGES/django.mobin21465 -> 19788 bytes
-rw-r--r--django/conf/locale/ka/LC_MESSAGES/django.po549
-rw-r--r--django/conf/locale/km/LC_MESSAGES/django.mobin8222 -> 8285 bytes
-rw-r--r--django/conf/locale/km/LC_MESSAGES/django.po559
-rw-r--r--django/conf/locale/kn/LC_MESSAGES/django.mobin12828 -> 24531 bytes
-rw-r--r--django/conf/locale/kn/LC_MESSAGES/django.po822
-rw-r--r--django/conf/locale/ko/LC_MESSAGES/django.mobin17196 -> 15938 bytes
-rw-r--r--django/conf/locale/ko/LC_MESSAGES/django.po539
-rw-r--r--django/conf/locale/lt/LC_MESSAGES/django.mobin16673 -> 18412 bytes
-rw-r--r--django/conf/locale/lt/LC_MESSAGES/django.po572
-rw-r--r--django/conf/locale/lv/LC_MESSAGES/django.mobin13331 -> 12951 bytes
-rw-r--r--django/conf/locale/lv/LC_MESSAGES/django.po581
-rw-r--r--django/conf/locale/mk/LC_MESSAGES/django.mobin19941 -> 22042 bytes
-rw-r--r--django/conf/locale/mk/LC_MESSAGES/django.po569
-rw-r--r--django/conf/locale/ml/LC_MESSAGES/django.mobin23008 -> 22103 bytes
-rw-r--r--django/conf/locale/ml/LC_MESSAGES/django.po562
-rw-r--r--django/conf/locale/mn/LC_MESSAGES/django.mobin19494 -> 21632 bytes
-rw-r--r--django/conf/locale/mn/LC_MESSAGES/django.po568
-rw-r--r--django/conf/locale/nb/LC_MESSAGES/django.mobin15816 -> 17560 bytes
-rw-r--r--django/conf/locale/nb/LC_MESSAGES/django.po596
-rw-r--r--django/conf/locale/nl/LC_MESSAGES/django.mobin16218 -> 17892 bytes
-rw-r--r--django/conf/locale/nl/LC_MESSAGES/django.po564
-rw-r--r--django/conf/locale/nn/LC_MESSAGES/django.mobin15865 -> 17472 bytes
-rw-r--r--django/conf/locale/nn/LC_MESSAGES/django.po555
-rw-r--r--django/conf/locale/pa/LC_MESSAGES/django.mobin10632 -> 10108 bytes
-rw-r--r--django/conf/locale/pa/LC_MESSAGES/django.po533
-rw-r--r--django/conf/locale/pl/LC_MESSAGES/django.mobin16994 -> 18057 bytes
-rw-r--r--django/conf/locale/pl/LC_MESSAGES/django.po568
-rw-r--r--django/conf/locale/pt/LC_MESSAGES/django.mobin16414 -> 15249 bytes
-rw-r--r--django/conf/locale/pt/LC_MESSAGES/django.po553
-rw-r--r--django/conf/locale/pt_BR/LC_MESSAGES/django.mobin16460 -> 15273 bytes
-rw-r--r--django/conf/locale/pt_BR/LC_MESSAGES/django.po541
-rw-r--r--django/conf/locale/ro/LC_MESSAGES/django.mobin16782 -> 18325 bytes
-rw-r--r--django/conf/locale/ro/LC_MESSAGES/django.po570
-rw-r--r--django/conf/locale/ru/LC_MESSAGES/django.mobin20335 -> 22787 bytes
-rw-r--r--django/conf/locale/ru/LC_MESSAGES/django.po627
-rw-r--r--django/conf/locale/sk/LC_MESSAGES/django.mobin16767 -> 17860 bytes
-rw-r--r--django/conf/locale/sk/LC_MESSAGES/django.po557
-rw-r--r--django/conf/locale/sl/LC_MESSAGES/django.mobin16777 -> 18318 bytes
-rw-r--r--django/conf/locale/sl/LC_MESSAGES/django.po567
-rw-r--r--django/conf/locale/sq/LC_MESSAGES/django.mobin14865 -> 13765 bytes
-rw-r--r--django/conf/locale/sq/LC_MESSAGES/django.po540
-rw-r--r--django/conf/locale/sr/LC_MESSAGES/django.mobin19769 -> 21736 bytes
-rw-r--r--django/conf/locale/sr/LC_MESSAGES/django.po567
-rw-r--r--django/conf/locale/sr_Latn/LC_MESSAGES/django.mobin16405 -> 15168 bytes
-rw-r--r--django/conf/locale/sr_Latn/LC_MESSAGES/django.po538
-rw-r--r--django/conf/locale/sv/LC_MESSAGES/django.mobin16299 -> 17934 bytes
-rw-r--r--django/conf/locale/sv/LC_MESSAGES/django.po567
-rw-r--r--django/conf/locale/ta/LC_MESSAGES/django.mobin8612 -> 8638 bytes
-rw-r--r--django/conf/locale/ta/LC_MESSAGES/django.po562
-rw-r--r--django/conf/locale/te/LC_MESSAGES/django.mobin12909 -> 14674 bytes
-rw-r--r--django/conf/locale/te/LC_MESSAGES/django.po562
-rw-r--r--django/conf/locale/th/LC_MESSAGES/django.mobin19894 -> 23985 bytes
-rw-r--r--django/conf/locale/th/LC_MESSAGES/django.po577
-rw-r--r--django/conf/locale/tr/LC_MESSAGES/django.mobin16530 -> 18199 bytes
-rw-r--r--django/conf/locale/tr/LC_MESSAGES/django.po556
-rw-r--r--django/conf/locale/uk/LC_MESSAGES/django.mobin20386 -> 22501 bytes
-rw-r--r--django/conf/locale/uk/LC_MESSAGES/django.po565
-rw-r--r--django/conf/locale/ur/LC_MESSAGES/django.mobin17875 -> 16400 bytes
-rw-r--r--django/conf/locale/ur/LC_MESSAGES/django.po546
-rw-r--r--django/conf/locale/vi/LC_MESSAGES/django.mobin17904 -> 16720 bytes
-rw-r--r--django/conf/locale/vi/LC_MESSAGES/django.po549
-rw-r--r--django/conf/locale/zh_CN/LC_MESSAGES/django.mobin16017 -> 15109 bytes
-rw-r--r--django/conf/locale/zh_CN/LC_MESSAGES/django.po545
-rw-r--r--django/conf/locale/zh_TW/LC_MESSAGES/django.mobin14879 -> 13694 bytes
-rw-r--r--django/conf/locale/zh_TW/LC_MESSAGES/django.po538
130 files changed, 20872 insertions, 16146 deletions
diff --git a/django/conf/locale/ar/LC_MESSAGES/django.mo b/django/conf/locale/ar/LC_MESSAGES/django.mo
index ea62125e60..31425b6b62 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 bfca8fd8d4..96b6f4ab32 100644
--- a/django/conf/locale/ar/LC_MESSAGES/django.po
+++ b/django/conf/locale/ar/LC_MESSAGES/django.po
@@ -1,575 +1,635 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Ossama Khayat <okhayat@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:06-0400\n"
-"PO-Revision-Date: 2011-03-05 18:42+0000\n"
-"Last-Translator: okhayat <okhayat@gmail.com>\n"
-"Language-Team: Arabic <None>\n"
+"POT-Creation-Date: 2012-03-14 00:05-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Ossama Khayat <okhayat@gmail.com>\n"
+"Language-Team: Arabic (http://www.transifex.net/projects/p/django/language/"
+"ar/)\n"
+"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "العربيّة"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "الأذربيجانية"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "البلغاريّة"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "البنغاليّة"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "البوسنيّة"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "الكتلانيّة"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "التشيكيّة"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "الويلز"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "الدنماركيّة"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "الألمانيّة"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "اليونانيّة"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "الإنجليزيّة"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "الإنجليزيّة البريطانيّة"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "الإسبانيّة"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "الأسبانية الأرجنتينية"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "الأسبانية المكسيكية"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "الإستونيّة"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "الباسك"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "الفارسيّة"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "الفنلنديّة"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "الفرنسيّة"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "الفريزيّة"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "الإيرلنديّة"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "الجليقيّة"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "العبريّة"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "الهندية"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "الكرواتيّة"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "الهنغاريّة"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "الإندونيسيّة"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "الآيسلنديّة"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "الإيطاليّة"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "اليابانيّة"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "الجورجيّة"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "الخمر"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "الهنديّة (كنّادا)"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "الكوريّة"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "اللتوانيّة"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "اللاتفيّة"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "المقدونيّة"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "المايالام"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "المنغوليّة"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "الهولنديّة"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "النرويجيّة"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "البوكمال نرويجيّة"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "النينورسك نرويجيّة"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "البنجابيّة"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "البولنديّة"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "البرتغاليّة"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "البرتغاليّة البرازيليّة"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "الرومانيّة"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "الروسيّة"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "السلوفاكيّة"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "السلوفانيّة"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "الألبانيّة"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "الصربيّة"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "اللاتينيّة الصربيّة"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "السويديّة"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "التاميل"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "التيلوغو"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "التايلنديّة"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "التركيّة"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "الأكرانيّة"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "الأوردو"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "الفيتناميّة"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "الصينيّة المبسطة"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "الصينيّة التقليدية"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "أدخل قيمة صحيحة."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "يبدو أن هذا الرابط غير متوفر."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "أدخل رابطاً صحيحاً."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "أدخل عنوان بريد إلكتروني صحيح."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "أدخل عنوان IPv4 صحيح."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "أدخل أرقاما فقط مفصول بينها بفواصل."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "تحقق من أن تكون هذه القيمة أقل من %(limit_value)s أو مساوية لها."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "تحقق من أن تكون هذه القيمة أكثر من %(limit_value)s أو مساوية لها."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"تحقق من أن هذه القيمة تحتوي %(limit_value)d أحرف على الأقل (عدد أحرفها %"
-"(show_value)d)."
+"تحقق من أن هذه القيمة تحتوي %(limit_value)d أحرف على الأقل (عدد أحرفها "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"تحقق من أن هذه القيمة مكونة من %(limit_value)d أحرف كحد أقصى (عدد أحرفها "
"الآن %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "و"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "و"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "القيمة %r ليست خياراً صالحاً."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "لا يمكن تعيين null كقيمة لهذا الحقل."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "لا يمكن ترك هذا الحقل فارغاً."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "عدد صحيح"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "هذه القيمة يجب أن تكون رقما صحيحا."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "هذه القيمة يجب أن تكون إما True أو False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "ثنائي (إما True أو False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "سلسلة نص (%(max_length)s كحد أقصى)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "أرقام صحيحة مفصولة بفواصل"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "التاريخ (دون الوقت)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "أدخل تاريخا صحيحا بالنسق YYYY-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "تاريخ غير صحيح: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "التاريخ (مع الوقت)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "يجب أن تكون هذه القيمة رقماً عشرياً."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "رقم عشري"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "عنوان بريد إلكتروني"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "مسار الملف"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "هذه القيمة يجب أن تكون عدد فاصلة عائمة."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "رقم فاصلة عائمة"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "عدد صحيح كبير (8 بايت)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "عنوان IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "يجب أن تكون هذه القيمة None، أو True أو False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "ثنائي (إما True أو False أو None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "نص"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "وقت"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "أدخل توقيتاً صحيحاً بالنسق HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "رابط"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "نص XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "النموذج %(model)s ذو الحقل الرئيسي %(pk)r غير موجود."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "الحقل المرتبط (تم تحديد النوع وفقاً للحقل المرتبط)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "علاقة واحد إلى واحد"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "علاقة متعدد إلى متعدد"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"اضغط زر التحكم \"Control\", أو \"Command\" على أجهزة Mac لاختيار أكثر من "
"واحد."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "هذا الحقل مطلوب."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "أدخل رقما صحيحا."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "أدخل رقماً."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "تحقق من أن تدخل %s أرقام لا أكثر."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "تحقق من أن تدخل %s خانات عشرية لا أكثر."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "تحقق من أن تدخل %s أرقام قبل الفاصل العشري لا أكثر."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "أدخل تاريخاً صحيحاً."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "أدخل وقتاً صحيحاً."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "أدخل تاريخاً/وقتاً صحيحاً."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "لم يتم ارسال ملف، الرجاء التأكد من نوع ترميز الاستمارة."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "لم يتم إرسال اي ملف."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "الملف الذي قمت بإرساله فارغ."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "رجاءً أرسل ملف أو صح علامة صح عند مربع اختيار \"فارغ\"، وليس كلاهما."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -577,34 +637,34 @@ msgstr ""
"قم برفع صورة صحيحة، الملف الذي قمت برفعه إما أنه ليس ملفا لصورة أو أنه ملف "
"معطوب."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "أدخل قائمة من القيم."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "الترتيب"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "احذف"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "رجاء صحّح بيانات %(field)s المتكررة."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -613,57 +673,64 @@ msgstr ""
"رجاء صحّح بيانات %(field_name)s المتكررة والتي يجب أن تكون مُميّزة لـ%(lookup)s "
"في %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "انتق خياراً صحيحاً. %s ليس أحد الخيارات المتاحة."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "القيمة \"%s\" هي صحيحة للحقل المرجعي."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "حالياً"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "عدّل"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "تفريغ"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "مجهول"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "نعم"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "لا"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "نعم,لا,ربما"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -674,52 +741,52 @@ msgstr[3] "%(size)d بايتان"
msgstr[4] "%(size)d بايت"
msgstr[5] "%(size)d بايت"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s ك.ب"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s م.ب"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s ج.ب"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s ت.ب"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s ب.ب"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "م"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "ص"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "م"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "ص"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "منتصف الليل"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "ظهراً"
@@ -995,16 +1062,22 @@ msgctxt "alt. month"
msgid "December"
msgstr "ديسمبر"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "أو"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr "، "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "سنة"
@@ -1014,7 +1087,7 @@ msgstr[3] "سنوات"
msgstr[4] "سنة"
msgstr[5] "سنة"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "شهر"
@@ -1024,7 +1097,7 @@ msgstr[3] "أشهر"
msgstr[4] "شهر"
msgstr[5] "شهر"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "أسبوع"
@@ -1034,7 +1107,7 @@ msgstr[3] "أسابيع"
msgstr[4] "أسبوع"
msgstr[5] "أسبوع"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "يوم"
@@ -1044,7 +1117,7 @@ msgstr[3] "أيام"
msgstr[4] "يوم"
msgstr[5] "يوم"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ساعة"
@@ -1054,7 +1127,7 @@ msgstr[3] "ساعات"
msgstr[4] "ساعة"
msgstr[5] "ساعة"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "دقيقة"
@@ -1064,39 +1137,33 @@ msgstr[3] "دقائق"
msgstr[4] "دقيقة"
msgstr[5] "دقيقة"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "دقائق"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr "، %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j F Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j F Y، G:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "G:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1129,12 +1196,12 @@ msgstr "لم تحدد اليوم"
msgid "No week specified"
msgstr "لم تحدد الأسبوع"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "لا يوجد %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1143,7 +1210,7 @@ msgstr ""
"التاريخ بالمستقبل %(verbose_name_plural)s غير متوفر لأن قيمة %(class_name)s."
"allow_future هي False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "نسق تاريخ غير صحيح '%(datestr)s' محدد بالشكل '%(format)s'"
@@ -1153,16 +1220,16 @@ msgstr "نسق تاريخ غير صحيح '%(datestr)s' محدد بالشكل '%
msgid "No %(verbose_name)s found matching the query"
msgstr "لم يعثر على أي %(verbose_name)s مطابقة لهذا الإستعلام"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "الصفحة ليست 'الأخيرة'، ولا يمكن تحويل القيمة إلى رقم صحيح."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "صفحة غير صحيحة (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "قائمة فارغة و '%(class_name)s.allow_empty' قيمته False."
diff --git a/django/conf/locale/az/LC_MESSAGES/django.mo b/django/conf/locale/az/LC_MESSAGES/django.mo
index 44d1aed462..2558097bbb 100644
--- a/django/conf/locale/az/LC_MESSAGES/django.mo
+++ b/django/conf/locale/az/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/az/LC_MESSAGES/django.po b/django/conf/locale/az/LC_MESSAGES/django.po
index 4eda29a225..0493681a8f 100644
--- a/django/conf/locale/az/LC_MESSAGES/django.po
+++ b/django/conf/locale/az/LC_MESSAGES/django.po
@@ -1,1127 +1,1218 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Ali Ismayilov <ali@ismailov.info>, 2011.
+# Metin Amiroff <amiroff@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:06-0400\n"
-"PO-Revision-Date: 2011-03-14 08:20+0000\n"
-"Last-Translator: qaralama <ali@ismailov.info>\n"
-"Language-Team: Azerbaijani <None>\n"
+"POT-Creation-Date: 2012-03-14 00:05-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Ali Ismayilov <ali@ismailov.info>\n"
+"Language-Team: Azerbaijani (http://www.transifex.net/projects/p/django/"
+"language/az/)\n"
+"Language: az\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: az\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Ərəbcə"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "Azərbaycanca"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bolqarca"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Benqalca"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosniyaca"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalanca"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Çexcə"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Uelscə"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danimarkaca"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Almanca"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Yunanca"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "İngiliscə"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Britaniya İngiliscəsi"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "İspanca"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentina İspancası"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr ""
+msgstr "Meksika İspancası"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nikaraqua İspancası"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estonca"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskca"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Farsca"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Fincə"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Fransızca"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Friscə"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "İrlandca"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Qallik dili"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "İbranicə"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindcə"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Xorvatca"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Macarca"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "İndonezcə"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "İslandca"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "İtalyanca"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Yaponca"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Gürcücə"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Kxmercə"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada dili"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreyca"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litva dili"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Latviya dili"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonca"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayamca"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Monqolca"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Flamandca"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norveçcə"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Bokmal Norveçcəsi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Nynorsk Norveçcəsi"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Pancabicə"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polyakca"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portuqalca"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Braziliya Portuqalcası"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumınca"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Rusca"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovakca"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovencə"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanca"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbcə"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbcə Latın"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "İsveçcə"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamilcə"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Teluqu dili"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tayca"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Türkcə"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukraynaca"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "Urduca"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vyetnamca"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Sadələşdirilmiş Çincə"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Ənənəvi Çincə"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Düzgün qiymət daxil edin."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL işləmir."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Düzgün URL daxil edin."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Düzgün e-poçt ünvanı daxil edin."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Hərflərdən, rəqəmlərdən, alt-xətlərdən və ya defislərdən ibarət düzgün slaq "
"daxil edin."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Düzgün IPv4 ünvanı daxil edin."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Vergüllə ayırmaqla yalnız rəqəmlər daxil edin."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Əmin edin ki, bu qiymət %(limit_value)s-dir (bu %(show_value)s-dir)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Bu qiymətin %(limit_value)s-ya bərabər və ya ondan kiçik olduğunu yoxlayın."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Bu qiymətin %(limit_value)s-ya bərabər və ya ondan böyük olduğunu yoxlayın."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Bu qiymətin ən azı %(limit_value)d simvoldan ibarət olduğunu yoxlayın (burda "
"%(show_value)d simvol var)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Bu qiymətin ən çoxu %(limit_value)d simvoldan ibarət olduğunu yoxlayın "
"(burda %(show_value)d simvol var)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s %(date_field)s %(lookup)s tarixinə görə özəl olmalıdır."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "və"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s bu %(field_label)s sahə ilə artıq mövcuddur."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "və"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "%r qiyməti düzgün seçim deyil."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Bu sahə boş qala bilməz."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Bu sahə ağ qala bilməz."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Sahənin tipi: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Tam ədəd"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Bu qiymət tam ədəd olmalıdır."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Bu qiymət ya Doğru, ya da Yalan olmalıdır."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Bul (ya Doğru, ya Yalan)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Sətir (%(max_length)s simvola kimi)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Vergüllə ayrılmış tam ədədlər"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Tarix (saatsız)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "İİİİ-AA-GG formatında düzgün tarix daxil edin."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Düzgün tarix deyil: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"İİİİ-AA-GG SS-DD[:ss[.uuuuuu]] formatında düzgün tarix/vaxt daxil edin."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Tarix (vaxt ilə)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Bu rasional ədəd olmalıdır."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Rasional ədəd"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "E-poçt ünvanı"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Faylın ünvanı"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
-msgstr ""
+msgstr "Sürüşən vergüllü ədəd"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
+msgstr "Böyük (8 bayt) tam ədəd"
+
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1023
msgid "IP address"
-msgstr ""
+msgstr "IP ünvan"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
+msgstr "Bul (Ya Doğru, ya Yalan, ya da Heç nə)"
+
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1024
-msgid "Text"
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1040
-msgid "Time"
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1162
+msgid "Text"
+msgstr "Mətn"
+
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
+msgid "Time"
+msgstr "Vaxt"
+
+#: db/models/fields/__init__.py:1249
msgid "URL"
+msgstr "URL"
+
+#: db/models/fields/files.py:214
+msgid "File"
msgstr ""
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
+#: db/models/fields/files.py:321
+msgid "Image"
msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "%(pk)r pk ilə %(model)s modeli mövcud deyil."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Xarici açar (bağlı olduğu sahəyə uyğun tipi alır)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
-msgstr ""
+msgstr "Birin-birə münasibət"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Çoxun-çoxa münasibət"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
+"Birdən artıq seçim etmək istəyirsinizsə, \"Control\" düyməsini basılı "
+"saxlayın, Mac istifadəçiləri üçün \"Command\""
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
-msgstr ""
+msgstr "Bu sahə vacibdir."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
-msgstr ""
+msgstr "Tam ədəd daxil edin."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
-msgstr ""
+msgstr "Ədəd daxil edin."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
-msgstr ""
+msgstr "Ədəddəki rəqəmlərin sayını %s-i aşmadığına əmin olun."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
-msgstr ""
+msgstr "Kəsr hissəsindəki rəqəmlərin sayının %s-i aşmadığına əmin olun."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr ""
+msgstr "Tam hissəsindəki rəqəmlərin sayının %s-i aşmadığına əmin olun."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
-msgstr ""
+msgstr "Düzgün tarix daxil edin."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
-msgstr ""
+msgstr "Düzgün vaxt daxil edin."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
-msgstr ""
+msgstr "Düzgün tarix/vaxt daxil edin."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
+msgstr "Fayl göndərilməyib. Vərəqənin (\"form\") şifrələmə tipini yoxlayın."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
-msgstr ""
+msgstr "Fayl göndərilməyib."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
-msgstr ""
+msgstr "Göndərilən fayl boşdur."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
+"Faylın adının %(max)d simvoldan az olduğunu yoxlayın (indi %(length)d "
+"simvoldan ibarətdir)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Ya fayl göndərin, ya da xanaya quş qoymayın, hər ikisini də birdən etməyin."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
+"Düzgün şəkil göndərin. Göndərdiyiniz fayl ya şəkil deyil, ya da şəkildə "
+"problem var."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
+msgstr "Düzgün seçim edin. %(value)s seçimlər arasında yoxdur."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
-msgstr ""
+msgstr "Qiymətlərin siyahısını daxil edin."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
-msgstr ""
+msgstr "Sırala"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
-msgstr ""
+msgstr "Sil"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
+msgstr "%(field)s sahəsinə görə təkrarlanan məlumatlara düzəliş edin."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
+"%(field)s sahəsinə görə təkrarlanan məlumatlara düzəliş edin, onların hamısı "
+"fərqli olmalıdır."
-#: forms/models.py:566
+#: forms/models.py:581
#, 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 sahəsinə görə təkrarlanan məlumatlara düzəliş edin, onlar "
+"%(date_field)s %(lookup)s-a görə fərqli olmalıdır."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
-msgstr ""
+msgstr "Aşağıda təkrarlanan qiymətlərə düzəliş edin."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "Xarici açar ana obyektin əsas açarı ilə üst-üstə düşmür."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
+msgstr "Düzgün seçim edin. Bu seçim mümkün deyil."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr ""
+msgstr "Düzgün seçim edin. %s mümkün seçim deyil."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
+msgstr "\"%s\" əsas açar olmaq üçün düzgün qiymət deyil."
+
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:299
+#: forms/widgets.py:325
msgid "Currently"
-msgstr ""
+msgstr "Hal-hazırda"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
-msgstr ""
+msgstr "Dəyiş"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
-msgstr ""
+msgstr "Təmizlə"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
-msgstr ""
+msgstr "Məlum deyil"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
-msgstr ""
+msgstr "Hə"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
-msgstr ""
+msgstr "Yox"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
-msgstr ""
+msgstr "hə, yox, bəlkə"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] ""
+msgstr[0] "%(size)d bayt"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
-msgstr ""
+msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
-msgstr ""
+msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
-msgstr ""
+msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
-msgstr ""
+msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
-msgstr ""
+msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
-msgstr ""
+msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
-msgstr ""
+msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
-msgstr ""
+msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
-msgstr ""
+msgstr "gecə yarısı"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
-msgstr ""
+msgstr "günorta"
#: utils/dates.py:6
msgid "Monday"
-msgstr ""
+msgstr "Bazar ertəsi"
#: utils/dates.py:6
msgid "Tuesday"
-msgstr ""
+msgstr "Çərşənbə axşamı"
#: utils/dates.py:6
msgid "Wednesday"
-msgstr ""
+msgstr "Çərşənbə"
#: utils/dates.py:6
msgid "Thursday"
-msgstr ""
+msgstr "Cümə axşamı"
#: utils/dates.py:6
msgid "Friday"
-msgstr ""
+msgstr "Cümə"
#: utils/dates.py:7
msgid "Saturday"
-msgstr ""
+msgstr "Şənbə"
#: utils/dates.py:7
msgid "Sunday"
-msgstr ""
+msgstr "Bazar"
#: utils/dates.py:10
msgid "Mon"
-msgstr ""
+msgstr "B.e"
#: utils/dates.py:10
msgid "Tue"
-msgstr ""
+msgstr "Ç.a"
#: utils/dates.py:10
msgid "Wed"
-msgstr ""
+msgstr "Çrş"
#: utils/dates.py:10
msgid "Thu"
-msgstr ""
+msgstr "C.a"
#: utils/dates.py:10
msgid "Fri"
-msgstr ""
+msgstr "Cüm"
#: utils/dates.py:11
msgid "Sat"
-msgstr ""
+msgstr "Şnb"
#: utils/dates.py:11
msgid "Sun"
-msgstr ""
+msgstr "Bzr"
#: utils/dates.py:18
msgid "January"
-msgstr ""
+msgstr "Yanvar"
#: utils/dates.py:18
msgid "February"
-msgstr ""
+msgstr "Fevral"
#: utils/dates.py:18
msgid "March"
-msgstr ""
+msgstr "Mart"
#: utils/dates.py:18
msgid "April"
-msgstr ""
+msgstr "Aprel"
#: utils/dates.py:18
msgid "May"
-msgstr ""
+msgstr "May"
#: utils/dates.py:18
msgid "June"
-msgstr ""
+msgstr "İyun"
#: utils/dates.py:19
msgid "July"
-msgstr ""
+msgstr "İyul"
#: utils/dates.py:19
msgid "August"
-msgstr ""
+msgstr "Avqust"
#: utils/dates.py:19
msgid "September"
-msgstr ""
+msgstr "Sentyabr"
#: utils/dates.py:19
msgid "October"
-msgstr ""
+msgstr "Oktyabr"
#: utils/dates.py:19
msgid "November"
-msgstr ""
+msgstr "Noyabr"
#: utils/dates.py:20
msgid "December"
-msgstr ""
+msgstr "Dekabr"
#: utils/dates.py:23
msgid "jan"
-msgstr ""
+msgstr "ynv"
#: utils/dates.py:23
msgid "feb"
-msgstr ""
+msgstr "fvr"
#: 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 "iyn"
#: utils/dates.py:24
msgid "jul"
-msgstr ""
+msgstr "iyl"
#: utils/dates.py:24
msgid "aug"
-msgstr ""
+msgstr "avq"
#: utils/dates.py:24
msgid "sep"
-msgstr ""
+msgstr "snt"
#: utils/dates.py:24
msgid "oct"
-msgstr ""
+msgstr "okt"
#: utils/dates.py:24
msgid "nov"
-msgstr ""
+msgstr "noy"
#: utils/dates.py:24
msgid "dec"
-msgstr ""
+msgstr "dek"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr ""
+msgstr "Yan."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr ""
+msgstr "Fev."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr ""
+msgstr "Mart"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr ""
+msgstr "Aprel"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr ""
+msgstr "May"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr ""
+msgstr "İyun"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr ""
+msgstr "İyul"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr ""
+msgstr "Avq."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr ""
+msgstr "Sent."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr ""
+msgstr "Okt."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr ""
+msgstr "Noy."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr ""
+msgstr "Dek."
#: utils/dates.py:45
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "Yanvar"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "Fevral"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "Mart"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "Aprel"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "May"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "İyun"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "İyul"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "Avqust"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "Sentyabr"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "Oktyabr"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "Noyabr"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
+msgstr "Dekabr"
+
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:136
+#: utils/text.py:234
msgid "or"
-msgstr ""
+msgstr "və ya"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
-msgstr ""
+msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] ""
+"one: il\n"
+"other: il"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] ""
+"one: ay\n"
+"other: ay"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] ""
+"one: həftə\n"
+"other: həftə"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] ""
+"one: gün\n"
+"other: gün"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] ""
+"one: saat\n"
+"other: saat"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] ""
+"one: dəqiqə\n"
+"other: dəqiqə"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
-msgstr ""
+msgstr "dəqiqə"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
-msgstr ""
+msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
-msgstr ""
-
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr ""
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr ""
+msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
msgstr ""
#: views/generic/create_update.py:121
#, python-format
msgid "The %(verbose_name)s was created successfully."
-msgstr ""
+msgstr "%(verbose_name)s uğurla yaradıldı."
#: views/generic/create_update.py:164
#, python-format
msgid "The %(verbose_name)s was updated successfully."
-msgstr ""
+msgstr "%(verbose_name)s uğurla yeniləndi."
#: views/generic/create_update.py:207
#, python-format
msgid "The %(verbose_name)s was deleted."
-msgstr ""
+msgstr "%(verbose_name)s uğurla silindi."
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr ""
+msgstr "İl göstərilməyib"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "Ay göstərilməyib"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "Gün göstərilməyib"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "Həftə göstərilməyib"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "%(verbose_name_plural)s seçmək mümkün deyil"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"Gələcək %(verbose_name_plural)s seçmək mümkün deyil, çünki %(class_name)s."
+"allow_future Yalan kimi qeyd olunub."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "\"%(format)s\" formatına görə \"%(datestr)s\" tarixi düzgün deyil"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "Sorğuya uyğun %(verbose_name)s tapılmadı"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "Səhifə nə \"axırıncı\"dır, nə də tam ədədə çevirmək mümkündür."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgstr "Düzgün səhifə deyil (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "Siyahı boşdur və '%(class_name)s.allow_empty' Yalan kimi qeyd olunub."
diff --git a/django/conf/locale/bg/LC_MESSAGES/django.mo b/django/conf/locale/bg/LC_MESSAGES/django.mo
index 71e2a5ce97..ec1cb24b6e 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 5573e866a3..b9f96f3df6 100644
--- a/django/conf/locale/bg/LC_MESSAGES/django.po
+++ b/django/conf/locale/bg/LC_MESSAGES/django.po
@@ -1,724 +1,806 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Boris Chervenkov <office@sentido.bg>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Todor Lubenov <tlubenov@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:06-0400\n"
-"PO-Revision-Date: 2011-03-12 06:14+0000\n"
-"Last-Translator: tlubenov <tlubenov@gmail.com>\n"
-"Language-Team: Bulgarian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:05-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Boris Chervenkov <office@sentido.bg>\n"
+"Language-Team: Bulgarian (http://www.transifex.net/projects/p/django/"
+"language/bg/)\n"
+"Language: bg\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
+#: conf/global_settings.py:48
msgid "Arabic"
-msgstr "арабски"
+msgstr "арабски език"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr "Азербайджански"
+msgstr "Азербайджански език"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
-msgstr "български"
+msgstr "български език"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
-msgstr "бенгалски"
+msgstr "бенгалски език"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
-msgstr "босански"
+msgstr "босненски език"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
-msgstr "каталонски"
+msgstr "каталунски език"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
-msgstr "чешки"
+msgstr "чешки език"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
-msgstr "уелски"
+msgstr "уелски език"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
-msgstr "датски"
+msgstr "датски език"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
-msgstr "немски"
+msgstr "немски език"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
-msgstr "гръцки"
+msgstr "гръцки език"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
-msgstr "английски"
+msgstr "английски език"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "британски английски"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
-msgstr "испански"
+msgstr "испански език"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "кастилски"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Мексикански испански"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "никарагуански испански"
+
+#: conf/global_settings.py:65
msgid "Estonian"
-msgstr "Естонски"
+msgstr "естонски език"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
-msgstr "Баски"
+msgstr "баски"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
-msgstr "персийски"
+msgstr "персийски език"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
-msgstr "финландски"
+msgstr "финландски език"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
-msgstr "френски"
+msgstr "френски език"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
-msgstr "Фризийски"
+msgstr "фризийски език"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
-msgstr "ирландски"
+msgstr "ирландски език"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
-msgstr "галицейски"
+msgstr "галицейски език"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
-msgstr "еврит"
+msgstr "иврит"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "хинди"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
-msgstr "хърватски"
+msgstr "хърватски език"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
-msgstr "унгарски"
+msgstr "унгарски език"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
-msgstr "Индонезийски"
+msgstr "индонезийски език"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
-msgstr "исландски"
+msgstr "исландски език"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
-msgstr "италиански"
+msgstr "италиански език"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
-msgstr "японски"
+msgstr "японски език"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
-msgstr "грузински"
+msgstr "грузински език"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
-msgstr "Кхмерски"
+msgstr "кхмерски език"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
-msgstr "каннада (индийски)"
+msgstr "каннада"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
-msgstr "корейски"
+msgstr "корейски език"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
-msgstr "литовски"
+msgstr "литовски език"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
-msgstr "латвийски"
+msgstr "латвийски език"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
-msgstr "македонски"
+msgstr "македонски език"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
-msgstr "Малаялам"
+msgstr "малаялам"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
-msgstr "Монголски"
+msgstr "монголски език"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "холандски"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "норвежки"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
-msgstr "Норвежки букмол"
+msgstr "норвежки букмол"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
-msgstr "Норвежки съвременен"
+msgstr "норвежки съвременен език"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
-msgstr "Пенджабски"
+msgstr "пенджаби"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
-msgstr "полски"
+msgstr "полски език"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
-msgstr "португалски"
+msgstr "португалски език"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
-msgstr "Бразилски португалски"
+msgstr "бразилски португалски"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
-msgstr "румънски"
+msgstr "румънски език"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
-msgstr "руски"
+msgstr "руски език"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
-msgstr "словашки"
+msgstr "словашки език"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
-msgstr "словенски"
+msgstr "словенски език"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
-msgstr "албански"
+msgstr "албански език"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
-msgstr "сръбски"
+msgstr "сръбски език"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
-msgstr "сръбски латинси"
+msgstr "сръбски с латински букви"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
-msgstr "шведски"
+msgstr "шведски език"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
-msgstr "тамил (индийски)"
+msgstr "тамил"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
-msgstr "телугу (индийски)"
+msgstr "телугу"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
-msgstr "тай"
+msgstr "тайландски език"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
-msgstr "турски"
+msgstr "турски език"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
-msgstr "украински"
+msgstr "украински език"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Урду"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
-msgstr "виетнамски"
+msgstr "виетнамски език"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
-msgstr "китайски"
+msgstr "китайски език"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "традиционен китайски"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Въведете валидна стойност. "
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
-msgstr "Този URL май е счупен линк. "
+msgstr "Този URL адрес може да е счупен линк. "
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
-msgstr "Въведете валиден URL. "
+msgstr "Въведете валиден URL адрес."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
-msgstr "Въведете валиден e-mail адрес. "
+msgstr "Въведете валиден email адрес. "
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Въведете валиден 'slug' съдържащ букви, цифри, тирета или долни тирета."
+"Въведете валиден 'слъг', състоящ се от букви, цифри, тирета или долни тирета."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Въведете валиден IPv4 адрес."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Въведете валиден IPv6 адрес."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Въведете валиден IPv4 или IPv6 адрес."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
-msgstr "Въведете само цифри, разделени със запетая. "
+msgstr "Въведете само еднозначни числа, разделени със запетая. "
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Уверете се, че тази стойност е по-малка или равна на %(limit_value)s ."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Уверете се, че тази стойност е по-голяма или равна на %(limit_value)s ."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Уверете се, че тази стойност е най-малко %(limit_value)d знаци (има %"
-"(show_value)d)."
+"Уверете се, че тази стойност има най-малко %(limit_value)d знаци (има "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Уверете се, че тази стойност е най-много %(limit_value)d знаци (има %"
-"(show_value)d)."
+"Уверете се, че тази стойност има най-много %(limit_value)d знаци (има "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "и"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s с този %(field_label)s вече съществува."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "и"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Стойността %r не е валиден избор."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Това поле не може да има празна стойност."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Това поле не може да е празно."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Цяло число"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Тази стойност трябва да бъде цяло число"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Стойността на '%s' трябва да е цяло число."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Тази стойност трябва да бъде True или False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Стойността на '%s' трябва да е \"True\" или \"False\"."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (True или False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Символен низ (до %(max_length)s символа)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Цели числа, разделени с запетая"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"Стойността на '%s' е в невалиден формат на дата. Форматът трябва да бъде "
+"ГГГГ-ММ-ДД"
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Стойността на '%s' е в правилен формат (ГГГГ-ММ-ДД), но датата е невалидна."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Дата (без час)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Въведете валидна дата в формат ГГГГ-ММ-ДД."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Невалидна дата: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Стойността на '%s' е в невалиден формат. Трябва да бъде във формат ГГГГ-ММ-"
+"ДД ЧЧ:ММ[:сс[.uuuuuu]][TZ] (където u означава милисекунда, а TZ - часова "
+"зона)"
-#: 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]] формат."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"Стойността на '%s' формат ( ГГГГ-ММ-ДД ЧЧ:ММ[:сс[.uuuuuu]][TZ] (където u "
+"означава милисекунда, а TZ - часова зона), но датата/часът са невалидни"
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Дата (и час)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Тази стойност трябва да бъде число с плаваща запетая."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Стойността на '%s' трябва да е десетично число."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Десетична дроб"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
-msgstr "E-mail адрес"
+msgstr "Email адрес"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Път към файл"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Тази стойност трябва да е число с плаваща запетая."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Стойността на '%s' трябва да бъде десетично число с плаваща запетая."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Число с плаваща запетая"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
-msgstr "Big (8 байта) цяло число"
+msgstr "Голямо (8 байта) цяло число"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 адрес"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP адрес"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Тази стойност трябва да бъде None, True, или False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Стойността на '%s' трябва да е \"Nonw\", \"True\" или \"False\""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Възможните стойности са True, False или None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Текст"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Стойността на '%s' е в невалиден формат.Форматът трябва да бъде ЧЧ:ММ [:сс[."
+"uuuuuu]] (където u означава милисекунда)"
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Стойността на '%s' е в правилния формат (ЧЧ:ММ [:сс[.uuuuuu]] (където u "
+"означава милисекунда), но часът е невалиден."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Време"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Въведете валидно време в HH:MM[:ss[uuuuuu]] формат."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
-msgstr "URL"
+msgstr "URL адрес"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML текст"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Моделът %(model)s с pk %(pk)r не съществува."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
-msgstr "Външен ключ (тип определен от свързаното поле)"
+msgstr "Външен ключ (тип, определен от свързаното поле)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
-msgstr "Едно-към-едно връзка"
+msgstr "словенски език"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
-msgstr "много-към-много връзка"
+msgstr "Много-към-много връзка"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-"Задръжте натиснат клавиша \"Control\" (или \"Command\" на Mac-а) за да "
+"Задръжте натиснат клавиша \"Control\" (или \"Command\" на Mac), за да "
"направите повече от един избор. "
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Това поле е задължително."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Въведете цяло число. "
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
-msgstr "Въведечисло."
+msgstr "Въведете число."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
-msgstr "Уверете си че не сте въвели повече от %s цифри."
+msgstr "Уверете се, че не сте въвели повече от %s цифри."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Уверете се, че няма повече от %s знака след запетаята."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Уверете се, че няма повече от %s цифри преди десетичната запетая."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Въведете валидна дата. "
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Въведете валиден час."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
-msgstr "Въведете валидна дата / час. "
+msgstr "Въведете валидна дата/час. "
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Не е получен файл. Проверете типът кодиране на формата. "
+msgstr "Не е получен файл. Проверете типа кодиране на формата. "
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
-msgstr "Няма изпратен фаил."
+msgstr "Няма изпратен файл."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Каченият файл е празен. "
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr "Моля, или пратете файл или маркирайте полето за изчистване, не двете."
+msgstr ""
+"Моля, или пратете файл или маркирайте полето за изчистване, но не и двете."
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Въведете списък от стойности"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ред"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Изтрий"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Моля, коригирайте дублираните данни за %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Моля, коригирайте дублираните данни за %(field)s, които трябва да са "
"уникални."
-#: forms/models.py:566
+#: forms/models.py:581
#, 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 ""
-"Моля, коригирайте дублиранитe данни за %(field_name)s които трябва да са "
+"Моля, коригирайте дублиранитe данни за %(field_name)s , които трябва да са "
"уникални за %(lookup)s в %(date_field)s ."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
-msgstr "Моле коригирайте повтарящите се стойности долу."
+msgstr "Моля, коригирайте повтарящите се стойности по-долу."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
-"Инлайн външен ключ не съвпада с родителската инстанция на първичен ключ."
+msgstr "Невалидна избрана стойност."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Направете валиден избор. Този не е един от възможните избори. "
+msgstr "Направете валиден избор. Този не е един от възможните избори. "
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Направете валиден избор. %s не е един от възможните избори. "
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" не е валидна стойност за първичен ключ."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s не може да бъде разчетено в %(current_timezone)s; може да е "
+"двусмислен или да не съществува"
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Сега"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Промени"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Изчисти"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Неизвестно"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Да"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Не"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
-msgstr "да,не,може-би"
+msgstr "да, не, може би"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d, байт"
msgstr[1] "%(size)d, байта"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s ТБ"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "преди обяд"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "след обяд"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
-msgstr "PM"
+msgstr "преди обяд"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
-msgstr "AM"
+msgstr "след обяд"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "полунощ"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "обяд"
@@ -756,11 +838,11 @@ msgstr "Пон"
#: utils/dates.py:10
msgid "Tue"
-msgstr "Вто"
+msgstr "Вт"
#: utils/dates.py:10
msgid "Wed"
-msgstr "Сря"
+msgstr "Ср"
#: utils/dates.py:10
msgid "Thu"
@@ -828,7 +910,7 @@ msgstr "Декември"
#: utils/dates.py:23
msgid "jan"
-msgstr "яну"
+msgstr "ян"
#: utils/dates.py:23
msgid "feb"
@@ -868,7 +950,7 @@ msgstr "окт"
#: utils/dates.py:24
msgid "nov"
-msgstr "ное"
+msgstr "ноев"
#: utils/dates.py:24
msgid "dec"
@@ -877,7 +959,7 @@ msgstr "дек"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Яну."
+msgstr "Ян."
#: utils/dates.py:32
msgctxt "abbrev. month"
@@ -927,7 +1009,7 @@ msgstr "Окт."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Ное."
+msgstr "Ноев."
#: utils/dates.py:42
msgctxt "abbrev. month"
@@ -982,7 +1064,7 @@ msgstr "Септември"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr "Октомври"
+msgstr "след обяд"
#: utils/dates.py:55
msgctxt "alt. month"
@@ -994,84 +1076,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Декември"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "или"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
-msgstr ", "
+msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "година"
msgstr[1] "години"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "месец"
msgstr[1] "месеци"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "седмица"
msgstr[1] "седмици"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "ден"
msgstr[1] "дни"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "час"
msgstr[1] "часове"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "минута"
msgstr[1] "минути"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "минути"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j N, Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j N, Y, P"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1086,7 +1168,7 @@ 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"
@@ -1098,27 +1180,27 @@ msgstr "Не е посочен месец"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr "Не е посочен ден"
+msgstr "ноев"
#: views/generic/dates.py:138
msgid "No week specified"
msgstr "Не е посочена седмица"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr "Няма %(verbose_name_plural)s на разположение"
+msgstr "Няма достъпни %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"Бъдещo %(verbose_name_plural)s не е налице, тъй като %(class_name)s."
-"allow_future е лъжа."
+"Бъдещo %(verbose_name_plural)s е достъпно, тъй като %(class_name)s."
+"allow_future е False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Невалидна дата '%(datestr)s' посочен формат '%(format)s'"
@@ -1126,18 +1208,18 @@ msgstr "Невалидна дата '%(datestr)s' посочен формат '%
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr "Няма %(verbose_name)s удовлетворяващи заявката"
+msgstr "Няма %(verbose_name)s , съвпадащи със заявката"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr "Страницата не е 'last', или не може да се пробразува в int."
+msgstr "Страницата не е 'last' нито може да се преобразува в int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Невалидна страница (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "Празен списък и '%(class_name)s.allow_empty' е False."
+msgstr "Празен списък и '%(class_name)s.allow_empty' не е валидно."
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index 0f7198cb2b..2ed61add8d 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 f6c94eb915..45bfd2966f 100644
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
@@ -1,568 +1,627 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:06-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Bengali <>\n"
+"POT-Creation-Date: 2012-03-14 00:05-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Bengali (http://www.transifex.net/projects/p/django/language/"
+"bn/)\n"
+"Language: bn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: bn\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "আরবী"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "বুলগেরিয়ান"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "বাংলা"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "ক্যাটালান"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "চেক"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "ওয়েল্স"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "ড্যানিশ"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "জার্মান"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "গ্রিক"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "ইংলিশ"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr ""
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "স্প্যানিশ"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr ""
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "এস্তোনিয়ান"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "বাস্ক"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "ফারসি"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "ফিনিশ"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ফ্রেঞ্চ"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr ""
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "আইরিশ"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "গ্যালিসিয়ান"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "হিব্রু"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "ক্রোয়েশিয়ান"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "হাঙ্গেরিয়ান"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "আইসল্যান্ডিক"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "ইটালিয়ান"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "জাপানিজ"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "জর্জিয়ান"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "খমার"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "কান্নাড়া"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "কোরিয়ান"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "লিথুয়ানিয়ান"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "লাটভিয়ান"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "ম্যাসাডোনিয়ান"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "ডাচ"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "নরওয়েজিয়ান"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "পোলিশ"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "ব্রাজিলিয়ান পর্তুগীজ"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "রোমানিয়ান"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "রাশান"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "স্লোভাক"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "স্লোভেনিয়ান"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "সার্বিয়ান"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "সুইডিশ"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "তামিল"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "তেলেগু"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "তুর্কি"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ইউক্রেনিয়ান"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr ""
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "সরলীকৃত চাইনীজ"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "প্রচলিত চাইনীজ"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "একটি বৈধ মান দিন।"
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "এই URL টি সঠিক নয়।"
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "বৈধ URL দিন"
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "বৈধ ইমেইল ঠিকানা দিন।"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"বৈধ ’slug' প্রবেশ করান যাতে শুধুমাত্র ইংরেজী বর্ণ, অঙ্ক, আন্ডারস্কোর অথবা হাইফেন "
"রয়েছে।"
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "একটি বৈধ IPv4 ঠিকানা দিন।"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "শুধুমাত্র কমা দিয়ে সংখ্যা দিন।"
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "এবং"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(field_label)s সহ %(model_name)s আরেকটি রয়েছে।"
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "এবং"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "এর মান null হতে পারবে না।"
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: 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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "ইন্টিজার"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "এর মান অবশ্যই ইন্টিজার হতে হবে।"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "এর মান অবশ্যই True অথবা False হতে হবে।"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "বুলিয়ান (হয় True অথবা False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "স্ট্রিং (সর্বোচ্চ %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "কমা দিয়ে আলাদা করা ইন্টিজার"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "তারিখ (সময় বাদে)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "একটি বৈধ তারিখ দিন (ফরম্যাট YYYY-MM-DD)।"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "অবৈধ তারিখঃ %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]])।"
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "তারিখ (সময় সহ)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "এর মান অবশ্যই ডেসিমাল সংখ্যা হতে হবে।"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "দশমিক সংখ্যা"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "ইমেইল ঠিকানা"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "ফাইল পথ"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "ফ্লোটিং পয়েন্ট সংখ্যা"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "আইপি ঠিকানা"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "এর মান অবশ্যই True, False অথবা None হতে হবে।"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "বুলিয়ান (হয় True, False অথবা None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "টেক্সট"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "সময়"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "বৈধ সময় প্রবেশ করান (ফরম্যাট HH:MM[:ss[:uuuuuu]])।"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "ইউআরএল (URL)"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML টেক্সট"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "একাধিক বাছাই করতে \"কন্ট্রোল\", অথবা ম্যাকে \"কমান্ড\", চেপে ধরুন।"
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "এটি আবশ্যক।"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "একটি পূর্ণসংখ্যা দিন"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "একটি সংখ্যা প্রবেশ করান।"
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "নিশ্চিত করুন যে, এখানে %s সংখ্যক দশমিক অঙ্ক রয়েছে।"
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "নিশ্চিত করুন যে, এখানে %s -এর বেশি দশমিক সংখ্যা নেই।"
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "নিশ্চিত করুন যে, এখানে %s -এর বেশি দশমিক সংখ্যা নেই।"
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "বৈধ তারিখ দিন।"
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "বৈধ সময় দিন।"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "বৈধ ডারিখ/সময় দিন।"
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "কোন ফাইল দেয়া হয়নি। ফর্মের এনকোডিং ঠিক আছে কিনা দেখুন।"
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "কোন ফাইল দেয়া হয়নি।"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "ফাইলটি খালি।"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -570,143 +629,150 @@ msgstr ""
"সঠিক ছবি আপলোড করুন। যে ফাইলটি আপলোড করা হয়েছে তা হয় ছবি নয় অথবা নষ্ট হয়ে "
"যাওয়া ছবি।"
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "কয়েকটি মানের তালিকা দিন।"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "ক্রম"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "মুছুন"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "এটি বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "%s বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr ""
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "পরিবর্তন"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "অজানা"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "হ্যাঁ"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "না"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "হ্যাঁ,না,হয়তো"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d বাইট"
msgstr[1] "%(size)d বাইট"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "অপরাহ্ন"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "পূর্বাহ্ন"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "অপরাহ্ন"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "পূর্বাহ্ন"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "মধ্যরাত"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "দুপুর"
@@ -875,27 +941,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"
@@ -925,141 +991,141 @@ msgstr ""
#: utils/dates.py:45
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "জানুয়ারি"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "ফেব্রুয়ারি"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "মার্চ"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "এপ্রিল"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "মে"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "জুন"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "জুলাই"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "আগস্ট"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "সেপ্টেম্বর"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "অক্টোবর"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "নভেম্বর"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
+msgstr "ডিসেম্বর"
+
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:136
+#: utils/text.py:234
msgid "or"
msgstr "অথবা"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ""
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "বছর"
msgstr[1] "বছর"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "মাস"
msgstr[1] "মাস"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "সপ্তাহ"
msgstr[1] "সপ্তাহ"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "দিন"
msgstr[1] "দিন"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ঘন্টা"
msgstr[1] "ঘন্টা"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "মিনিট"
msgstr[1] "মিনিট"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "মিনিট"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1092,19 +1158,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1114,16 +1180,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 7c92eb8d5a..507dc7e3c1 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 9bb913677e..65a00b4f0f 100644
--- a/django/conf/locale/bs/LC_MESSAGES/django.po
+++ b/django/conf/locale/bs/LC_MESSAGES/django.po
@@ -1,584 +1,639 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Filip Dupanović <filip.dupanovic@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 20:57+0100\n"
-"PO-Revision-Date: 2011-03-20 16:35+0000\n"
-"Last-Translator: fdupanovic <filip.dupanovic@gmail.com>\n"
-"Language-Team: Bosnian <>\n"
+"POT-Creation-Date: 2012-03-14 00:05-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Filip Dupanović <filip.dupanovic@gmail.com>\n"
+"Language-Team: Bosnian (http://www.transifex.net/projects/p/django/language/"
+"bs/)\n"
+"Language: bs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: bs\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"
+"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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "arapski"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "Azerbejdžanski"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "bugarski"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengalski"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosanski"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "katalonski"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "češki"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "velški"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "danski"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "njemački"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "grčki"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "engleski"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
-msgstr ""
+msgstr "Britanski engleski"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "španski"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
-msgstr ""
+msgstr "Argentinski španski"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr ""
+msgstr "Meksički španski"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
-msgstr ""
+msgstr "Nikuaraganski španski"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estonski"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "baskijski"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persijski"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "finski"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr "francuski"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frišanski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irski"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galski"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "hebrejski"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "hrvatski"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "mađarski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
-msgstr ""
+msgstr "Indonežanski"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "italijanski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "japanski"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "gruzijski"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "kambođanski"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kanada"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "korejski"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "litvanski"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "latvijski"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "makedonski"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
-msgstr ""
+msgstr "Malajalamski"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
-msgstr ""
+msgstr "Mongolski"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holandski"
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr "norveški"
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Norveški književni"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "Norveški novi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
-msgstr ""
+msgstr "Pandžabi"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "poljski"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugalski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "brazilski portugalski"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumunski"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ruski"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "slovački"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "slovenački"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albanski"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "srpski"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "srpski latinski"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "švedski"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamilski"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "tajlandski"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turski"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ukrajinski"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "Urdu"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vijetnamežanski"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "novokineski"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "starokineski"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Unesite ispravnu vrijednost."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Ovaj URL izgleda ne vodi nikuda."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Unesite ispravan URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Unesite važeću email adresu."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Unesite ispravnu IPv4 adresu."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Unesite samo brojke razdvojene zapetama."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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)."
+"Pobrinite se da je ova vrijednost %(limit_value)s (trenutno je "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Pobrinite se da ova vrijednost ima najmanje %(limit_value)d znamenki "
"(trenutno ima %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Pobrinite se da ova vrijednost ima najviše %(limit_value)d znamenki (ima %"
-"(show_value)d)."
+"Pobrinite se da ova vrijednost ima najviše %(limit_value)d znamenki (ima "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "i"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "i"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Vrijednost %r nije dozvoljen izbor."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Ovo polje ne može ostati prazno."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Ovo polje ne može biti prazno."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Polje tipa: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Cijeo broj"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Ova vrijednost mora biti cijelobrojna."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Ova vrijednost mora biti True ili False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Bulova vrijednost (True ili False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (najviše %(max_length)s znakova)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Cijeli brojevi razdvojeni zapetama"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Datum (bez vremena)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Unesite ispravan datum u formatu GGGG-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Neispravan datum: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Unesite ispravan datum/vrijeme u formatu GGGG-MM-DD ČČ:MM[:ss[.uuuuuu]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datum (sa vremenom)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Ova vrijednost mora biti decimalni broj"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Decimalni broj"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Email adresa"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Putanja fajla"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Ova vrijednost mora biti broj sa klizećom zapetom"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Broj sa pokrenom zapetom"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Big (8 bajtni) integer"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP adresa"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Ova vrijednost mora biti ili None, ili True, ili False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Bulova vrijednost (True, False ili None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Vrijeme"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Unesite ispravno vrijeme u formatu ČČ:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML tekst"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Strani ključ (tip određen povezanim poljem)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Jedan-na-jedan odnos"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Više-na-više odsnos"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Držite „Control“, ili „Command“ na Mac-u da biste obilježili više od jedne "
"stavke."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Ovo polje se mora popuniti."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Unesite cijeo broj."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Unesite broj."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Ne smije biti ukupno više od %s cifara. Provjerite."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Ne smije biti ukupno više od %s decimalnih mijesta. Provjerite."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Ne smije biti ukupno više od %s cifara prije zapete. Provjerite."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Unesite ispravan datum."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Unesite ispravno vrijeme"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Unesite ispravan datum/vrijeme."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Fajl nije prebačen. Provjerite tip enkodiranja formulara."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Fajl nije prebačen."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Prebačen fajl je prazan."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Naziv fajla mora da sadrži bar %(max)d slovnih mijesta (trenutno ima %"
-"(length)d)."
+"Naziv fajla mora da sadrži bar %(max)d slovnih mijesta (trenutno ima "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -586,36 +641,36 @@ msgstr ""
"Prebacite ispravan fajl. Fajl koji je prebačen ili nije slika, ili je "
"oštećen."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Unesite listu vrijednosti."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Redoslijed"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Obriši"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ispravite dupli sadržaj za polja: %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -624,58 +679,65 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Ispravite duple vrijednosti dole."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
-msgid "Currently"
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:300
+#: forms/widgets.py:325
+msgid "Currently"
+msgstr "Trenutno"
+
+#: forms/widgets.py:326
msgid "Change"
msgstr "Izmjeni"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
-msgstr ""
+msgstr "Očisti"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Nepoznato"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "da,ne,možda"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -683,52 +745,52 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "po p."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "prije p."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "ponoć"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "podne"
@@ -887,32 +949,32 @@ 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 "Mart"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr ""
+msgstr "April"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr ""
+msgstr "Maj"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr ""
+msgstr "Juni"
#: utils/dates.py:37
msgctxt "abbrev. month"
@@ -997,97 +1059,97 @@ msgstr "oktobar"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "Novembar"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
msgstr "decembar"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "ili"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuta"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "j. N Y."
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "j. N. Y. G:i T"
-
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "G:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y."
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1120,19 +1182,19 @@ msgstr "Dan nije naznačen"
msgid "No week specified"
msgstr "Sedmica nije naznačena"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1142,16 +1204,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 77a4d9d3d1..8d68817091 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 243135f419..b9c7eb005e 100644
--- a/django/conf/locale/ca/LC_MESSAGES/django.po
+++ b/django/conf/locale/ca/LC_MESSAGES/django.po
@@ -1,582 +1,653 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Antoni Aloy <antoni.aloy@trespams.com>, 2012.
+# Carles Barrobés <carles@barrobes.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:06-0400\n"
-"PO-Revision-Date: 2011-03-05 18:50+0000\n"
-"Last-Translator: txels <carles@barrobes.com>\n"
-"Language-Team: Catalan <None>\n"
+"POT-Creation-Date: 2012-03-14 00:05-0700\n"
+"PO-Revision-Date: 2012-03-13 19:36+0000\n"
+"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
+"Language-Team: Catalan (http://www.transifex.net/projects/p/django/language/"
+"ca/)\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "àrab"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "azerbaijanès"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "búlgar"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengalí"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosnià"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "català"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "txec"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "gal·lès"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "danès"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "alemany"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "grec"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "anglès"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "anglès britànic"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "espanyol"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "castellà d'Argentina"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "espanyol de Mèxic"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "castellà de Nicaragua"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estonià"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "euskera"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "finlandès"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "francès"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frisi"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irlandès"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "gallec"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "hebreu"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "croat"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "hongarès"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonesi"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandès"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "italià"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "japonès"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "georgià"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kannarès"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "coreà"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "lituà"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "letó"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "macedoni"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "malaiàlam "
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongol"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holandès"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "noruec"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "noruec bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "noruec nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "panjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "polonès"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portuguès"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "portuguès de brasil"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "romanès"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "rus"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "eslovac"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "eslovè"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albanès"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "serbi"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "serbi llatí"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "suec"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tàmil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "tailandès"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turc"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ucraïnès"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "xinès simplificat"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "xinès tradicional"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Introduïu un valor vàlid."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Aquesta URL sembla ser un enllaç trencat."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Introduïu una URL vàlida."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Introduïu una adreça de correu vàlida."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Introduïu una adreça IPv4 vàlida."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Entreu una adreça IPv6 vàlida."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Entreu una adreça IPv4 o IPv6 vàlida."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Introduïu només dígits separats per comes."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Assegureu-vos que el valor tingui com a mínim %(limit_value)d caràcters (en "
"té %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
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:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "i"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "i"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "El valor %r no és una opció vàlida."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Aquest camp no pot ser nul."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Aquest camp no pot estar en blanc."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Camp del tipus: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Enter"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Aquest valor ha de ser un enter."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "El valor '%s' ha de ser un nombre enter."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Aquest valor ha de ser True (Cert) o False (Fals)"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "El valor '%s' ha de ser True o False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Booleà (Cert o Fals)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (de fins a %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Enters separats per comes"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"El valor '%s' no té un format de data vàlid. Ha de tenir el format YYYY-MM-"
+"DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"El valor '%s' té el format correcte (YYYY-MM-DD) però no és una data vàlida."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Data (sense hora)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduïu una data vàlida en el forma AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Data invàlida: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"El valor '%s' no té un format vàlid. Ha de tenir el format YYYY-MM-DD HH:MM[:"
+"ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Introduïu un data/hora vàlida en format YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
+"El valor '%s' té el format correcte (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
+"però no és una data/hora vàlida."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Data (amb hora)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Aquest valor ha de ser un número decimal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "El valor '%s' ha de ser un nombre decimal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Ruta del fitxer"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Aquest valor ha de ser un número amb punt de coma flotant."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "El valor '%s' ha de ser un número de coma flotant."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Número de coma flotant"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Enter gran (8 bytes)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "Adreça IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Adreça IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Aquest valor ha de ser None (Cap), True (Cert) o False (Fals)"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "El valor '%s' ha de ser None, True o False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Booleà (Cert, Fals o Cap ('None'))"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Enter positiu"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Enter petit positiu"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (fins a %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Enter petit"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"El valor '%s' no té un format vàlid. Ha de tenir el format HH:MM[:ss[."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"El valor '%s' té el format correcte (HH:MM[:ss[.uuuuuu]]) però no és una "
+"hora vàlida."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Introduïu una hora vàlida en el format HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Text XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Arxiu"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Imatge"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Clau forana (tipus determinat pel camp relacionat)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Inter-relació un-a-un"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Inter-relació molts-a-molts"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Premeu la tecla \"Control\", o \"Command\" en un Mac, per seleccionar més "
"d'un valor."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Aquest camp és obligatori."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Introduïu un número sencer."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Introduïu un número."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Assegureu-vos que no hi ha més de %s dígits en total."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Assegureu-vos que no hi ha més de %s decimals."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assegureu-vos que no hi ha més de %s dígits decimals."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Introduïu una data vàlida."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Introduïu una hora vàlida."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Introduïu una data/hora vàlides."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No s'ha enviat cap fitxer. Comproveu el tipus de codificació del formulari."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "No s'ha enviat cap fitxer."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "El fitxer enviat està buit."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Assegureu-vos que el valor té com a màxim %(max)d caràcters (en té %(length)"
-"d)."
+"Assegureu-vos que el valor té com a màxim %(max)d caràcters (en té "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
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
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -584,36 +655,36 @@ msgstr ""
"Carregueu una imatge vàlida. El fitxer que heu carregat no era una imatge o "
"estava corrupte."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Introduïu una llista de valors."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ordre"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:556
+#: forms/models.py:571
#, 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:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -622,112 +693,121 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Si us plau, corregiu els valors duplicats a sota."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"No s'ha pogut interpretar %(datetime)s a la zona horària "
+"%(current_timezone)s; potser és ambigua o no existeix."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Actualment"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Netejar"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Desconegut"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Sí"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "sí,no,potser"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "mitjanit"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "migdia"
@@ -1003,84 +1083,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "desembre"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "any"
msgstr[1] "anys"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mes"
msgstr[1] "mesos"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "setmana"
msgstr[1] "setmanes"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dia"
msgstr[1] "dies"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "hora"
msgstr[1] "hores"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minut"
msgstr[1] "minuts"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuts"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j \\d\\e F \\d\\e Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j \\d\\e F \\d\\e Y, H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "No es permeten índexos de directori aquí"
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F \\d\\e Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" no existeix"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j \\d\\e F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Índex de %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1113,12 +1193,12 @@ msgstr "No s'ha especificat dia"
msgid "No week specified"
msgstr "No s'ha especificat setmana"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Cap %(verbose_name_plural)s disponible"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1127,7 +1207,7 @@ msgstr ""
"Futurs %(verbose_name_plural)s no disponibles perquè %(class_name)s."
"allow_future és Fals."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Cadena invàlida de dats '%(datestr)s' donat el format '%(format)s'"
@@ -1137,16 +1217,16 @@ msgstr "Cadena invàlida de dats '%(datestr)s' donat el format '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "No s'ha trobat sap %(verbose_name)s que coincideixi amb la petició"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "La pàgina no és 'last', ni es pot convertir en un enter"
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Pàgina invàlida (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Llista buida i '%(class_name)s.allow_empty' és Fals."
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index c9a53f3ea3..4da9652776 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 08ac1134bb..b7283c2ce9 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -1,612 +1,680 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Jirka Vejrazka <Jirka.Vejrazka@gmail.com>, 2011.
+# Vlada Macek <macek@sandbox.cz>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:06-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: JirkaV <Jirka.Vejrazka@gmail.com>\n"
-"Language-Team: Czech <None>\n"
+"POT-Creation-Date: 2012-03-14 00:05-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
+"Language-Team: Czech (http://www.transifex.net/projects/p/django/language/"
+"cs/)\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "arabsky"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Ázerbájdžánština"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "bulharsky"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengálsky"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosensky"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "katalánsky"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "česky"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "welšsky"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "dánsky"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "německy"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "řecky"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "anglicky"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "anglicky (Británie)"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "španělsky"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "španělsky (Argentina)"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Mexická španělština"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nikaragujskou španělštinou"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estonsky"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "baskicky"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persky"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "finsky"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "francouzsky"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frísky"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irsky"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galicijsky"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "hebrejsky"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindsky"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "chorvatsky"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "maďarsky"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonésky"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandsky"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "italsky"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "japonsky"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "gruzínsky"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "khmersky"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kannadsky"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "korejsky"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "litevsky"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "lotyšsky"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "makedonsky"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "malajálamsky"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongolsky"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holandsky"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "norsky"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "norsky (Bokmål)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "norsky (Nynorsk)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Paňdžábsky"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "polsky"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugalsky"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "portugalsky (Brazílie)"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumunsky"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "rusky"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "slovensky"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "slovinsky"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albánsky"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "srbsky"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "srbsky (latinkou)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "švédsky"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamilsky"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telužsky"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "thajsky"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turecky"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ukrajinsky"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdština"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vietnamsky"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "čínsky (zjednodušeně)"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "čínsky (tradičně)"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Vložte platnou hodnotu."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Tato adresa URL je zřejmě neplatný odkaz."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Vložte platnou adresu URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Vložte platnou e-mailovou adresu."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Vložte platnou adresu typu IPv4."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Zadejte platnou adresu typu IPv6."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Zadejte platnou adresu typu IPv4 nebo IPv6."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Vložte pouze číslice oddělené čárkami."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Hodnota musí mít alespoň %(limit_value)d znaků, ale nyní jich má %"
-"(show_value)d."
+"Hodnota musí mít alespoň %(limit_value)d znaků, ale nyní jich má "
+"%(show_value)d."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Hodnota smí mít nejvýše %(limit_value)d znaků, ale nyní jich má %(show_value)"
-"d."
+"Hodnota smí mít nejvýše %(limit_value)d znaků, ale nyní jich má "
+"%(show_value)d."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "a"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "a"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Hodnota %r není platnou volbou."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Pole nemůže být null."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Pole nemůže být prázdné."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Pole typu: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Celé číslo"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Hodnota musí být celé číslo."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Hodnota '%s' musí být celé číslo."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Hodnota musí být buď Ano (True) nebo Ne (False)."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Hodnota '%s' musí být buď True nebo False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Pravdivost (buď Ano (True), nebo Ne (False))"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Řetězec (max. %(max_length)s znaků)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Celá čísla oddělená čárkou"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "Hodnota '%s' není platné datum. Musí být ve tvaru RRRR-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Ačkoli hodnota '%s' je ve správném tvaru (RRRR-MM-DD), jde o neplatné datum."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Datum (bez času)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Vložte platné datum ve tvaru RRRR-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Neplatné datum: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Hodnota '%s' je v neplatném tvaru, který má být RRRR-MM-DD HH:MM[:SS[."
+"uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Vložte platné datum a čas ve tvaru RRRR-MM-DD HH:MM[:ss[.uuuuuu]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"Ačkoli hodnota '%s' je ve správném tvaru (RRRR-MM-DD HH:MM[:SS[.uuuuuu]]"
+"[TZ]), jde o neplatné datum a čas."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datum (s časem)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Hodnota musí být desetinné číslo."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Hodnota '%s' musí být desítkové číslo."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Desetinné číslo"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Cesta k souboru"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Hodnota musí být desetinné číslo."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Hodnota '%s' musí být reálné číslo."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Číslo s pohyblivou řádovou čárkou"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Velké číslo (8 bajtů)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "Adresa IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Adresa IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Hodnota musí být buď Nic (None), Ano (True) nebo Ne (False)."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Hodnota '%s' musí být buď None, True nebo False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Pravdivost (buď Ano (True), Ne (False) nebo Nic (None))"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Kladné celé číslo"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Kladné malé celé číslo"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Identifikátor (nejvýše %(max_length)s znaků)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Malé celé číslo"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr "Hodnota '%s' je v neplatném tvaru, který má být HH:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Ačkoli hodnota '%s' je ve správném tvaru (HH:MM[:ss[.uuuuuu]]), jde o "
+"neplatný čas."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Čas"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Vložte platný čas ve tvaru HH:MM[:ss[.uuuuuu]]"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML text"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Soubor"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Obrázek"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Cizí klíč (typ určen pomocí souvisejícího pole)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Vazba jedna-jedna"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Vazba mnoho-mnoho"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Výběr více než jedné položky je možný přidržením klávesy \"Control\" (nebo "
"\"Command\" na Macu)."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Pole je povinné."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Vložte celé číslo."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Vložte číslo."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Hodnota nesmí celkem mít více než %s cifer."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Hodnota nesmí mít za desetinnou čárkou více než %s cifer."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Hodnota nesmí mít před desetinnou čárkou více než %s cifer."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Vložte platné datum."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Vložte platný čas."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Vložte platné datum a čas."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Soubor nebyl odeslán. Zkontrolujte parametr \"encoding type\" formuláře."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Žádný soubor nebyl odeslán."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Odeslaný soubor je prázdný."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Délka názvu souboru má být nejvýše %(max)d znaků, ale nyní je %(length)d."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Musíte vybrat cestu k souboru nebo vymazat výběr, ne obojí."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Nahrajte platný obrázek. Odeslaný soubor buď nebyl obrázek nebo byl poškozen."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Vložte seznam hodnot."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Pořadí"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Odstranit"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Opravte duplicitní data v poli %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -615,58 +683,67 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Odstraňte duplicitní hodnoty níže."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"Hodnotu %(datetime)s nelze interpretovat v časové zóně %(current_timezone)s; "
+"může to být nejednoznačné nebo nemusí existovat."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Aktuálně"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Změnit"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Zrušit"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Neznámé"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ano"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ano, ne, možná"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -674,52 +751,52 @@ msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajty"
msgstr[2] "%(size)d bajtů"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "odp."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "dop."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "odp."
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "dop."
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "půlnoc"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "poledne"
@@ -995,90 +1072,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "prosince"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "nebo"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "rok"
msgstr[1] "roky"
msgstr[2] "let"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "měsíc"
msgstr[1] "měsíce"
msgstr[2] "měsíců"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "týden"
msgstr[1] "týdny"
msgstr[2] "týdnů"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "den"
msgstr[1] "dny"
msgstr[2] "dnů"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "hodina"
msgstr[1] "hodiny"
msgstr[2] "hodin"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuta"
msgstr[1] "minuty"
msgstr[2] "minut"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuty"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. n. Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. n. Y H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Indexy adresářů zde nejsou povoleny."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" neexistuje"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index adresáře %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1111,21 +1188,21 @@ msgstr "Nebyl specifikován den"
msgid "No week specified"
msgstr "Nebyl specifikován týden"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s nejsou k dispozici"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"%(verbose_name_plural)s s budoucím datem nejsou k dipozici protoze %"
-"(class_name)s.allow_future je False"
+"%(verbose_name_plural)s s budoucím datem nejsou k dipozici protoze "
+"%(class_name)s.allow_future je False"
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Datum '%(datestr)s' neodpovídá formátu '%(format)s'"
@@ -1135,16 +1212,16 @@ msgstr "Datum '%(datestr)s' neodpovídá formátu '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Nepodařilo se nalézt žádný objekt %(verbose_name)s"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Požadavek na stránku nemohl být konvertován na číslo, ani není 'last'"
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Chybné číslo stránky (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "List je prázdný a '%(class_name)s.allow_empty' je nastaveno na False"
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 3d1c2473d3..fa39910cd9 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 36a7150ac7..543e0a63b2 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@@ -1,567 +1,625 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:07-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
+"POT-Creation-Date: 2012-03-14 00:05-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: cy\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: cy\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
"11) ? 2 : 3\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr ""
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengaleg"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tsieceg"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Cymraeg"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Daneg"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Almaeneg"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Saesneg"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr ""
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spaeneg"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr ""
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr ""
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr ""
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr ""
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Ffrangeg"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr ""
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr ""
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galisieg"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr ""
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandeg"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Eidaleg"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr ""
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr ""
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norwyeg"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Romaneg"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Rwsieg"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slofaceg"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr ""
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbeg"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Swedeg"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr ""
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr ""
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Tsieinëeg Symledig"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr ""
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr ""
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr ""
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Rhowch cyfeiriad e-bost ddilys."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Rhowch digidau gwahanu gyda atalnodau yn unig."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "ac"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "ac"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr ""
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: 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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr ""
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr ""
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr ""
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Dyddiad (heb amser)"
-#: db/models/fields/__init__.py:588
-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
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Dyddiad (gyda amser)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Rhif degol"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Llwybr ffeil"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "cyfeiriad IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boole (Naill ai True, False neu None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Testun"
-#: db/models/fields/__init__.py:1040
-msgid "Time"
-msgstr "Amser"
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
msgstr ""
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1185
+msgid "Time"
+msgstr "Amser"
+
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Testun XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Mae angen y faes yma."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Rhowch rhif cyfan."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr ""
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr ""
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr ""
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr ""
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr ""
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr ""
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr ""
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Mae'r ffeil yn wag."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -569,91 +627,98 @@ msgstr ""
"Llwythwch delwedd dilys. Doedd y delwedd a llwythwyd dim yn ddelwedd dilys, "
"neu roedd o'n ddelwedd llwgr."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr ""
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr ""
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Dileu"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr ""
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Newidio"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ie"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Na"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ie,na,efallai"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -662,52 +727,52 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr ""
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr ""
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr ""
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr ""
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr ""
@@ -876,27 +941,27 @@ msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr ""
+msgstr "Mawrth"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr ""
+msgstr "Ebrill"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr ""
+msgstr "Mai"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr ""
+msgstr "Mehefin"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr ""
+msgstr "Gorffenaf"
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -926,73 +991,79 @@ msgstr ""
#: utils/dates.py:45
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "Ionawr"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "Chwefror"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "Mawrth"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "Ebrill"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "Mai"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "Mehefin"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "Gorffenaf"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "Awst"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "Medi"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "Hydref"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "Tachwedd"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
+msgstr "Rhagfyr"
+
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:136
+#: utils/text.py:234
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ""
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] ""
@@ -1000,7 +1071,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] ""
@@ -1008,7 +1079,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] ""
@@ -1016,7 +1087,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] ""
@@ -1024,7 +1095,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] ""
@@ -1032,7 +1103,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] ""
@@ -1040,38 +1111,32 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr ""
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr ""
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr ""
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
msgstr ""
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr ""
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
msgstr ""
#: views/generic/create_update.py:121
@@ -1105,19 +1170,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1127,16 +1192,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 6e4bcdd6bc..42ebd0d3e9 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 d371fd26f6..ca9a3b37e6 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/LC_MESSAGES/django.po
@@ -1,574 +1,646 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Christian Joergensen <christian@gmta.info>, 2012.
+# Erik Wognsen <r4mses@gmail.com>, 2011, 2012.
+# Finn Gruwier <finn@gruwier.dk>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:07-0400\n"
-"PO-Revision-Date: 2011-03-07 20:31+0000\n"
-"Last-Translator: finngruwier <finn@gruwier.dk>\n"
-"Language-Team: Danish <>\n"
+"POT-Creation-Date: 2012-03-14 00:05-0700\n"
+"PO-Revision-Date: 2012-03-12 20:29+0000\n"
+"Last-Translator: Erik Wognsen <r4mses@gmail.com>\n"
+"Language-Team: Danish (http://www.transifex.net/projects/p/django/language/"
+"da/)\n"
+"Language: da\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
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabisk"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbaidjansk"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgarsk"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalsk"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnisk"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalansk"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tjekkisk"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Walisisk"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Dansk"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Tysk"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Græsk"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Engelsk"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Britisk engelsk"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spansk"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentinsk spansk"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Mexikansk spansk"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nicaraguansk spansk"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estisk"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskisk"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persisk"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finsk"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisisk"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irsk"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galicisk"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebræisk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroatisk"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Ungarsk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonesisk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japansk"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgisk"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreansk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litauisk"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Lettisk"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonsk"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malaysisk"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolsk"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Hollandsk"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norsk bokmål"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norsk nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polsk"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugisisk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brasiliansk portugisisk"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumænsk"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovensk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albansk"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbisk (latin)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Tyrkisk"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamesisk"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Forenklet kinesisk"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Traditionelt kinesisk"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Indtast en gyldig værdi."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Denne URL henviser ikke til en gyldig side eller fil."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Indtast en gyldig URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Indtast en gyldig e-mail-adresse."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Indtast en gyldig IPv4-adresse."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Indtast en gyldig IPv6-adresse."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Indtast en gyldig IPv4- eller IPv6-adresse."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Indtast kun cifre adskilt af kommaer."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Denne værdi skal mindst indeholde %(limit_value)d tegn (den indeholder %"
-"(show_value)d)."
+"Denne værdi skal mindst indeholde %(limit_value)d tegn (den indeholder "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Denne værdi må maksimalt indeholde %(limit_value)d tegn (den har %"
-"(show_value)d)."
+"Denne værdi må maksimalt indeholde %(limit_value)d tegn (den har "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "og"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "og"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Værdien %r er ikke et gyldigt valg."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Dette felt kan ikke være null."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Dette felt kan ikke være tomt."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Felt af 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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Heltal"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Denne værdi skal et heltal."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' værdien skal være et heltal."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Denne værdi skal være enten True eller False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' værdien skal være enten True eller False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolsk (enten True eller False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Streng (op til %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Kommaseparerede heltal"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"'%s' værdien har et ugyldigt datoformat. Det skal være i formatet ÅÅÅÅ-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"'%s' værdien har det korrekte format (ÅÅÅÅ-MM-DD) men er en ugyldig dato."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Dato (uden tid)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Indtast en gyldig dato i formatet ÅÅÅÅ-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Ugyldig dato: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' værdien har et ugyldigt datoformat. Det skal være i formatet ÅÅÅÅ-MM-DD "
+"TT:MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Indtast gyldig dato og tid i formatet ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"'%s' værdien har det korrekte format (ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]][TZ]) "
+"men er en ugyldig dato/tid."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Dato (med tid)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Denne værdi skal et decimaltal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' værdien skal være et decimaltal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Decimaltal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Sti"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Denne værdi skal være et kommatal."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' værdien skal være en float."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Flydende-komma-tal"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Stort heltal (8 byte)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4-adresse"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP-adresse"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Denne værdi skal være None, True eller False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' værdien skal være enten None, True eller False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolsk (True, False eller None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Positivt heltal"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Positivt lille heltal"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Lille heltal"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' værdien har et ugyldigt datoformat. Det skal være i formatet ÅÅÅÅ-MM-DD "
+"TT:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' værdien har det korrekte format (ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]) men er "
+"en ugyldig dato/tid."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Tid"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Indtast en gyldig tid i formatet TT:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML-tekst"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Fil"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Billede"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Fremmednøgle (type bestemt af relateret felt)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "En-til-en-relation"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Mange-til-mange-relation"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Hold \"Ctrl\" (eller \"Æbletasten\" på Mac) nede for at vælge mere end en."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Dette felt er påkrævet."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Indtast et heltal."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Indtast et tal."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Der må maksimalt være %s cifre i alt."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Der må højst være %s decimalpladser."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Der må maksimalt være %s cifre før decimaltegnet."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Indtast en gyldig dato."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Indtast en gyldig tid."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Indtast gyldig dato/tid."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ingen fil blev indsendt. Kontroller kodningstypen i formularen."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Ingen fil blev indsendt."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Den indsendte fil er tom."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr "Denne værdi må maksimalt indeholde %(max)d tegn (den har %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Du skal enten indsende en fil eller afmarkere afkrydsningsfeltet, ikke begge "
"dele."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -576,151 +648,160 @@ msgstr ""
"Indsend en billedfil. Filen, du indsendte, var enten ikke et billede eller "
"en defekt billedfil."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Indtast en liste af værdier."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Rækkefølge"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Slet"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ret venligst duplikerede data for %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, 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 ""
-"Ret venligst de duplikerede data for %(field_name)s, som skal være unik for %"
-"(lookup)s i %(date_field)s."
+"Ret venligst de duplikerede data for %(field_name)s, som skal være unik for "
+"%(lookup)s i %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Ret venligst de duplikerede data herunder."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s kunne ikke fortolkes i tidszonen %(current_timezone)s; den kan "
+"være tvetydig eller den eksisterer måske ikke."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Aktuelt"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Ret"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Afmarkér"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Ukendt"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nej"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ja,nej,måske"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "midnat"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "middag"
@@ -996,84 +1077,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "december"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "eller"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "år"
msgstr[1] "år"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "måned"
msgstr[1] "måneder"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "uge"
msgstr[1] "uger"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dag"
msgstr[1] "dage"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "time"
msgstr[1] "timer"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minut"
msgstr[1] "minutter"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutter"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. F Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. F Y H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Mappeindekser er ikke tilladte her"
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\" %(path)s\" eksisterer ikke"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indeks for %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1106,12 +1187,12 @@ msgstr "Ingen dag specificeret"
msgid "No week specified"
msgstr "Ingen uge specificeret"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Ingen %(verbose_name_plural)s til rådighed"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1120,7 +1201,7 @@ msgstr ""
"Fremtidige %(verbose_name_plural)s ikke tilgængelige, fordi %(class_name)s ."
"allow_future er falsk."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Ugyldig datostreng ' %(datestr)s ' givet format ' %(format)s '"
@@ -1130,16 +1211,16 @@ msgstr "Ugyldig datostreng ' %(datestr)s ' givet format ' %(format)s '"
msgid "No %(verbose_name)s found matching the query"
msgstr "Ingen %(verbose_name)s fundet matcher forespørgslen"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Side er ikke 'sidste', kan heller ikke konverteres til en int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Ugyldig side ( %(page_number)s )"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Tom liste og ' %(class_name)s .allow_empty' er falsk."
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index d411750af7..602c104f3f 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 ea11ad83c9..87ba56b444 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -1,569 +1,640 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# André Hagenbruch <ahagenbruch@googlemail.com>, 2011, 2012.
+# apollo13 <florian@apolloner.eu>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011, 2012.
+# jnns <jvajen@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:07-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: ahagenbruch <ahagenbruch@googlemail.com>\n"
-"Language-Team: German <>\n"
+"POT-Creation-Date: 2012-03-14 00:06-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/django/language/"
+"de/)\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabisch"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Aserbaidschanisch"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgarisch"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengali"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnisch"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalanisch"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tschechisch"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Walisisch"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Dänisch"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Deutsch"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Griechisch"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Englisch"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Britisches Englisch"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spanisch"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentinisches Spanisch"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Mexikanisches Spanisch"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nicaraguanisches Spanisch"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estnisch"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskisch"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persisch"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finnisch"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Französisch"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Friesisch"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irisch"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galicisch"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebräisch"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroatisch"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Ungarisch"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonesisch"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Isländisch"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italienisch"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japanisch"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgisch"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreanisch"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litauisch"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Lettisch"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Mazedonisch"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolisch"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Holländisch"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norwegisch"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norwegisch (Bokmål)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norwegisch (Nynorsk)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Panjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polnisch"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugiesisch"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brasilianisches Portugiesisch"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumänisch"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Russisch"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slowakisch"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slowenisch"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanisch"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbisch"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbisch (Latein)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Schwedisch"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamilisch"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugisch"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thailändisch"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Türkisch"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainisch"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamesisch"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Vereinfachtes Chinesisch"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Traditionelles Chinesisch"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Bitte einen gültigen Wert eingeben."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Diese Adresse scheint nicht gültig zu sein."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Bitte eine gültige Adresse eingeben."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Bitte eine gültige E-Mail-Adresse eingeben."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Bitte eine gültige IPv4-Adresse eingeben."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Eine gültige IPv6-Adresse eingeben."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Eine gültige IPv4- oder IPv6-Adresse eingeben"
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Bitte nur durch Komma getrennte Ziffern eingeben."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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)"
+"Bitte sicherstellen, dass der Wert %(limit_value)s ist. (Er ist "
+"%(show_value)s)"
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Bitte sicherstellen, dass der Wert mindestens %(limit_value)d Zeichen hat. "
"(Er hat %(show_value)d)"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Bitte sicherstellen, dass der Wert maximal %(limit_value)d Zeichen hat. (Er "
"hat %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "und"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "und"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Wert %r ist keine gültige Option."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Dieses Feld darf nicht leer sein."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Dieses Feld darf nicht leer sein."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Feldtyp: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Ganzzahl"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Dieser Wert muss eine Ganzzahl sein."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Der Wert '%s' muss eine ganze Zahl sein."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Dieser Wert muss True oder False sein."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Der Wert '%s' muss entweder True oder False sein."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolescher Wert (True oder False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Kommaseparierte Liste von Ganzzahlen"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"Der Wert '%s' hat ein ungültiges Datumsformat. Er muss im Format JJJJ-MM-TT "
+"sein."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Der Wert '%s' hat das richtige Format (JJJJ-MM-TT), ist aber ein ungültiges "
+"Datum."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Datum (ohne Uhrzeit)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Bitte ein gültiges Datum im Format JJJJ-MM-TT eingeben."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Ungültiges Datum: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' ist falsch formatiert. Das korrekte Format lautet: YYYY-MM-DD HH:MM[:ss"
+"[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Bitte eine gültige Datums- und Zeitangabe im Format JJJJ-MM-TT SS:MM[ss[."
-"uuuuuu]] eingeben."
+"'%s' hat das richtige Format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), ist aber "
+"keine gültige Datums-/Zeitangabe."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datum (mit Uhrzeit)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Dieser Wert muss eine Dezimalzahl sein."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' muss eine Dezimalzahl sein."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Dezimalzahl"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Dateipfad"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Dieser Wert muss eine Gleitkommazahl sein."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' muss eine Gleitkommazahl sein."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Gleitkommazahl"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Große Ganzzahl (8 Byte)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4-Adresse"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP-Adresse"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Dieser Wert muss None, True oder False sein."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Der Wert '%s' muss entweder None, True oder False sein."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolescher Wert (True, False oder None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Positive ganze Zahl"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Positive kleine ganze Zahl"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Kürzel (bis zu %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Kleine ganze Zahl"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' ist falsch formatiert. Das korrekte Format lautet: HH:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' hat das richtige Format (HH:MM[:ss[.uuuuuu]]), ist aber keine gültige "
+"Zeitangabe."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Zeit"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Bitte eine gültige Zeit im Format HH:MM[:ss[.uuuuuu]] eingeben."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "Adresse (URL)"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML-Text"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Datei"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Bild"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Fremdschlüssel (Typ definiert durch verknüpftes Feld)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "One-to-one-Beziehung"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Many-to-many-Beziehung"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Halten Sie die Strg-Taste (⌘ für Mac) während des Klickens gedrückt, um "
"mehrere Einträge auszuwählen."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Dieses Feld ist zwingend erforderlich."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Bitte eine ganze Zahl eingeben."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Bitte eine Zahl eingeben."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Bitte geben Sie nicht mehr als insgesamt %s Ziffern ein."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Bitte geben Sie nicht mehr als %s Dezimalstellen ein."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Bitte geben Sie nicht mehr als %s Ziffern vor dem Komma ein."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Bitte ein gültiges Datum eingeben."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Bitte eine gültige Uhrzeit eingeben."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Bitte ein gültiges Datum und Uhrzeit eingeben."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Es wurde keine Datei übermittelt. Überprüfen Sie das Encoding des Formulars."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Es wurde keine Datei übertragen."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Die ausgewählte Datei ist leer."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -571,13 +642,13 @@ msgstr ""
"Bitte sicherstellen, dass der Dateiname maximal %(max)d Zeichen hat. (Er hat "
"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Bitte wählen Sie entweder eine Datei aus oder wählen Sie \"Löschen\", nicht "
"beides."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -585,149 +656,158 @@ msgstr ""
"Bitte ein Bild hochladen. Die hochgeladene Datei ist kein Bild oder ist "
"defekt."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Bitte eine gültige Auswahl treffen. %(value)s ist keine gültige Auswahl."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Bitte eine Liste mit Werten eingeben."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Reihenfolge"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Löschen"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Bitte die doppelten Daten für %(field)s korrigieren."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, 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 ""
-"Bitte die doppelten Daten für %(field_name)s korrigieren, da es für %(lookup)"
-"s in %(date_field)s eindeutig sein muss."
+"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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Bitte die unten aufgeführten doppelten Werte korrigieren."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s konnte mit der Zeitzone %(current_timezone)s nicht eindeutig "
+"interpretiert werden, da es doppeldeutig oder eventuell inkorrekt ist."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Derzeit"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Ändern"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Zurücksetzen"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Unbekannt"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nein"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "Ja,Nein,Vielleicht"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d Byte"
msgstr[1] "%(size)d Bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "nachm."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "vorm."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "nachm."
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "vorm."
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "Mitternacht"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "Mittag"
@@ -1003,84 +1083,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Dezember"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "oder"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "Jahr"
msgstr[1] "Jahre"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "Monat"
msgstr[1] "Monate"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "Woche"
msgstr[1] "Wochen"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "Tag"
msgstr[1] "Tage"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "Stunde"
msgstr[1] "Stunden"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "Minute"
msgstr[1] "Minuten"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "Minuten"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. N Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. N Y, H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Dateilisten sind untersagt."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ist nicht vorhanden"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Verzeichnis %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1113,21 +1193,21 @@ msgstr "Kein Tag angegeben"
msgid "No week specified"
msgstr "Keine Woche angegeben"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Keine %(verbose_name_plural)s verfügbar"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"In der Zukunft liegende %(verbose_name_plural)s sind nicht verfügbar, da %"
-"(class_name)s.allow_future False ist."
+"In der Zukunft liegende %(verbose_name_plural)s sind nicht verfügbar, da "
+"%(class_name)s.allow_future False ist."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Ungültiges Datum '%(datestr)s' für das Format '%(format)s'"
@@ -1137,18 +1217,18 @@ msgstr "Ungültiges Datum '%(datestr)s' für das Format '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Unter dieser Anfrage wurden keine %(verbose_name)s gefunden"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Weder ist dies die letzte Seite ('last') noch konnte sie in einen "
"ganzzahligen Wert umgewandelt werden."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Ungültige Seite (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Leere Liste und '%(class_name)s.allow_empty' ist False."
diff --git a/django/conf/locale/el/LC_MESSAGES/django.mo b/django/conf/locale/el/LC_MESSAGES/django.mo
index 88da9af98a..855976856d 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 9d812833ad..b95e3d60f7 100644
--- a/django/conf/locale/el/LC_MESSAGES/django.po
+++ b/django/conf/locale/el/LC_MESSAGES/django.po
@@ -1,576 +1,636 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Dimitris Glezos <glezos@indifex.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Yorgos Pagles <y.pagles@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 20:57+0100\n"
-"PO-Revision-Date: 2011-03-20 11:41+0000\n"
-"Last-Translator: pagles <y.pagles@gmail.com>\n"
-"Language-Team: Greek <>\n"
+"POT-Creation-Date: 2012-03-14 00:06-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Yorgos Pagles <y.pagles@gmail.com>\n"
+"Language-Team: Greek (http://www.transifex.net/projects/p/django/language/"
+"el/)\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Αραβικά"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Γλώσσα Αζερμπαϊτζάν"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Βουλγαρικά"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Μπενγκάλι"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Βοσνιακά"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Καταλανικά"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Τσέχικα"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Ουαλικά"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Δανέζικα"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Γερμανικά"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Ελληνικά"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Αγγλικά"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Αγγλικά Βρετανίας"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Ισπανικά"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Ισπανικά Αργεντινής"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Μεξικανική διάλεκτος Ισπανικών"
-#: conf/global_settings.py:60
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
-msgstr "Μεξικανική διάλεκτος Ισπανικών"
+msgstr "Ισπανικά Νικαράγουας "
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Εσθονικά"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Βάσκικα"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Περσικά"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Φινλανδικά"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr "Γαλλικά"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisian"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Ιρλανδικά"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Γαελικά"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Εβραϊκά"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Ινδικά"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Κροατικά"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Ουγγρικά"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Ινδονησιακά"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Ισλανδικά"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Ιταλικά"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Γιαπωνέζικα"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Γεωργιανά"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Χμερ"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Κανάντα"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Κορεάτικα"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Λιθουανικά"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Λεττονικά"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Μακεδονικά"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Μαλαγιαλάμ"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Μογγολικά"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Ολλανδικά"
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr "Νορβηγικά"
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Νορβηγική διάλεκτος Μποκμάλ - \"γλώσσα των βιβλίων\""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Νορβηγική διάλεκτος Nynorsk - Νεονορβηγική"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Πουντζάμπι"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Πολωνικά"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Πορτογαλικά"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Πορτογαλικά - διάλεκτος Βραζιλίας"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Ρουμανικά"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Ρωσικά"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Σλοβακικά"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Σλοβενικά"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Αλβανικά"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Σερβικά"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Σέρβικα Λατινικά"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Σουηδικά"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Διάλεκτος Ταμίλ"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Τελούγκου"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Ταϊλάνδης"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Τουρκικά"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ουκρανικά"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Βιετναμέζικα"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Απλοποιημένα Κινέζικα"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Παραδοσιακά Κινέζικα"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Εισάγετε μια έγκυρη τιμή."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Αυτό το URL φαίνεται να είναι ένας χαλασμένος σύνδεσμος."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Εισάγετε ένα έγκυρο URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Ένα έγκυρο 'slug' αποτελείται από γράμματα, αριθμούς, παύλες ή κάτω παύλες."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Εισάγετε μια έγκυρη διεύθυνση IPv4."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Εισάγετε μία έγκυρη IPv6 διεύθυνση"
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Εισάγετε μία έγκυρη IPv4 ή IPv6 διεύθυνση"
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Εισάγετε μόνο ψηφία χωρισμένα με κόμματα."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Βεβαιωθείτε ότι η τιμή είναι %(limit_value)s (η τιμή που καταχωρήσατε είναι %"
-"(show_value)s)."
+"Βεβαιωθείτε ότι η τιμή είναι %(limit_value)s (η τιμή που καταχωρήσατε είναι "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Βεβαιωθείτε ότι η τιμή είναι μικρότερη ή ίση από %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Βεβαιωθείτε ότι η τιμή είναι μεγαλύτερη ή ίση από %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Βεβαιωθείτε ότι η τιμή έχει μέγεθος τουλάχιστον %(limit_value)d χαρακτήρες "
"(η τιμή που καταχωρήσατε έχει %(show_value)d χαρακτήρες)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Βεβαιωθείτε ότι η τιμή έχει το πολύ %(limit_value)d χαρακτήρες (η τιμή που "
"καταχωρήσατε έχει %(show_value)d χαρακτήρες)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "και"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s με αυτό το %(field_label)s υπάρχει ήδη."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "και"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Η τιμή %r δεν είναι έγκυρη επιλογή."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Αυτό το πεδίο δεν μπορεί να είναι κενό (null)."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Το πεδίο αυτό δεν μπορεί να είναι κενό."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Ακέραιος"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Αυτή η τιμή πρέπει να είναι ένας ακέραιος."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Η τιμή του '%s' πρέπει να είναι ακέραιος αριθμός (integer)."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Αυτή η τιμή πρέπει να είναι Αληθές ή Ψευδές."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Η τιμή του '%s' πρέπει να είναι True ή False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (Είτε Αληθές ή Ψευδές)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Συμβολοσειρά (μέχρι %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Ακέραιοι χωρισμένοι με κόμματα"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "Η τιμή του '%s' έχει λάθος μορφή. Η μορφή του πρέπει είναι YYYY-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Η τιμή του '%s' έχει σωστή μορφή (YYYY-MM-DD) αλλά δεν αντιστοιχεί σε σωστή "
+"ημερομηνία."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Ημερομηνία (χωρίς την ώρα)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Εισάγετε μία έγκυρη ημερομηνία στη μορφή ΧΧΧΧ-MM-ΗΗ."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Άκυρη ημερομηνία: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Η τιμή του '%s' έχει λάθος μορφή. Η μορφή του πρέπει είναι YYYY-MM-DD.HH:MM[:"
+"ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Εισάγετε μία έγκυρη ημερομηνία και ώρα στη μορφή: YYYY-MM-DD HH:MM[:ss[."
-"uuuuuu]]."
+"Η τιμή του '%s' έχει σωστή μορφή (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) αλλά "
+"δεν αντιστοιχεί σε σωστή ημερομηνία και ώρα."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Ημερομηνία (με την ώρα)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Η τιμή αυτή πρέπει να είναι δεκαδικός αριθμός."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Η τιμή του '%s' πρέπει να είναι ακέραιος δεκαδικός αριθμός (decimal)."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Δεκαδικός αριθμός"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Ηλεκτρονική διεύθυνση"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Τοποθεσία αρχείου"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Η τιμή αυτή πρέπει να είναι αριθμός κινητής υποδιαστολής."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Η τιμή του '%s' πρέπει να είναι αριθμός κινητής υποδιαστολής (float)."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Αριθμός κινητής υποδιαστολής"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Μεγάλος ακέραιος - big integer (8 bytes)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "διεύθυνση IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "H τιμή πρέπει να είναι κάποια από τις None, True ή False"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Αληθές, Ψευδές, ή τίποτα)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Κείμενο"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Ώρα"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Εισάγετε μία έγκυρη ώρα στη μορφή: HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Κείμενο XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Το μοντέλο %(model)s με πρωτεύον κλειδί %(pk)r δεν υπάρχει."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr ""
"Εξωτερικό Κλειδί - Foreign Key (ο τύπος καθορίζεται από το πεδίο του "
"συσχετισμού)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Σχέση ένα-προς-ένα"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Σχέση πολλά-προς-πολλά"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Κρατήστε πατημένο το πλήκτρο \"Control\" ή σε Mac το πλήκτρο \"Command\" για "
"να επιλέξετε περισσότερα από ένα."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Αυτό το πεδίο είναι απαραίτητο."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Εισάγετε έναν ακέραιο αριθμό."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Εισάγετε έναν αριθμό."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %s ψηφία συνολικά."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %s δεκαδικά ψηφία."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Βεβαιωθείτε ότι δεν υπάρχουν πάνω από %s ψηφία πριν την υποδιαστολή."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Εισάγετε μια έγκυρη ημερομηνία."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Εισάγετε μια έγκυρη ώρα."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Εισάγετε μια έγκυρη ημερομηνία/ώρα."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Δεν έχει υποβληθεί κάποιο αρχείο. Ελέγξτε τον τύπο κωδικοποίησης στη φόρμα."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Δεν έχει υποβληθεί κάποιο αρχείο."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Το αρχείο που υποβλήθηκε είναι κενό."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -578,14 +638,14 @@ msgstr ""
"Βεβαιωθείτε ότι το όνομα του αρχείου έχει μέγιστο μήκος %(max)d χαρακτήρες "
"(τώρα έχει %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Βεβαιωθείτε ότι είτε έχετε επιλέξει ένα αρχείο για αποστολή είτε έχετε "
"επιλέξει την εκκαθάριση του πεδίου. Δεν είναι δυνατή η επιλογή και των δύο "
"ταυτοχρόνως."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -593,38 +653,38 @@ msgstr ""
"Βεβεαιωθείτε ότι το αρχείο που έχετε επιλέξει για αποστολή είναι αρχείο "
"εικόνας. Το τρέχον είτε δεν ήταν εικόνα είτε έχει υποστεί φθορά."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Εισάγετε μια λίστα τιμών."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ταξινόμηση"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Διαγραφή"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Στο %(field)s έχετε ξαναεισάγει τα ίδια δεδομένα."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Στο %(field)s έχετε ξαναεισάγει τα ίδια δεδομένα. Θα πρέπει να εμφανίζονται "
"μία φορά. "
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -633,115 +693,122 @@ msgstr ""
"Στο %(field_name)s έχετε ξαναεισάγει τα ίδια δεδομένα. Θα πρέπει να "
"εμφανίζονται μία φορά για το %(lookup)s στο %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Έχετε ξαναεισάγει την ίδια τιμη. Βεβαιωθείτε ότι είναι μοναδική."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Το ενσωματωμένο εξωτερικό κλειδί δεν αντιστοιχεί με το κλειδί του "
"αντικειμένου από το οποίο πηγάζει."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Επιλέξτε μια έγκυρη επιλογή. Η επιλογή αυτή δεν είναι μία από τις διαθέσιμες "
"επιλογές."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Επιλέξτε μια έγκυρη επιλογή. Η επιλογή %s δεν είναι μία από τις διαθέσιμες "
"επιλογές."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "Η %s δεν είναι έγκυρη επιλογή σαν πρωτεύον κλειδί."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Τώρα"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Επεξεργασία"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Εκκαθάσριση"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Άγνωστο"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ναι"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Όχι"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ναι,όχι,ίσως"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bytes"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "μμ."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "πμ."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "ΜΜ"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "ΠΜ"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "μεσάνυχτα"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "μεσημέρι"
@@ -1017,84 +1084,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Δεκεμβρίου"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "ή"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "χρόνος"
msgstr[1] "χρόνια"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "μήνας"
msgstr[1] "μήνες"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "εβδομάδα"
msgstr[1] "εβδομάδες"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "ημέρα"
msgstr[1] "ημέρες"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ώρα"
msgstr[1] "ώρες"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "λεπτό"
msgstr[1] "λεπτά"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "λεπτά"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "j N Y"
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "j N Y, P"
-
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1127,12 +1194,12 @@ msgstr "Δεν έχει οριστεί μέρα"
msgid "No week specified"
msgstr "Δεν έχει οριστεί εβδομάδα"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Δεν υπάρχουν διαθέσιμα %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1141,30 +1208,30 @@ msgstr ""
"Μελλοντικά %(verbose_name_plural)s δεν είναι διαθέσιμα διότι δεν έχει τεθεί "
"το %(class_name)s.allow_future."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
-"Λανθασμένη αναπαράσταση ημερομηνίας '%(datestr)s' για την επιλεγμένη μορφή '%"
-"(format)s'"
+"Λανθασμένη αναπαράσταση ημερομηνίας '%(datestr)s' για την επιλεγμένη μορφή "
+"'%(format)s'"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
msgstr "Δεν βρέθηκαν %(verbose_name)s που να ικανοποιούν την αναζήτηση."
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Η σελίδα δεν έχει την τιμή 'last' υποδηλώνοντας την τελευταία σελίδα, ούτε "
"μπορεί να μετατραπεί σε ακέραιο."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Μη διαθέσιμη σελίδα (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Άδεια λίστα ενώ '%(class_name)s.allow_empty' δεν έχει τεθεί."
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index ab866971b3..2d97b8e400 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 f1719efc6b..17c81c75c2 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: 2012-03-05 02:24+0100\n"
+"POT-Creation-Date: 2012-03-14 00:06-0700\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -343,16 +343,16 @@ msgid ""
"%(show_value)d)."
msgstr ""
-#: db/models/base.py:770
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:793 forms/models.py:577
+#: db/models/base.py:787 forms/models.py:577
msgid "and"
msgstr ""
-#: db/models/base.py:794 db/models/fields/__init__.py:65
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
diff --git a/django/conf/locale/en_GB/LC_MESSAGES/django.mo b/django/conf/locale/en_GB/LC_MESSAGES/django.mo
index a7e351048d..f1f8347058 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 416a847f6a..bf2b9507a3 100644
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.po
@@ -1,578 +1,644 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# jon_atkinson <jon@jonatkinson.co.uk>, 2011.
+# <jon@jonatkinson.co.uk>, 2012.
+# Ross Poulton <ross@rossp.org>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 20:57+0100\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: jon_atkinson <jon@jonatkinson.co.uk>\n"
-"Language-Team: English (United Kingdom) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:06-0700\n"
+"PO-Revision-Date: 2012-03-12 21:48+0000\n"
+"Last-Translator: Ross Poulton <ross@rossp.org>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
+"django/language/en_GB/)\n"
+"Language: en_GB\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
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabic"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "Azerbaijani"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgarian"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengali"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnian"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalan"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Czech"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Welsh"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danish"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "German"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Greek"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "English"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "British English"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spanish"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentinian Spanish"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr ""
+msgstr "Mexican Spanish"
-#: conf/global_settings.py:60
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
-msgstr "Argentinian Spanish"
+msgstr "Nicaraguan Spanish"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estonian"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Basque"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persian"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finnish"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr "French"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisian"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irish"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galician"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebrew"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Croatian"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Hungarian"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonesian"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Icelandic"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italian"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japanese"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgian"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Korean"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lithuanian"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Latvian"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Macedonian"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolian"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Dutch"
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr "Norwegian"
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norwegian Bokmal"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norwegian Nynorsk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polish"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portuguese"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brazilian Portuguese"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Romanian"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Russian"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovak"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovenian"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanian"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbian"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbian Latin"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Swedish"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turkish"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainian"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "Urdu"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamese"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Simplified Chinese"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Traditional Chinese"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Enter a valid value."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "This URL appears to be a broken link."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Enter a valid URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Enter a valid e-mail address."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Enter a valid IPv4 address."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Enter a valid IPv6 address."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Enter a valid IPv4 or IPv6 address."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Enter only digits separated by commas."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Ensure this value is less than or equal to %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Ensure this value is greater than or equal to %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "and"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s with this %(field_label)s already exists."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "and"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Value %r is not a valid choice."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "This field cannot be null."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "This field cannot be blank."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Integer"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "This value must be an integer."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' value must be an integer."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "This value must be either True or False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' value must be either True or False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (Either True or False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (up to %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Comma-separated integers"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Date (without time)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Enter a valid date in YYYY-MM-DD format."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Invalid date: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Date (with time)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "This value must be a decimal number."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' value must be a decimal number."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Decimal number"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "E-mail address"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "File path"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' value must be a float."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Floating point number"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Big (8 byte) integer"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 address"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP address"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' value must be either None, True or False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Either True, False or None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Positive integer"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Positive small integer"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (up to %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Small integer"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Time"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML text"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "File"
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Image"
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s with pk %(pk)r does not exist."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (type determined by related field)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "One-to-one relationship"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Many-to-many relationship"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
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
+#: forms/fields.py:50
msgid "This field is required."
msgstr "This field is required."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Enter a whole number."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Enter a number."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Ensure that there are no more than %s digits in total."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Ensure that there are no more than %s decimal places."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Ensure that there are no more than %s digits before the decimal point."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Enter a valid date."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Enter a valid time."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Enter a valid date/time."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "No file was submitted. Check the encoding type on the form."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "No file was submitted."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "The submitted file is empty."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Please either submit a file or check the clear checkbox, not both."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -580,34 +646,34 @@ 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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Enter a list of values."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Order"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Delete"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Please correct the duplicate data for %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Please correct the duplicate data for %(field)s, which must be unique."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -616,110 +682,119 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Please correct the duplicate values below."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Select a valid choice. %s is not one of the available choices."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" is not a valid value for a primary key."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Currently"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Change"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Clear"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Unknown"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Yes"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "yes,no,maybe"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "midnight"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "noon"
@@ -995,84 +1070,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "December"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "or"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "year"
msgstr[1] "years"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "month"
msgstr[1] "months"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "week"
msgstr[1] "weeks"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "day"
msgstr[1] "days"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "hour"
msgstr[1] "hours"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutes"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Directory indexes are not allowed here."
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
-
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "P"
-
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" does not exist"
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index of %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1091,52 +1166,54 @@ msgstr "The %(verbose_name)s was deleted."
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr ""
+msgstr "No year specified"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "No month specified"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "No day specified"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "No week specified"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "No %(verbose_name_plural)s available"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "Invalid date string '%(datestr)s' given format '%(format)s'"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "No %(verbose_name)s found matching the query"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "Page is not 'last', nor can it be converted to an int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgstr "Invalid page (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "Empty list and '%(class_name)s.allow_empty' is False."
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 81e473f200..9a6e78806a 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 e2c2b786eb..a8b93b45cf 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -1,574 +1,644 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Antoni Aloy <antoni.aloy@trespams.com>, 2011, 2012.
+# Diego Schulz <dschulz@gmail.com>, 2012.
+# franchukelly <fcocuadrado@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2011.
+# Marc Garcia <garcia.marc@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 20:58+0100\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: aaloy <antoni.aloy@trespams.com>\n"
-"Language-Team: Spanish (Castilian) <>\n"
+"POT-Creation-Date: 2012-03-14 00:06-0700\n"
+"PO-Revision-Date: 2012-03-13 19:44+0000\n"
+"Last-Translator: Antoni Aloy <antoni.aloy@trespams.com>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
+"django/language/es/)\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "árabe"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "Azerbaiyán"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "búlgaro"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengalí"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosnio"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "catalán"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "checo"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "galés"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "danés"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "alemán"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "griego"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "inglés"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "inglés británico"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "español"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "español de Argentina"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr ""
+msgstr "Español (México)"
-#: conf/global_settings.py:60
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
-msgstr "español de Argentina"
+msgstr "Español (Nicaragua)"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estonio"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "vasco"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "finés"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr "francés"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frisón"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irlandés"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "gallego"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "hebreo"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "croata"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "húngaro"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonesio"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandés"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "japonés"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "georgiano"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "koreano"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "letón"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "macedonio"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "malayalam"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongol"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holandés"
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr "noruego"
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "bokmål"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "nynorsk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "panyabí"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "polaco"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugués"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "portugués de Brasil"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumano"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "esloveno"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albanés"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "serbio latino"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "tailandés"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ucraniano"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "Urdu"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "chino simplificado"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "chino tradicional"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Introduzca un valor correcto."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "La URL parece ser un enlace roto."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Introduzca una dirección IPv6 válida."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Introduzca una dirección IPv4 o IPv6 válida."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Introduzca sólo dígitos separados por comas."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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)."
+"Asegúrese de que este valor es %(limit_value)s (actualmente es "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Asegúrese de que este valor tiene al menos %(limit_value)d caracteres "
"(actualmente tiene %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
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:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "y"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "y"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "El valor %r no es una opción válida."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Este campo no puede estar vacío."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Este campo no puede estar vacío."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo de tipo: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Entero"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Este valor debe ser un entero."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "El valor '%s' debe ser un entero."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Este valor debe ser Verdadero o Falso."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "El valor '%s' debe ser True o False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"El valor '%s' tiene formato de fecha inválido. Debe ser de la forma YYYY-MM-"
+"DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"El valor '%s' tiene el formato correcto (YYYY-MM-DD) pero es una fecha no "
+"válida"
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduzca una fecha válida en formato AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Fecha no válida: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' tiene un formato incorrecto. Debe ser del tipo YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM[:ss[.uuuuuu]]."
+"El valor '%s' tiene el formato correcto (YYYY-MM-DD HH: MM [:ss [.uuuuuu]] "
+"[TZ]), pero no es una fecha/hora válida."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Fecha (con hora)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Este valor debe ser un entero."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "El valor '%s' debe ser un número decimal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Ruta de fichero"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Este valor debe ser un número con coma flotante."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "El valor '%s' debe ser un número decimal."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Número en coma flotante"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Entero grande (8 bytes)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "Dirección IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Dirección IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Este valor debe ser Verdadero, Falso o Ninguno."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "El valor '%s' debe ser None, True o False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Entero positivo"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Entero positivo corto"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (hasta %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Entero corto"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"El valor '%s' tiene un formato inválido. Debe ser de la forma HH:MM[:ss[."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"El valor '%s' tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero no "
+"representa una tiempo válido."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Introduzca una hora válida en formato HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Texto XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Archivo"
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Imagen"
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Llave foránea (tipo determinado por el campo relacionado)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar "
"más de una opción."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Este campo es obligatorio."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Introduzca un número."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asegúrese de que no hay más de %s dígitos en total."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asegúrese de que no hay más de %s decimales."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Asegúrese de que no hay más de %s dígitos antes de la coma decimal."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Introduzca una hora válida."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Introduzca una fecha/hora válida."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No se ha enviado ningún fichero. Compruebe el tipo de codificación en el "
"formulario."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "No se ha enviado ningún fichero"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "El fichero enviado está vacío."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -576,12 +646,12 @@ msgstr ""
"Asegúrese de que su texto tiene no más de %(max)d caracteres (actualmente "
"tiene %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
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
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -589,36 +659,36 @@ msgstr ""
"Envíe una imagen válida. El fichero que ha enviado no era una imagen o se "
"trataba de una imagen corrupta."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Orden"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija el dato duplicado para %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -627,111 +697,120 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados abajo."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s no puede interpretarse en la zona temporal "
+"%(current_timezone)s; puede ser ambiguo o puede no existir."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Actualmente"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Limpiar"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Desconocido"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Sí"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "sí,no,tal vez"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "media noche"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "medio día"
@@ -1007,84 +1086,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "diciembre"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "año"
msgstr[1] "años"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mes"
msgstr[1] "meses"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "semana"
msgstr[1] "semanas"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "día"
msgstr[1] "días"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "hora"
msgstr[1] "horas"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutos"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "j N Y"
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "j N Y P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Los índices de directorio no están permitidos."
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "P"
-
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" no existe"
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "j \\d\\e F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Índice de %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1103,52 +1182,54 @@ msgstr "El/La %(verbose_name)s ha sido borrado."
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr ""
+msgstr "No se ha indicado el año"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "No se ha indicado el mes"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "No se ha indicado el día"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "No se ha indicado la semana"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "No %(verbose_name_plural)s disponibles"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"Futuro %(verbose_name_plural)s no esta disponible porque %(class_name)s."
+"allow_future es Falso."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "Fecha '%(datestr)s' no válida, el formato válido es '%(format)s'"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "No %(verbose_name)s encontrado coincide con la consulta"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "La página no es \"ultimo\", ni puede ser convertido a un entero."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgstr "Página no válida (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "Lista vacía y '%(class_name)s.allow_empty' es Falso."
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
index 6b6c59e418..cbb38d25d2 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 bb2e8b3ca3..ca238d770b 100644
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
@@ -1,569 +1,627 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Ramiro Morales <cramm0@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:07-0400\n"
-"PO-Revision-Date: 2011-03-14 02:50+0000\n"
-"Last-Translator: cramm <cramm0@gmail.com>\n"
-"Language-Team: Spanish (Argentinian) <>\n"
+"POT-Creation-Date: 2012-03-14 00:06-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.net/projects/p/"
+"django/language/es_AR/)\n"
+"Language: es_AR\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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "árabe"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbaiyán"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "búlgaro"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengalí"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosnio"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "catalán"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "checo"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "galés"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "danés"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "alemán"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "griego"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "inglés"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "inglés británico"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "español"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "español de Argentina"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Español de México"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estonio"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "vasco"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "finlandés"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "francés"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frisón"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irlandés"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "gallego"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "hebreo"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "croata"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "húngaro"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonesio"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandés"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "japonés"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "georgiano"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "jémer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "canarés"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "coreano"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "letón"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "macedonio"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongol"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holandés"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "noruego"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "bokmål"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Panyabí"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "polaco"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugués"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "portugués de Brasil"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumano"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "esloveno"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albanés"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Latín de Serbia"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "tailandés"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ucraniano"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "chino simplificado"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "chino tradicional"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Introduzca un valor válido."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "La URL parece ser un enlace roto."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Introduzca sólo dígitos separados por comas."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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)."
+"Asegúrese de que este valor sea %(limit_value)s (actualmente es "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "y"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "y"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "El valor %r no es una opción válida."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Este campo no puede ser nulo."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Este campo no puede estar en blanco."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo tipo: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Entero"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Este valor debe ser un número entero."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Este valor debe ser True o False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduzca una fecha válida en formato AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Fecha no válida: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Introduzca un valor de fecha/hora válido en formato AAAA-MM-DD HH:MM[:ss[."
-"uuuuuu]]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Fecha (con hora)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Este valor debe ser un número decimal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Ruta de archivo"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Este valor debe ser un valor en representación de punto flotante."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Número de punto flotante"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Entero grande (8 bytes)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Dirección IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Este valor debe ser None, True o False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Introduzca un valor de hora válido en formato HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Texto XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
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:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mantenga presionada \"Control\" (\"Command\" en una Mac) para seleccionar "
"más de uno."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Este campo es obligatorio."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Introduzca un número."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asegúrese de que no existan en total mas de %s dígitos."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asegúrese de que no existan mas de %s lugares decimales."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Asegúrese de que no existan mas de %s dígitos antes del punto decimal."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Introduzca un valor de hora válido."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Introduzca un valor de fecha/hora válido."
-#: forms/fields.py:460
+#: forms/fields.py:485
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."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "No se envió ningún archivo."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "El archivo enviado está vacío."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -571,11 +629,11 @@ msgstr ""
"Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres "
"(tiene %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Por favor envíe un archivo o active el checkbox, pero no ambas cosas."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -583,37 +641,37 @@ 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
+#: forms/fields.py:689 forms/fields.py:769
#, 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."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ordenar"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:556
+#: forms/models.py:571
#, 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:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -622,114 +680,121 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Actualmente"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Eliminar"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Desconocido"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Sí"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "si,no,talvez"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "medianoche"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "mediodía"
@@ -1005,84 +1070,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Diciembre"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "año"
msgstr[1] "años"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mes"
msgstr[1] "meses"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "semana"
msgstr[1] "semanas"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "día"
msgstr[1] "días"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "hora"
msgstr[1] "horas"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutos"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j N Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j N Y P"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j \\d\\e F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1115,12 +1180,12 @@ msgstr "No se ha especificado el valor día"
msgid "No week specified"
msgstr "No se ha especificado el valor semana"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "No hay %(verbose_name_plural)s disponibles"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1129,7 +1194,7 @@ msgstr ""
"No hay %(verbose_name_plural)s futuros disponibles porque %(class_name)s."
"allow_future tiene el valor False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Cadena de fecha inválida '%(datestr)s', formato '%(format)s'"
@@ -1139,16 +1204,16 @@ msgstr "Cadena de fecha inválida '%(datestr)s', formato '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "No se han encontrado %(verbose_name)s que coincidan con la consulta "
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Página debe tener el valor 'last' o un valor número entero."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Página inválida (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Lista vacía y '%(class_name)s.allow_empty' tiene el valor False."
diff --git a/django/conf/locale/es_MX/LC_MESSAGES/django.mo b/django/conf/locale/es_MX/LC_MESSAGES/django.mo
index ac79e93b46..c44f7559a6 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 885866a9f2..1bc711e96b 100644
--- a/django/conf/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_MX/LC_MESSAGES/django.po
@@ -1,569 +1,639 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Abraham Estrada <abraham.estrada@gmail.com>, 2011, 2012.
+# zodman <zodman@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:07-0400\n"
-"PO-Revision-Date: 2011-03-07 04:38+0000\n"
-"Last-Translator: AbeEstrada <abraham.estrada@gmail.com>\n"
-"Language-Team: Spanish (Mexican) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:06-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Abraham Estrada <abraham.estrada@gmail.com>\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/django/"
+"language/es_MX/)\n"
+"Language: es_MX\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Árabe"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbaijani"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Búlgaro"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalí"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnio"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalán"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Checo"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Galés"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danés"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Alemán"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Griego"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Inglés"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Inglés británico"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Español"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Español de Argentina"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Español de México"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Español de nicaragua"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estonio"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Vasco"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finés"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Francés"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisón"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irlandés"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Gallego"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebreo"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Croata"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonesio"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandés"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japonés"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgiano"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Coreano"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lituano"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Letón"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Macedonio"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongol"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Holandés"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Noruego"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Noruego Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Noruego Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polaco"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugués"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Portugués de Brasil"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumano"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Ruso"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Esloveno"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanés"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Latin Serbio"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tailandés"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ucraniano"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamita"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Chino simplificado"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Chino tradicional"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Introduzca un valor válido."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Esta dirección URL que parece ser un enlace roto."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Ingrese una URL válida."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Introduzca una dirección IPv6 válida."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Introduzca una dirección IPv4 o IPv6 válida."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Introduzca sólo números separados por comas."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "y"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "y"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "El valor %r no es una opción válida."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Este campo no puede ser nulo."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Este campo no puede estar en blanco."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo tipo: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Entero"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Este valor debe ser un número entero."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "El valor '%s' debe ser entero."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Este valor debe ser verdadero o falso."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "El valor '%s' debe ser Verdadero o Falso."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (Verdadero o Falso)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"El valor '%s' tiene formato de fecha inválido. Debe ser de la forma YYYY-MM-"
+"DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"El valor '%s' tiene el formato correcto (YYYY-MM-DD) pero es una fecha "
+"inválida."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduzca una fecha válida en el formato AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Fecha no válida: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"El valor '%s' tiene formato de fecha inválido. Debe ser de la forma YYYY-MM-"
+"DD HH:MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Introduzca un valor de fecha/hora válido en formato AAAA-MM-DD HH:MM[:ss[."
-"uuuuuu]]."
+"El valor '%s' tiene el formato correcto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
+"pero es una fecha inválida."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Fecha (con hora)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Este valor debe ser un número decimal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "El valor '%s' debe ser un número decimal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Ruta de archivo"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Este valor debe ser un valor en punto flotante."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "El valor '%s' debe ser flotante."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Número de punto flotante"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Entero grande (8 bytes)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "Dirección IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Dirección IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Este valor debe ser Nulo, Verdadero o Falso."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "El valor '%s' debe ser Ningúno, Verdadero o Falso."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Entero positivo"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Entero positivo pequeño"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (hasta %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Entero pequeño"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"El valor '%s' tiene formato de hora inválido. Debe ser de la forma HH:MM[:ss"
+"[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"El valor '%s' tiene el formato correcto (HH:MM[:ss[.uuuuuu]]) pero es una "
+"hora inválida."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Introduzca una hora válida en formato HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Texto XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Archivo"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Imagen"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
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:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
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
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Este campo es obligatorio."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Introduzca un número."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asegúrese de que no hay más de %s dígitos en total."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asegúrese de que no hay más de %s decimales."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Asegúrese de que no existan mas de %s dígitos antes del punto decimal."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Introduzca una hora válida."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Introduzca una fecha/hora válida."
-#: forms/fields.py:460
+#: forms/fields.py:485
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."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "No se envió ningún archivo."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "El archivo enviado está vacío."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -571,11 +641,11 @@ msgstr ""
"Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres "
"(tiene %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
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
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -583,37 +653,37 @@ 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
+#: forms/fields.py:689 forms/fields.py:769
#, 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."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ordenar"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:556
+#: forms/models.py:571
#, 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:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -622,114 +692,123 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"La fecha %(datetime)s no puede se interpretada en la zona horaria "
+"%(current_timezone)s; ya que puede ser ambigua o que no pueden existir."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Actualmente"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Borrar"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Desconocido"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Sí"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "sí, no, tal vez"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "medianoche"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "mediodía"
@@ -1005,84 +1084,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Diciembre"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "años"
msgstr[1] "años"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mes"
msgstr[1] "meses"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "semana"
msgstr[1] "semanas"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "día"
msgstr[1] "días"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "horas"
msgstr[1] "horas"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutos"
msgstr[1] "minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutos"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j N Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j N Y P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Los índices del directorio no están permitidos."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" no existe"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j \\d\\e F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Índice de %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1115,12 +1194,12 @@ msgstr "No se ha especificado el valor dia"
msgid "No week specified"
msgstr "No se ha especificado el valor semana"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "No hay %(verbose_name_plural)s disponibles"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1129,7 +1208,7 @@ msgstr ""
"No hay %(verbose_name_plural)s futuros disponibles porque %(class_name)s."
"allow_future tiene el valor False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Cadena de fecha inválida '%(datestr)s', formato '%(format)s'"
@@ -1139,16 +1218,16 @@ msgstr "Cadena de fecha inválida '%(datestr)s', formato '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "No se han encontrado %(verbose_name)s que coincidan con la consulta"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "La página no es \"last\", ni puede ser convertido a un int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Página inválida (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Lista vacía y '%(class_name)s.allow_empty' tiene el valor False."
diff --git a/django/conf/locale/et/LC_MESSAGES/django.mo b/django/conf/locale/et/LC_MESSAGES/django.mo
index b9dd35437d..f892b29f79 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 1718f6fc60..f294b418a3 100644
--- a/django/conf/locale/et/LC_MESSAGES/django.po
+++ b/django/conf/locale/et/LC_MESSAGES/django.po
@@ -1,574 +1,635 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# eallik <eallik@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# <madisvain@gmail.com>, 2011.
+# madisvain <madisvain@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:07-0400\n"
-"PO-Revision-Date: 2011-03-07 20:55+0000\n"
+"POT-Creation-Date: 2012-03-14 00:06-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
"Last-Translator: madisvain <madisvain@gmail.com>\n"
-"Language-Team: Estonian <>\n"
+"Language-Team: Estonian (http://www.transifex.net/projects/p/django/language/"
+"et/)\n"
+"Language: et\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "araabia"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Aserbaidžaani"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "bulgaaria"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengali"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosnia"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "katalaani"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "tšehhi"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "uelsi"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "taani"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "saksa"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "kreeka"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "inglise"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "briti inglise"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "hispaania"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "argentiina hispaani"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "mehhiko hispaania"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "eesti"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "baski"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "pärsia"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "soome"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "prantsuse"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "friisi"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "iiri"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galiitsia"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "heebrea"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "horvaatia"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ungari"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indoneesi"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandi"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "itaalia"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "jaapani"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "gruusia"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "khmeri"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "korea"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "leedu"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "läti"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "makedoonia"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "malaia"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongoolia"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "hollandi"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "norra"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "norra (bokmal)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "norra (nynorsk)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "pandžab"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "poola"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugali"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "brasiilia portugali"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumeenia"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "vene"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "slovaki"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "sloveeni"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albaania"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "serbia"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "serbia (ladina)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "rootsi"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamiili"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "tai"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "türgi"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ukrania"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vietnami"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "lihtsustatud hiina"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "traditsiooniline hiina"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Sisestage korrektne väärtus."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "See URL näib olevat katkine."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Sisestage korrektne URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
-msgstr "Sisestage korrektne e-posti aadress:"
+msgstr "Sisestage korrektne e-posti aadress."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Sisestage korrektne IPv4 aadress."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Sisestage ainult komaga eraldatud numbreid."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Veendu, et see väärtus on %(limit_value)s (hetkel on %(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Veendu, et see väärtus on väiksem või võrdne kui %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Veendu, et see väärtus on suurem või võrdne kui %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Veendu, et see väärtus sisaldab vähemalt %(limit_value)d tähte (hetkel on %"
-"(show_value)d)."
+"Veendu, et see väärtus sisaldab vähemalt %(limit_value)d tähte (hetkel on "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Veendu, et sellel väärtusel on mitte rohkem kui %(limit_value)d tähte "
"(hetkel on %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "ja"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "ja"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Väärtus %r ei ole kehtiv valik."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "See lahter ei tohi olla tühi."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "See väli ei saa olla tühi."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Lahter tüüpi: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Täisarv"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "See väärtus peab olema täisarv."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "See väärtus peab olema kas tõene või väär"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Tõeväärtus (Kas tõene või väär)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (kuni %(max_length)s märki)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Komaga eraldatud täisarvud"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Kuupäev (kellaajata)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Sisestage korrektne kuupäev formaadis AAAA-KK-PP."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Vigane kuupäev: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Sisestage korrektne kuupäev ja kellaaeg kujul AAAA-KK-PP TT:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Kuupäev (kellaajaga)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "See väärtus peab olema kümnendarv."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Kümnendmurd"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Faili asukoht"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "See väärtus peab olema murdarv."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Ujukomaarv"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Suur (8 baiti) täisarv"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP aadress"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "See väärtus peab olema kas tühi, tõene või väär."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Tõeväärtus (Kas tõene, väär või tühi)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Aeg"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Sisestage korrektne kellaaeg formaadis TT:MM[:ss[.uuuuuu]]"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML tekst"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Mudel %(model)s primaarvõtmega %(pk)r ei leidu."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Välisvõti (tüübi määrab seotud väli) "
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Üks-ühele seos"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Mitu-mitmele seos"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
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\")."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "See lahter on nõutav."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Sisestage täisarv."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Sisestage arv."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Veenduge, et kogu numbrikohtade arv ei ületaks %s."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Veenduge, et komakohtade arv ei ületaks %s."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Veenduge, et komast vasakul olevaid numbreid ei oleks rohkem kui %s."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Sisestage korrektne kuupäev."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Sisestage korrektne kellaaeg."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Sisestage korrektne kuupäev ja kellaaeg."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ühtegi faili ei saadetud. Kontrollige vormi kodeeringutüüpi."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Ühtegi faili ei saadetud."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Saadetud fail on tühi."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Veenduge, et see failinimi sisaldab kõige rohkem %(max)d tähemärki (hetkel %"
-"(length)d)."
+"Veenduge, et see failinimi sisaldab kõige rohkem %(max)d tähemärki (hetkel "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Palun laadige fail või märgistage 'tühjenda' kast, mitte mõlemat."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -576,35 +637,35 @@ msgstr ""
"Laadige korrektne pilt. Fail, mille laadisite, ei olnud kas pilt või oli "
"fail vigane."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Sisestage väärtuste nimekiri."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Järjestus"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Kustuta"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Palun parandage duplikaat-andmed lahtris %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -613,109 +674,116 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Palun parandage allolevad duplikaat-väärtused"
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Hetkel"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Muuda"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Tühjenda"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Tundmatu"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Jah"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ei"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "jah,ei,võib-olla"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bait"
msgstr[1] "%(size)d baiti"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s kB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.l."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "e.l."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PL"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "EL"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "südaöö"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "keskpäev"
@@ -991,84 +1059,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "detsember"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "või"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "aasta"
msgstr[1] "aastat"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "kuu"
msgstr[1] "kuud"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "nädal"
msgstr[1] "nädalat"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "päev"
msgstr[1] "päeva"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "tund"
msgstr[1] "tundi"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minut"
msgstr[1] "minutit"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutit"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. N Y, H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1101,12 +1169,12 @@ msgstr "Päev on valimata"
msgid "No week specified"
msgstr "Nädal on valimata"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Ei leitud %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1115,7 +1183,7 @@ msgstr ""
"Tulevane %(verbose_name_plural)s pole saadaval, sest %(class_name)s."
"allow_future on False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Vigane kuupäeva-string '%(datestr)s' lähtudes formaadist '%(format)s'"
@@ -1125,16 +1193,16 @@ msgstr "Vigane kuupäeva-string '%(datestr)s' lähtudes formaadist '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Päringule vastavat %(verbose_name)s ei leitud"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Lehekülg ei ole 'last', ka ei saa teda konvertida täisarvuks."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Vigane lehekülg (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Tühi list ja '%(class_name)s.allow_empty' on False."
diff --git a/django/conf/locale/eu/LC_MESSAGES/django.mo b/django/conf/locale/eu/LC_MESSAGES/django.mo
index 880caf9662..725f736270 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 1b05112079..8cb8a247fe 100644
--- a/django/conf/locale/eu/LC_MESSAGES/django.po
+++ b/django/conf/locale/eu/LC_MESSAGES/django.po
@@ -1,578 +1,654 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Aitzol Naberan <anaberan@codesyntax.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# jazpillaga <jazpillaga@codesyntax.com>, 2011.
+# julen <julenx@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:07-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: aitzol <anaberan@codesyntax.com>\n"
-"Language-Team: Basque <None>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-09 09:34+0000\n"
+"Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
+"Language-Team: Basque (http://www.transifex.net/projects/p/django/language/"
+"eu/)\n"
+"Language: eu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabiera"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "Azebaianera"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgariera"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalera"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
-msgstr ""
+msgstr "Bosniera"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalana"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Txekiera"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Gales"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Daniera"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Alemaniera"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Greziera"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Ingelesa"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Ingelesa"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Espainola"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Espainola (Argentina)"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr ""
+msgstr "Espainola (Mexiko)"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Espainola (Nikaragua)"
+
+#: conf/global_settings.py:65
msgid "Estonian"
-msgstr ""
+msgstr "Estoniera"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Euskara"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persiera"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finlandiera"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Frantzesa"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
-msgstr ""
+msgstr "Frisiera"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
-msgstr ""
+msgstr "Irlandako gaelera"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galiziera"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebreera"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
-msgstr ""
+msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroaziarra"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Hungariera"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
-msgstr ""
+msgstr "Indonesiera"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandiera"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiera"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japoniera"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
-msgstr ""
+msgstr "Georgiera"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
-msgstr "khemerera"
+msgstr "Khemerera"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kanadiera"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreera"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
-msgstr ""
+msgstr "Lituaniera"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
-msgstr "Lituaniera"
+msgstr "Letoniera"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Mazedoniera"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
-msgstr ""
+msgstr "Malabarera"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
-msgstr ""
+msgstr "Mongoliera"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Holandera"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norvegiera"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
-msgstr ""
+msgstr "Punjabera"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Poloniera"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugalera"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Portugalera (Brazil)"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Errumaniera"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Errusiera"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Eslovakiera"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Esloveniera"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
-msgstr ""
+msgstr "Albaniera"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbiera"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
-msgstr ""
+msgstr "Serbiera"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Suediera"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamilera"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telegu hizkuntza"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
-msgstr ""
+msgstr "Thailandiera"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turkiera"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainera"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "Urdua"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
-msgstr ""
+msgstr "Vietnamamera"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Txinera (sinpletua)"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Txinera (tradizionala)"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Idatzi balio zuzena."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL hau ez dago ondo."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "URL zuzen bat idatzi."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "e-mail helbide zuzena idatzi."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Hizki, zenbaki, azpimarra edo marratxoz osatutako baleko 'slug' bat sartu."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
-msgstr "IPv4 zuzen bat idatzi."
+msgstr "Sartu IPv4 helbide zuzena."
+
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Sartu IPv6 helbide zuzena"
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Sartu IPv4 edo IPv6 helbide zuzena."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Komaz bereiztutako digitoak bakarrik idatzi."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Ziurtatu balioak %(limit_value)s karraktere dituela gutxienez (orain %"
-"(show_value)s dauzka)."
+"Ziurtatu balioak %(limit_value)s karraktere dituela gutxienez (orain "
+"%(show_value)s dauzka)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Ziurta zaitez balio hau %(limit_value)s baino txikiago edo berdina dela."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Ziurta zaitez balio hau %(limit_value)s baino handiago edo berdina dela."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Ziurtatu gutxienez %(limit_value)d karaktere dauzkala (orain %(show_value)d "
"dauzka)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Ziurtatu gehienez %(limit_value)d dauzkala (orain %(show_value)d dauzka)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
+"%(date_field)s eremuan %(lookup)s egiteko %(field_name)s bakarra izan behar "
+"da."
-#: 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:791 forms/models.py:562
+#: db/models/base.py:787 forms/models.py:577
msgid "and"
msgstr "eta"
-#: db/models/fields/__init__.py:63
+#: db/models/base.py:788 db/models/fields/__init__.py:65
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(field_label)s hori daukan %(model_name)s dagoeneko existitzen da."
+
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "%r balioa ez da balekoa"
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Eremu hau ezin daiteke hutsa izan (null)."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Eremu hau ezin da hutsik egon."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Zenbaki osoa"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Balio honek zenbaki osoa izan behar du."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' osoko zenbakia izan behar da."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Balio honek True edo False izan behar du."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' balioa True edo False izan behar da."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolearra (egia ala gezurra)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Katea (%(max_length)s gehienez)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Komaz bereiztutako zenbaki osoak"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"'%s' balioak ez dauka data formatu zuzena. Formatu zuzena UUUU-HH-EE da."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"'%s' balioak formatu zuzena (UUUU-HH-EE) dauka, baina ez da data zuzen bat."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Data (ordurik gabe)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Data zuzena idatzi, YYY-MM-DD formatoan."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Data okerra: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' balioak ez dauka formatu zuzena. Formatu zuzena UUUU-HH-EE .\n"
+"OO:MM[:ss[.uuuuuu]][TZ] da."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Idatzi data/ordu zuzena UUUU-HH-EE OO:MM[:ss[.uuuuu]] formatoan."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"'%s' balioak formatu zuzena dauka (UUUU-HH-EE OO:MM[:ss[.uuuuuu]][TZ]),\n"
+"baina ez da data/ordu zuzena."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Data (orduarekin)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Balio honek zenbaki hamartarra izan behar du."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' balioa hamartarra izan behar da."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Zenbaki hamartarra"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Fitxegi bidea"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Hemen zenbaki hamartar bat behar da."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' balioa koma higikorreko zenbaki bat izan behar da."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
-msgstr "Zenbaki erreala (float)"
+msgstr "Koma higikorreko zenbakia (float)"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Zenbaki osoa (handia 8 byte)."
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 helbidea"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP helbidea"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Balio honek hutsa, egia edo gezurra izan behar du (None, True,False)"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' balioa None, True edo False izan behar da."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolearra (egia, gezurra edo hutsa[None])"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Osoko positiboa"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Osoko positibo txikia"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (gehienez %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Osoko txikia"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Textua"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' balioak ez dauka formatu zuzena. OO:MM[:ss[.uuuuuu]] fotmatuan egon "
+"behar da."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' balioak formatu zuzena dauka (OO:MM[:ss[.uuuuuu]]) baina ez da ordu \n"
+"zuzena"
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Ordua"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Idatzi ordua OO:MM[:ss[.uuuuu]] formatoan."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML testua"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Fitxategia"
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Irudia"
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "%(pk)r pk duen %(model)s modeloa ez da existitzen."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "1-N (mota lotutako eremuaren arabera)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Bat-bat erlazioa"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "M:N erlazioa"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Zapaldu \"Control\" karakterea edo \"Command\" Mac batean, bat baino gehiago "
"aukeratzeko."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Eremu hau beharrezkoa da."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Zenbaki bat idatzi."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Idatzi zenbaki bat."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Ziurta zaitez %s baino digito gehiago ez dagoela."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Ziurta zaitez %s baino hamartar gehiago ez dagoela."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
"Ziurta zaitez %s digitu baino gehiago ez dagoela puntu hamartarraren "
"aurretik."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Data zuzen bat idatzi."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Ordu zuzen bat idatzi."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Data/Ordu zuzen bat idatzi."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ez da fitxategirik bidali. Baiztatu ezazu formularioren kodeketa."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Ez da fitxategirik bidali."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Bidalitako fitxategia hutsik dago."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
+"Ziurtatu fitxategiaren izenak gehienez %(max)d karaktere dituela (%(length)d "
+"dauzka)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Mesedez, igo fitxategi bat edo klikatu garbitu botoia, ez biak."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -580,143 +656,155 @@ msgstr ""
"Bidali irudi zuzena. Zuk bidalitako fitxategia ez da irudi motako edo akatsa "
"dauka."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Balio zerrenda bat idatzi ezazu."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ordena"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Ezabatu"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Mesedez zuzendu bikoiztketa %(field)s eremuan."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Mesedez zuzendu bikoizketa %(field)s eremuan. Bakarra izan behar da."
-#: forms/models.py:566
+#: forms/models.py:581
#, 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 ""
+"Mesedez zuzendu bakarra izan behar den%(field_name)s eramuarentzako "
+"bikoiztutako data\n"
+"%(lookup)s egiteko %(date_field)s eremuan"
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Mesedez zuzendu hurrengo balio bikoiztuak."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "Barneko gakoa eta gurasoaren gakoa ez datoz bat."
-#: forms/models.py:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" ez da balekoa gako nagusi gisa."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s ezin da interpretatu %(current_timezone)s ordu-eremuan;\n"
+"baliteke ez existitzea edo anbiguoa izatea"
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Orain"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Aldatu"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Garbitu"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Ezezaguna"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Bai"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ez"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "bai,ez,agian"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "byte %(size)d "
msgstr[1] "%(size)d byte"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "gauerdia"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "eguerdia"
@@ -992,84 +1080,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Abendua"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "edo"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "urtea"
msgstr[1] "urteak"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "hilabetea"
msgstr[1] "hilabeteak"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "astea"
msgstr[1] "asteak"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "eguna"
msgstr[1] "egunak"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ordua"
msgstr[1] "orduak"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutu"
msgstr[1] "minutuak"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutuak"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "DATE_FORMAT"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Direktorio zerrendak ez daude baimenduak."
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "DATETIME_FORMAT"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "TIME_FORMAT"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "YEAR_MONTH_FORMAT"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ez da existitzen"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "MONTH_DAY_FORMAT"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s zerrenda"
#: views/generic/create_update.py:121
#, python-format
@@ -1088,52 +1176,54 @@ msgstr "%(verbose_name)s ezabatu da."
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr ""
+msgstr "Ez da urterik zehaztu"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "Ez da hilabeterik zehaztu"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "Ez da egunik zehaztu"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "Ez da asterik zehaztu"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "Ez dago %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"Etorkizuneko %(verbose_name_plural)s ez dago aukeran \n"
+"%(class_name)s.alloe_future False delako"
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "%(datestr)s data string okerra '%(format)s' formaturako"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "Bilaketarekin bat datorren %(verbose_name)s-rik ez dago"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "Orria ez da azkena, hortaz ezin da osokora (int) biurtu."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgstr "Orri okerra (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "Zerrenda hutsa eta '%(class_name)s.allow_empty' False da"
diff --git a/django/conf/locale/fa/LC_MESSAGES/django.mo b/django/conf/locale/fa/LC_MESSAGES/django.mo
index f391e782b2..85d76a2c2c 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 ba697a5d55..8aed85d1f9 100644
--- a/django/conf/locale/fa/LC_MESSAGES/django.po
+++ b/django/conf/locale/fa/LC_MESSAGES/django.po
@@ -1,568 +1,636 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Ali Nikneshan <ali@nikneshan.com>, 2011.
+# Alireza Savand <alireza.savand@gmail.com>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Saeed <sd.javadi@gmail.com>, 2011.
+# Sina Cheraghi <sinacher@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:08-0400\n"
-"PO-Revision-Date: 2011-03-06 14:50+0000\n"
-"Last-Translator: sinacher <sinacher@gmail.com>\n"
-"Language-Team: Persian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Alireza Savand <alireza.savand@gmail.com>\n"
+"Language-Team: Persian (http://www.transifex.net/projects/p/django/language/"
+"fa/)\n"
+"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "عربی"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "آذربایجانی"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
-msgstr "بلغاری"
+msgstr "پاک کردن"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "بنگالی"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "بوسنیایی"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "کاتالونیایی"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "چکی"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "ویلزی"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "دانمارکی"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "آلمانی"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "یونانی"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "انگلیسی"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "انگلیسی بریتیش"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "اسپانیایی"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "اسپانیایی آرژانتینی"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "اسپانیولی مکزیکی"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "نیکاراگوئه اسپانیایی"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "استونی"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "باسکی"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "فارسی"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "فنلاندی"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "فرانسوی"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "فریزی"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "ایرلندی"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "گالیسیایی"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "عبری"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "هندی"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "کرواتی"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "مجاری"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "اندونزیایی"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "ایسلندی"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "ایتالیایی"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "ژاپنی"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "گرجی"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "خمری"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "کناده‌ای"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "کره‌ای"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "لیتوانی"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "لتونیایی"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "مقدونی"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "مالایایی"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "مغولی"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "هلندی"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "نروژی"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "نروژی Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "نروژی Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "پنجابی"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "لهستانی"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "پرتغالی"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "پرتغالیِ برزیل"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "رومانی"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "روسی"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "اسلواکی"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "اسلووِنی"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "آلبانیایی"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "صربی"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "صربی لاتین"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "سوئدی"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "تامیلی"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "تلوگویی"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "تایلندی"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "ترکی"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "اکراینی"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "اردو"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "ویتنامی"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "چینی ساده‌شده"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "چینی سنتی"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "یک مقدار معتبر وارد کنید."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "به نظر می‌رسد این نشانی یک پیوند شکسته است."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "یک نشانی اینترنتی معتبر وارد کنید."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "یک نشانی پست الکترونیکی معتبر وارد کنید."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "یک 'slug' معتبر شامل حروف، ارقام، خط زیر و یا خط تیره وارد کنید."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "یک نشانی IPv4 معتبر وارد کنید."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "یک آدرس معتبر IPv6 وارد کنید."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "فقط ارقام جدا شده با کاما وارد کنید."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
+msgstr "مطمئن شوید مقدار %(limit_value)s است. (اکنون %(show_value)s می باشد)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
+msgstr "مطمئن شوید این مقدار کوچکتر و یا مساوی %(limit_value)s است."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
+msgstr "مطمئن شوید این مقدار بزرگتر و یا مساوی %(limit_value)s است."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
+"مطمئن شوید این مقدار حداقل %(limit_value)d نویسه دارد. (الان %(show_value)d "
+"دارد.)"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
+"مطمئن شوید این متغیر حداکثر %(limit_value)d نویسه داشته باشد.(اکنون "
+"%(show_value)d نویسه دارد)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
-
-#: 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 "%(field_name)s باید برای %(date_field)s یکتا باشد %(lookup)s."
-#: db/models/base.py:791 forms/models.py:562
+#: db/models/base.py:787 forms/models.py:577
msgid "and"
msgstr "و"
-#: db/models/fields/__init__.py:63
+#: db/models/base.py:788 db/models/fields/__init__.py:65
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "%(model_name)s با این %(field_label)s از قبل موجود است."
+
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "مقدار %r معتبر نیست."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "این فیلد نمی تواند پوچ باشد."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "این فیلد نمی تواند خالی باشد."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, 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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "عدد صحیح"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "این مقدار باید یک عدد صحیح باشد."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' باید مقدار عددی باشد."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "این مقدار باید درست یا غلط باشد."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "بولی (درست یا غلط)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "رشته (تا %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "اعداد صحیح جدا-شده با ویلگول"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "تاریخ (بدون زمان)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "یک تاریخ معتبر در قالب YYYY-MM-DD وارد کنید."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "تاریخ نامعتبر: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]] وارد کنید."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "تاریخ (با زمان)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "این مقدار باید یک عدد باشد."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "مقدار '%s' باید عدد دسیمال باشد"
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "عدد دهدهی"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "نشانی پست الکترونیکی"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "مسیر پرونده"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr " این مقدار باید شناور باشد."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "عدد اعشاری"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "بزرگ (8 بایت) عدد صحیح"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 آدرس"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "نشانی IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "این مقدار باید یکی از مقادیر پوچ یا درست یا نادرست باشد."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "‌بولی (درست، نادرست یا پوچ)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "متن"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "زمان"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "یک زمان معتبر در قالب HH:MM[:ss[.uuuuuu]] وارد کنید."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "نشانی اینترنتی"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "متن XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "مدل %(model)s با کلید اصلی %(pk)r وجود ندارد."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "کلید خارجی ( نوع بر اساس فیلد رابط مشخص میشود )"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "رابطه یک به یک "
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "رابطه چند به چند"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"برای انتخاب بیش از یکی \"Control\"، یا \"Command\" روی Mac، را پایین نگه "
"دارید."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "این فیلد لازم است."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "به طور کامل یک عدد وارد کنید."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "یک عدد وارد کنید."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "مطمئن شوید در مجموع بیش از %s رقم نداشته باشد."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "مطمئن شوید بیش از %s رقم اعشاری نداشته باشد."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "مطمئن شوید بیش از %s رقم قبل ممیز نداشته باشد."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "یک تاریخ معتبر وارد کنید."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "یک زمان معتبر وارد کنید."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "یک تاریخ/زمان معتبر وارد کنید."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "پرونده‌ای ارسال نشده است. نوع کدگذاری فرم را بررسی کنید."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "پرونده‌ای ارسال نشده است."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "پروندهٔ ارسال‌شده خالیست."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "لطفا یا فایل ارسال کنید یا دکمه clear را علامت بزنید، نه هردو."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -570,142 +638,151 @@ msgstr ""
"یک تصویر معتبر بارگذاری کنید. پرونده‌ای که بارگذاری کردید یا تصویر نبوده و یا "
"تصویری مخدوش بوده است."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "فهرستی از مقادیر وارد کنید."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "ترتیب:"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "حذف"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "لطفا محتوی تکراری برای %(field)s را اصلاح کنید."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "لطفا محتوی تکراری برای %(field)s را که باید یکتا باشد اصلاح کنید."
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "لطفا مقدار تکراری را اصلاح کنید."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "کلید های درون خطی خارجی با هم مطابقت ندارند ."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "یک گزینهٔ معتبر انتخاب کنید. آن گزینه از گزینه‌های موجود نیست."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "یک گزینهٔ معتبر انتخاب کنید. %s از گزینه‌های موجود نیست."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
+msgstr "\"%s\" مقدار معتبری برای کلید اصلی نیست. "
+
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:299
+#: forms/widgets.py:325
msgid "Currently"
msgstr "در حال حاضر"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "تغییر"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "واضح"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "ناشناخته"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "بله"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "خیر"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "بله،خیر،شاید"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d بایت"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "ب.ظ."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "صبح"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "بعد از ظهر"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "صبح"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "نیمه شب"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "ظهر"
@@ -981,78 +1058,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "دسامبر"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "یا"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr "،"
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "سال"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "ماه"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "هفته"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "روز"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ساعت"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "دقیقه"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "دقیقه"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr "، %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "DATE_FORMAT"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "DATETIME_FORMAT"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "TIME_FORMAT"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "YEAR_MONTH_FORMAT"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "MONTH_DAY_FORMAT"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1085,38 +1162,40 @@ msgstr "هیچ روزی مشخص نشده است"
msgid "No week specified"
msgstr "هیچ هفته‌ای مشخص نشده است"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "هیچ %(verbose_name_plural)s موجود نیست"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"آینده %(verbose_name_plural)s امکان پذیر نیست زیرا مقدار %(class_name)s."
+"allow_future برابر False تنظیم شده است."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "متن تاریخ '%(datestr)s' با فرمت '%(format)s' غلط است."
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "هیچ %(verbose_name)s ای مطابق جستجو پیدا نشد."
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "Page مقدار 'last' نیست,همچنین قابل تبدیل به عدد هم نمیباشد."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgstr "صفحه نادرست (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr " لیست خالی است و '%(class_name)s.allow_empty' برابر False است."
diff --git a/django/conf/locale/fi/LC_MESSAGES/django.mo b/django/conf/locale/fi/LC_MESSAGES/django.mo
index 7a5526c4f5..7bdb2de587 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 95db3c0d1e..e674df249b 100644
--- a/django/conf/locale/fi/LC_MESSAGES/django.po
+++ b/django/conf/locale/fi/LC_MESSAGES/django.po
@@ -1,610 +1,671 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Antti Kaihola <akaihol+transifex@ambitone.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# <klaus.dahlen@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:08-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: akaihola <akaihol+transifex@ambitone.com>\n"
-"Language-Team: Finnish <None>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Antti Kaihola <akaihol+transifex@ambitone.com>\n"
+"Language-Team: Finnish (http://www.transifex.net/projects/p/django/language/"
+"fi/)\n"
+"Language: fi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "arabia"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "Azeri"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "bulgaria"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengali"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosnia"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "katalaani"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "tšekki"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "wales"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "tanska"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "saksa"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "kreikka"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "englanti"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "brittienglanti"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "espanja"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentiinan espanja"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr ""
+msgstr "Meksikon espanja"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nicaraguan espanja"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "viro"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "baski"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persia"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "suomi"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ranska"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "friisi"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irlanti"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galicia"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "heprea"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "kroatia"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "unkari"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonesia"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islanti"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "italia"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "japani"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "georgia"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "korea"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "liettua"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "latvia"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "makedonia"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "malajalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongolia"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "hollanti"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "norja"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "norja (kirjanorja)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "norja (uusnorja)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "punjabin kieli"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "puola"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugali"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "brasilian portugali"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "romania"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "venäjä"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "slovakia"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "slovenia"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albaani"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "serbia"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "serbian latina"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "ruotsi"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamili"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "thain kieli"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turkki"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ukraina"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vietnam"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "kiina (yksinkertaistettu)"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "kiina (perinteinen)"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Syötä oikea arvo."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Tämä URL-osoite on rikkinäinen linkki."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Syötä oikea URL-osoite."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Syötä kelvollinen sähköpostiosoite."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Syötä kelvollinen IPv4-osoite."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Vain pilkulla erotetut kokonaisluvut kelpaavat tässä."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Tähän tarvitaan vähintään %(limit_value)d merkkiä (nyt on vain %(show_value)"
-"d)."
+"Tähän tarvitaan vähintään %(limit_value)d merkkiä (nyt on vain "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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:769
+#: db/models/base.py:764
#, 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."
+"\"%(field_name)s\"-kentän on oltava uniikki suhteessa: %(date_field)s "
+"%(lookup)s."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "ja"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "ja"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Arvo %r ei kelpaa."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Tämän kentän arvo ei voi olla \"null\"."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
-msgstr "Tämän kenttä ei voi olla tyhjä."
+msgstr "Tämä kenttä ei voi olla tyhjä."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Kenttä tyyppiä: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Kokonaisluku"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Tarvitaan kokonaisluku."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Tarvitaan tosi (True) tai epätosi (False)."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Totuusarvo: joko tosi (True) tai epätosi (False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Merkkijono (enintään %(max_length)s merkkiä)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Pilkulla erotetut kokonaisluvut"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Päivämäärä (ilman kellonaikaa)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Päivämäärän pitää olla muodossa VVVV-KK-PP."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Päivämäärä %s ei kelpaa"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Ajankohdan pitää olla muodossa VVVV-KK-PP TT:MM[:ss[.uuuuuu]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Päivämäärä ja kellonaika"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Tähän tarvitaan desimaaliluku."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Desimaaliluku"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Tiedostopolku"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Tämän luvun on oltava liukuluku."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Liukuluku"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Suuri (8-tavuinen) kokonaisluku"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP-osoite"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Tähän tarvitaan tyhjä (None), tosi (True) tai epätosi (False)."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Totuusarvo: joko tosi (True), epätosi (False) tai ei mikään (None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekstiä"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Kellonaika"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Ajan täytyy olla muodossa TT:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL-osoite"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML-teksti"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Vierasavain (tyyppi määräytyy liittyvän kentän mukaan)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Yksi-yhteen relaatio"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Moni-moneen relaatio"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
" Pidä \"Ctrl\"-näppäin (tai Macin \"Command\") pohjassa valitaksesi useita "
"vaihtoehtoja."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Tämä kenttä vaaditaan."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Syötä kokonaisluku."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
-msgstr "Syötä kokonaisluku."
+msgstr "Syötä luku."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Tässä luvussa voi olla yhteensä enintään %s numeroa."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Tässä luvussa saa olla enintään %s desimaalia."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Tässä luvussa saa olla enintään %s numeroa ennen desimaalipilkkua."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Syötä oikea päivämäärä."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Syötä oikea kellonaika."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Syötä oikea pvm/kellonaika."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Tiedostoa ei lähetetty. Tarkista lomakkeen koodaus (encoding)."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Yhtään tiedostoa ei ole lähetetty."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Lähetetty tiedosto on tyhjä."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Tähän tiedostonimeen kelpaa enintään %(max)d merkkiä (nyt niitä on %(length)"
-"d)."
+"Tähän tiedostonimeen kelpaa enintään %(max)d merkkiä (nyt niitä on "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Voit joko lähettää tai poistaa tiedoston, muttei kumpaakin samalla."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Kuva ei kelpaa. Lähettämäsi tiedosto ei ole kuva, tai tiedosto on vioittunut."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Syötä lista."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Järjestys"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Poista"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Korjaa kaksoisarvo kentälle %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -613,109 +674,116 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Korjaa allaolevat kaksoisarvot."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Liittyvä perusavain ei vastannut vanhemman perusavainta."
-#: forms/models.py:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" ei kelpaa perusavaimeksi."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Tällä hetkellä"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Muokkaa"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Poista"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Tuntematon"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Kyllä"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ei"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "kyllä,ei,ehkä"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d tavu"
msgstr[1] "%(size)d tavua"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "ip"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "ap"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "IP"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AP"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "keskiyö"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "keskipäivä"
@@ -991,84 +1059,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "joulukuuta"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "tai"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "vuosi"
msgstr[1] "vuotta"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "kuukausi"
msgstr[1] "kuukautta"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "viikko"
msgstr[1] "viikkoa"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "päivä"
msgstr[1] "päivää"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "tunti"
msgstr[1] "tuntia"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuutti"
msgstr[1] "minuuttia"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuuttia"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j.n.Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j.n.Y H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "N Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "N j, Y"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1087,52 +1155,54 @@ msgstr "%(verbose_name)s on poistettu."
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr ""
+msgstr "Vuosi puuttuu"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "Kuukausi puuttuu"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "Päivä puuttuu"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "Viikko puuttuu"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "%(verbose_name_plural)s: yhtään kohdetta ei löydy"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"%(verbose_name_plural)s: tulevia kohteita ei löydy, koska %(class_name)s."
+"allow_future:n arvo on False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "Päivämäärä '%(datestr)s' ei ole muotoa '%(format)s'"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "Hakua vastaavaa %(verbose_name)s -kohdetta ei löytynyt"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "Sivunumero ei ole 'last' (viimeinen) eikä näytä luvulta."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgstr "Virheellinen sivu (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "Lista on tyhjä, ja '%(class_name)s.allow_empty':n arvo on False."
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 2ea0304141..d3c71f78cc 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 090994fe79..237006d480 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -1,572 +1,645 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# <claude@2xlibre.net>, 2011, 2012.
+# claudep <claude@2xlibre.net>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Larlet davidbgk <larlet@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:08-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
"Last-Translator: claudep <claude@2xlibre.net>\n"
-"Language-Team: French <None>\n"
+"Language-Team: French (http://www.transifex.net/projects/p/django/language/"
+"fr/)\n"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabe"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azéri"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgare"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalî"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosniaque"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalan"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tchèque"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Gallois"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Dannois"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Allemand"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Grec"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Anglais"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Anglais britannique"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Espagnol"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Espagnol argentin"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Espagnol mexicain"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Espagnol nicaraguayen"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estonien"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Basque"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Perse"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finlandais"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Français"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frise"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irlandais"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galicien"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hébreu"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Croate"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Hongrois"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonésien"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandais"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italien"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japonais"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Géorgien"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Coréen"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lituanien"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Letton"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Macédonien"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayâlam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongole"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Hollandais"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norvégien"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norvégien Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norvégien Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Penjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polonais"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugais"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Portugais brésilien"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Roumain"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Russe"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovaque"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovène"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanais"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbe"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbe latin"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Suédois"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamoul"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Télougou"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thaï"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turc"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainien"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Ourdou"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamien"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Chinois simplifié"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Chinois traditionnel"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Saisissez une valeur valide."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Cette URL semble être cassée."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Saisissez une URL valide."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Entrez une adresse de courriel valide."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Saisissez une adresse IPv4 valide."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Saisissez une adresse IPv6 valide."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Saisissez une adresse IPv4 ou IPv6 valide."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Saisissez uniquement des chiffres séparés par des virgules."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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)."
+"Assurez-vous que cette valeur est %(limit_value)s (actuellement "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Assurez-vous que cette valeur comporte au moins %(limit_value)d caractères "
"(actuellement %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Assurez-vous que cette valeur comporte au maximum %(limit_value)d caractères "
"(actuellement %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "et"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "et"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "La valeur « %r » n'est pas un choix valide."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Ce champ ne peut pas être vide."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Ce champ ne peut pas être vide."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Champ de 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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Entier"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Cette valeur doit être un entier."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "La valeur « %s » doit être un nombre entier."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Cette valeur doit être soit vraie (True) soit fausse (False)."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "La valeur « %s » doit être soit True (vrai), soit False (faux)."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Booléen (soit vrai ou faux)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Chaîne de caractère (jusqu'à %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Des entiers séparés par une virgule"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"Le format de date de la valeur « %s » n'est pas valide. Le format correct "
+"est AAAA-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Le format de date de la valeur « %s » est correct (AAAA-MM-DD), mais la date "
+"n'est pas valide."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Date (sans l'heure)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Saisissez une date valide au format AAAA-MM-JJ."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Date non valide : %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Le format de la valeur « %s » n'est pas valide. Le format correct est AAAA-"
+"MM-DD HH:MM[:ss[.uuuuuu]][FH]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Saisissez une date et une heure valides au format AAAA-MM-JJ HH:MM[:ss[."
-"uuuuuu]]."
+"Le format de date de la valeur « %s » est correct (AAAA-MM-DD HH:MM[:ss[."
+"uuuuuu]][FH]), mais la date ou l'heure n'est pas valide."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Date (avec l'heure)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Cette valeur doit être un nombre décimal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "La valeur « %s » doit être un nombre décimal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Nombre décimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Adresse électronique"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Chemin vers le fichier"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Cette valeur doit être un nombre réel."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "La valeur « %s » doit être un nombre à virgule flottante."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Nombre à virgule flottante"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Grand entier (8 octets)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "Adresse IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
-msgstr "adresse IP"
+msgstr "Adresse IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Cette valeur doit être nulle (None), vraie (True) ou fausse (False)."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
+"La valeur « %s » doit valoir soit None (rien), True (vrai) ou False (faux)."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Booléen (soit vrai, faux ou nul)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Nombre entier positif"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Petit nombre entier positif"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (jusqu'à %(max_length)s car.)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Petit nombre entier"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Texte"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Le format de la valeur « %s » n'est pas valide. Le format correct est HH:MM[:"
+"ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Le format de la valeur « %s » est correct (HH:MM[:ss[.uuuuuu]]), mais "
+"l'heure n'est pas valide."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Heure"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Saisissez une heure valide au format HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Texte XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Fichier"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Image"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Clé étrangère (type défini par le champ lié)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relation un à un"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relation plusieurs à plusieurs"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-"Maintenez appuyé « Ctrl », ou « Commande (touche pomme) » sur un Mac, pour en "
-"sélectionner plusieurs."
+"Maintenez appuyé « Ctrl », ou « Commande (touche pomme) » sur un Mac, pour "
+"en sélectionner plusieurs."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Ce champ est obligatoire."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Saisissez un nombre entier."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Saisissez un nombre."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres au total."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres après la virgule."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres avant la virgule."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Saisissez une date valide."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Saisissez une heure valide."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Saisissez une date et une heure valides."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Aucun fichier n'a été soumis. Vérifiez le type d'encodage du formulaire."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Aucun fichier n'a été soumis."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Le fichier soumis est vide."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -574,11 +647,11 @@ msgstr ""
"Assurez-vous que ce nom de fichier ne contient pas plus de %(max)d "
"caractères (actuellement %(length)d caractères)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Envoyez un fichier ou cochez la case d'effacement, mais pas les deux."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -586,36 +659,36 @@ msgstr ""
"Téléversez une image valide. Le fichier que vous avez transféré n'est pas "
"une image ou bien est corrompu."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Sélectionnez un choix valide. %(value)s n'en fait pas partie."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Saisissez une liste de valeurs."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ordre"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Supprimer"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Corrigez les données à double dans %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -624,113 +697,122 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Corrigez les valeurs à double ci-dessous."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"La valeur %(datetime)s n'a pas pu être interprétée dans le fuseau horaire "
+"%(current_timezone)s ; elle est peut-être ambigüe ou elle n'existe pas."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Actuellement"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Modifier"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Effacer"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Inconnu"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Oui"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Non"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "oui, non, peut-être"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d octet"
msgstr[1] "%(size)d octets"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "après-midi"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "matin"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "Après-midi"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "Matin"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "minuit"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "midi"
@@ -1006,84 +1088,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Décembre"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s…"
+
+#: utils/text.py:234
msgid "or"
msgstr "ou"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "an"
msgstr[1] "ans"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mois"
msgstr[1] "mois"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "semaine"
msgstr[1] "semaines"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "jour"
msgstr[1] "jours"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "heure"
msgstr[1] "heures"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minute"
msgstr[1] "minutes"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutes"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j F Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j F Y, G:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Il n'est pas autorisé d'afficher le contenu de ce répertoire."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "G:i:s"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "« %(path)s » n'existe pas"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index de %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1116,12 +1198,12 @@ msgstr "Aucun jour indiqué"
msgid "No week specified"
msgstr "Aucune semaine indiquée"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Pas de %(verbose_name_plural)s disponible"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1130,7 +1212,7 @@ msgstr ""
"Pas de %(verbose_name_plural)s disponible dans le futur car %(class_name)s."
"allow_future est faux (False)."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1142,18 +1224,18 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr "Aucun objet %(verbose_name)s trouvé en réponse à la requête"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Page ne vaut pas « last » et ne peut pas non plus être converti en un nombre "
"entier."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Page non valide (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Liste vide et %(class_name)s.allow_empty est faux (False)."
diff --git a/django/conf/locale/fy_NL/LC_MESSAGES/django.mo b/django/conf/locale/fy_NL/LC_MESSAGES/django.mo
index 776c65da63..952e6118c1 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 bbb46b6484..1a53a81cf8 100644
--- a/django/conf/locale/fy_NL/LC_MESSAGES/django.po
+++ b/django/conf/locale/fy_NL/LC_MESSAGES/django.po
@@ -1,576 +1,630 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 20:58+0100\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: fy_NL\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: fy_NL\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr ""
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr ""
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr ""
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr ""
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr ""
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
msgstr ""
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr ""
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr ""
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr ""
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr ""
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr ""
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr ""
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr ""
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr ""
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr ""
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr ""
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr ""
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr ""
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr ""
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Jou in falide wearde."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Dit URL liket in ferbrutsen keppeling."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Jou in falide URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr ""
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Jou in falide IPv4-adres."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Jou allinnich sifers, skieden troch komma's."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr ""
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr ""
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Dit fjild kin net leech wêze."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: 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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr ""
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Dizze wearde moat in integer wêze."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Dizze wearde moat of Wier of Net wier wêze."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr ""
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr ""
-#: db/models/fields/__init__.py:584
-msgid "Date (without time)"
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
msgstr ""
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Jou in falide daum yn JJJJ-MM-DD-formaat."
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:652
+msgid "Date (without time)"
+msgstr ""
+
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Foute datum: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Jou in falide datum/tiid yn JJJ-MM-DD OO:MM[:ss[.uuuuuu]]-formaat."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr ""
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Dizze wearde moat in desimaal nûmer wêze."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr ""
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr ""
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr ""
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr ""
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Dizze wearde moat of Gjin, of Wier of Net wier wêze."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr ""
-#: db/models/fields/__init__.py:1040
-msgid "Time"
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
msgstr ""
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Jou in falide tiid yn OO:MM[:ss[.uuuuuu]]-formaat."
+#: db/models/fields/__init__.py:1185
+msgid "Time"
+msgstr ""
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr ""
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Hâld \"Control\", of \"Command\" op in Mac del, om mear as ien te "
"selektearjen."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Dit fjild is fereaske."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Jou in folslein nûmer."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Jou in nûmer."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Wês wis dat der yn totaal net mear as %s sifers binne."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Wês wis dat der net mear as %s desimale plakken binne."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Wês wis dat der net mear as %s sifers foar it desimale punt."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Jou in falide datum."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Jou in falide tiid."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Jou in falide datum.tiid."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Der is gjin bestân yntsjinne. Kontrolearje it kodearringstype op it "
"formulier."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Der is gjin bestân yntsjinne."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "It yntsjinne bestân is leech."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -578,145 +632,152 @@ msgstr ""
"Laad in falide ôfbylding op. It bestân dy't jo opladen hawwe wie net in "
"ôfbylding of in skansearre ôfbylding."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Jou in list mei weardes."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Oarder"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr ""
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr ""
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr ""
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr ""
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr ""
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr ""
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr ""
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr ""
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr ""
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr ""
@@ -992,84 +1053,84 @@ msgctxt "alt. month"
msgid "December"
msgstr ""
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ""
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr ""
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr ""
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
msgstr ""
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "P"
-
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1102,19 +1163,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1124,16 +1185,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 6ba27ec04d..efd3cc1c95 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 8e78b769da..0c4d9de153 100644
--- a/django/conf/locale/ga/LC_MESSAGES/django.po
+++ b/django/conf/locale/ga/LC_MESSAGES/django.po
@@ -1,569 +1,630 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Michael Thornhill <michael@maithu.com>, 2011.
+# Séamus Ó Cúile <seamus.ocuile@oegaillimh.ie>, 2011.
+# Seán de Búrca <leftmostcat@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:08-0400\n"
-"PO-Revision-Date: 2011-03-10 15:16+0000\n"
-"Last-Translator: seamus <seamus.ocuile@oegaillimh.ie>\n"
-"Language-Team: Irish <None>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: leftmostcat <leftmostcat@gmail.com>\n"
+"Language-Team: Irish (http://www.transifex.net/projects/p/django/language/"
+"ga/)\n"
+"Language: ga\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ga\n"
"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
"4)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Araibis"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Asarbaiseáinis"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgáiris"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Beangáilis"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
-msgstr "Boisniais"
+msgstr "Boisnis"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalóinis"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Seicis"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Breatnais"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danmhairgis "
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Gearmáinis"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Gréigis"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Béarla"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Béarla na Breataine"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spáinnis"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Spáinnis na hAirgintíne"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Spáinnis Mheicsiceo "
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Spáinnis Nicearagua"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Eastóinis"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Bascais"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Peirsis"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Fionlainnis"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Fraincis"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
-msgstr "Frisianais"
+msgstr "Freaslainnis"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Gaeilge"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Gailísis"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Eabhrais"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hiondúis"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Cróitis"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Ungáiris"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indinéisis"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
-msgstr "Mórlainnis"
+msgstr "Íoslainnis"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Iodáilis"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Seapáinis"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
-msgstr "Seoirseach"
+msgstr "Seoirsis"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Ciméiris"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Cannadais"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Cóiréis"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Liotuáinis"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Laitvis"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Macadóinis"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Mailéalaimis"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongóilis"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Ollainnis"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Ioruais"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
-msgstr "Bokmal Ioruais"
+msgstr "Ioruais Bokmål"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
-msgstr "Nynorsk Ioruais"
+msgstr "Ioruais Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Puinseáibis"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polainnis"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portaingéilis"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
-msgstr "Portaingéilis Bhrasaíleach"
+msgstr "Portaingéilis na Brasaíle"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rómáinis"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Rúisis"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slóvaicis"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slóivéinis"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
-msgstr "Albanian"
+msgstr "Albáinis"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Seirbis"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
-msgstr "Laidin Seirbiach"
+msgstr "Seirbis (Laidineach)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Sualainnis"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamailis"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Teileagúis"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
-msgstr "Tamailis"
+msgstr "Téalainnis"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Tuircis"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Úcráinis"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdais"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
-msgstr "Vitneaimis"
+msgstr "Vítneamais"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
-msgstr "Sínis"
+msgstr "Sínis Simplithe"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
-msgstr "Sínis Tradisúinta"
+msgstr "Sínis Traidisiúnta"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
-msgstr "Cuir luach bailí isteach."
+msgstr "Iontráil luach bailí"
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Dealraíonn sé gur nasc briste é an URL seo."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
-msgstr "Cuir URL bailí isteach."
+msgstr "Iontráil URL bailí."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
-msgstr "Cuir isteach seoladh ríomhphoist bhailí."
+msgstr "Iontráil seoladh ríomhphoist bailí."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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ó "
+"Iontráil 'slug' bailí a chuimsíonn litreacha, uimhreacha, fostríoca nó "
"fleiscíní."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
-msgstr "Cuir seoladh bailí IPv4 isteach."
+msgstr "Iontráil seoladh IPv4 bailí."
+
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
-msgstr "Ná cuir isteach ach digití scartha ag camóga."
+msgstr "Ná hiontráil ach digití atá deighilte le camóga."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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)."
+"Cinntigh go bhfuil an luach seo %(limit_value)s (tá sé %(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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."
+"Cinntigh go bhfuil an luach seo níos lú ná nó cothrom le %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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."
+"Cinntigh go bhfuil an luach seo níos mó ná nó cothrom le %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Bí cinnte nach bhfuil níos lú ná %(limit_value)d carachtar sa luach seo (it "
-"has %(show_value)d)."
+"Cinntigh nach bhfuil níos lú ná %(limit_value)d carachtar ag an luach seo "
+"(tá %(show_value)d aige)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Bí cinnte nach bhfuil níos mó ná %(limit_value)d carachtar sa luach seo %"
-"(show_value)d)."
+"Cinntigh nach bhfuil níos mó ná %(limit_value)d carachtar ag an luach seo "
+"(tá %(show_value)d aige)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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."
+msgstr "Ní mór a bheith %(field_name)s uathúil ar %(date_field)s %(lookup)s."
+
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "agus"
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "agus"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
-msgstr "Níl %r luach rogha bailí."
+msgstr "Ní rogha bailí é an luach %r."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Ní cheadaítear luach nialasach sa réimse seo."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Ní cheadaítear luach nialasach sa réimse seo."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Réimse de Cineál: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Slánuimhir"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Ní mór don luach seo a bheith ina shlánuimhir."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Ní mór don luach seo a bheith Fíor nó Bréagach."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boole"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Teaghrán (suas go %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Slánuimhireacha camóg-scartha"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Dáta (gan am)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Cuir dáta bailí isteach, san fhormáid BBBB-MM-LL."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Dáta neamhbhailí: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Cuir dáta/am bailí isteach, san fhormáid BBBB-MM-LL UU:NN[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Dáta (le am)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Ní mór don luach seo a bheith ina uimhir dheachúlach."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Uimhir deachúlach"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
-msgstr "R-phost"
+msgstr "Seoladh ríomhphoist"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Conair comhaid"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Ní mór go mbeadh an luach snámhpointe."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Snámhphointe"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Mór (8 byte) slánuimhi"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
-msgstr "Seol IP"
+msgstr "Seoladh IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Ní mór don luach seo a bheith Faic, Fíor nó Bréagach."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boole (Fíor, Bréagach nó Dada)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
-msgstr "téacs"
+msgstr "Téacs"
-#: db/models/fields/__init__.py:1040
-msgid "Time"
-msgstr "am"
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Cuir am bailí isteach san fhormáid UU:NN[:ss[.uuuuuu]]."
+#: db/models/fields/__init__.py:1185
+msgid "Time"
+msgstr "Am"
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Téacs XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
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:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Duine-le-duine caidreamh"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Go leor le go leor caidreamh"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Ar ríomhaire Mac, coinnigh an eochair \"Control\" nó \"Command\" síos chun "
"níos mó ná rud amháin a roghnú."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Tá an réimse seo riachtanach."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
-msgstr "Cuir slánuimhir isteach."
+msgstr "Iontráil slánuimhir."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
-msgstr "Cuir uimhir isteach."
+msgstr "Iontráil uimhir."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Bí cinnte nach bhfuil níos mó ná %s digit ann."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Bí cinnte nach bhfuil níos mó ná %s ionad deachúlach ann."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Bí cinnte nach bhfuil níos mó ná %s digit roimh an bpointe deachúlach."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
-msgstr "Cuir dáta bailí isteach."
+msgstr "Iontráil dáta bailí."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
-msgstr "Cuir am bailí isteach."
+msgstr "Iontráil am bailí."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
-msgstr "Cuir dáta/am bailí isteach."
+msgstr "Iontráil dáta/am bailí."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Níor seoladh comhad. Deimhnigh cineál an ionchódaithe ar an bhfoirm."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Níor seoladh aon chomhad."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Tá an comhad a seoladh folamh."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -571,13 +632,13 @@ msgstr ""
"Cinntiú go bhfuil níos lú ná %(max)d carachtair (tá sé %(length)d) ag ainm "
"an chomhaid seo."
-#: forms/fields.py:464
+#: forms/fields.py:489
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
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -585,36 +646,36 @@ msgstr ""
"Uasluchtaigh íomhá bhailí. Níorbh íomhá é an comhad a d'uasluchtaigh tú, nó "
"b'íomhá thruaillithe é."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Cuir liosta de luachanna isteach."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ord"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
-msgstr "Cealaigh"
+msgstr "Scrios"
-#: forms/models.py:556
+#: forms/models.py:571
#, 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:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -623,114 +684,121 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Le do thoil ceartaigh na luachanna dúbail thíos."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Faoi láthair"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Athraigh"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Glan"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
-msgstr "Gan aithne"
+msgstr "Anaithnid"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Tá"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Níl"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "tá, níl, b'fhéidir"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bheart"
msgstr[1] "%(size)d bheart"
msgstr[2] "%(size)d bheart"
-msgstr[3] "%(size)d beart"
+msgstr[3] "%(size)d mbeart"
msgstr[4] "%(size)d beart"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
-msgstr "p.m."
+msgstr "i.n."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
-msgstr "a.m."
+msgstr "r.n."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
-msgstr "PM"
+msgstr "IN"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
-msgstr "AM"
+msgstr "RN"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "meán oíche"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "nóin"
@@ -764,43 +832,43 @@ msgstr "Domhnach"
#: utils/dates.py:10
msgid "Mon"
-msgstr "Lua"
+msgstr "Luan"
#: utils/dates.py:10
msgid "Tue"
-msgstr "Mai"
+msgstr "Máirt"
#: utils/dates.py:10
msgid "Wed"
-msgstr "Céa"
+msgstr "Céad"
#: utils/dates.py:10
msgid "Thu"
-msgstr "Déa"
+msgstr "Déar"
#: utils/dates.py:10
msgid "Fri"
-msgstr "Aoi"
+msgstr "Aoine"
#: utils/dates.py:11
msgid "Sat"
-msgstr "Sat"
+msgstr "Sath"
#: utils/dates.py:11
msgid "Sun"
-msgstr "Dom"
+msgstr "Domh"
#: utils/dates.py:18
msgid "January"
-msgstr "Mí Eanair"
+msgstr "Eanáir"
#: utils/dates.py:18
msgid "February"
-msgstr "Mí Feabhra"
+msgstr "Feabhra"
#: utils/dates.py:18
msgid "March"
-msgstr "Mí Márta"
+msgstr "Márta"
#: utils/dates.py:18
msgid "April"
@@ -812,11 +880,11 @@ msgstr "Bealtaine"
#: utils/dates.py:18
msgid "June"
-msgstr "Mí an Mheithimh"
+msgstr "Meitheamh"
#: utils/dates.py:19
msgid "July"
-msgstr "Mí Iúil"
+msgstr "Iúil"
#: utils/dates.py:19
msgid "August"
@@ -836,7 +904,7 @@ msgstr "Samhain"
#: utils/dates.py:20
msgid "December"
-msgstr "Mí na Nollag"
+msgstr "Nollaig"
#: utils/dates.py:23
msgid "jan"
@@ -844,11 +912,11 @@ msgstr "ean"
#: utils/dates.py:23
msgid "feb"
-msgstr "fea"
+msgstr "feabh"
#: utils/dates.py:23
msgid "mar"
-msgstr "loit"
+msgstr "márta"
#: utils/dates.py:23
msgid "apr"
@@ -856,35 +924,35 @@ msgstr "aib"
#: utils/dates.py:23
msgid "may"
-msgstr "bealtaine"
+msgstr "beal"
#: utils/dates.py:23
msgid "jun"
-msgstr "mei"
+msgstr "meith"
#: utils/dates.py:24
msgid "jul"
-msgstr "iui"
+msgstr "iúil"
#: utils/dates.py:24
msgid "aug"
-msgstr "lun"
+msgstr "lún"
#: utils/dates.py:24
msgid "sep"
-msgstr "mea"
+msgstr "mfómh"
#: utils/dates.py:24
msgid "oct"
-msgstr "dei"
+msgstr "dfómh"
#: utils/dates.py:24
msgid "nov"
-msgstr "sam"
+msgstr "samh"
#: utils/dates.py:24
msgid "dec"
-msgstr "nol"
+msgstr "noll"
#: utils/dates.py:31
msgctxt "abbrev. month"
@@ -894,7 +962,7 @@ msgstr "Ean."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Fea."
+msgstr "Feabh."
#: utils/dates.py:33
msgctxt "abbrev. month"
@@ -904,17 +972,17 @@ msgstr "Márta"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Aibreán"
+msgstr "Aib."
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Bealtaine"
+msgstr "Beal."
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Meitheamh"
+msgstr "Meith."
#: utils/dates.py:37
msgctxt "abbrev. month"
@@ -929,179 +997,179 @@ msgstr "Lún."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Meá."
+msgstr "MFómh."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Dei."
+msgstr "DFómh."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Sam."
+msgstr "Samh."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Nol."
+msgstr "Noll."
#: utils/dates.py:45
msgctxt "alt. month"
msgid "January"
-msgstr "Eanáir"
+msgstr "Mí Eanáir"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr "Feabhra"
+msgstr "Mí Feabhra"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr "Márta"
+msgstr "Mí na Márta"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr "Aibreán"
+msgstr "Mí Aibreáin"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr "Bealtaine"
+msgstr "Mí na Bealtaine"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr "Meitheamh"
+msgstr "Mí an Mheithimh"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr "Iúil"
+msgstr "Mí Iúil"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr "Lúnasa"
+msgstr "Mí Lúnasa"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr "Meán Fómhair"
+msgstr "Mí Mheán Fómhair"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr "Deireadh Fómhair"
+msgstr "Mí Dheireadh Fómhair"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr "Samhain"
+msgstr "Mí na Samhna"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
-msgstr "Nollaig"
+msgstr "Mí na Nollag"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "nó"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "bliain"
msgstr[1] "bliain"
-msgstr[2] "bliain"
-msgstr[3] "bliain"
+msgstr[2] "bliana"
+msgstr[3] "mbliana"
msgstr[4] "bliana"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
-msgstr[0] "mí"
-msgstr[1] "mí"
-msgstr[2] "mí"
+msgstr[0] "mhí"
+msgstr[1] "mhí"
+msgstr[2] "mhí"
msgstr[3] "mí"
-msgstr[4] "míosa"
+msgstr[4] "mí"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "seachtain"
-msgstr[1] "seachtain"
-msgstr[2] "seachtain"
+msgstr[1] "sheachtain"
+msgstr[2] "sheachtain"
msgstr[3] "seachtain"
msgstr[4] "seachtain"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "lá"
msgstr[1] "lá"
msgstr[2] "lá"
msgstr[3] "lá"
-msgstr[4] "laethanta"
+msgstr[4] "lá"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "uair"
msgstr[1] "uair"
msgstr[2] "uair"
-msgstr[3] "uair"
+msgstr[3] "n-uair"
msgstr[4] "uair"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
-msgstr[0] "nóimead"
+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"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "nóiméad"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "DATETIME_FORMAT"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1120,56 +1188,56 @@ msgstr "Scriosadh %(verbose_name)s."
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr "Níl blian sonraithe"
+msgstr "Bliain gan sonrú"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr "Níl mí sonraithe"
+msgstr "Mí gan sonrú"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr "Níl lá sonraithe"
+msgstr "Lá gan sonrú"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr "Níl seachtain sonraithe"
+msgstr "Seachtain gan sonrú"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr "Níl %(verbose_name_plural)s ar fáil"
+msgstr "Gan %(verbose_name_plural)s ar fáil"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"Níl sa Todhchaí %(verbose_name_plural)s ar fáil toisc go bhfuil %(class_name)"
-"s.allow_future Bréagach."
+"Níl %(verbose_name_plural)s sa todhchaí ar fáil mar tá %(class_name)s."
+"allow_future Bréagach."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
-"Dáta neamhbhailí '%(datestr)s' le hadhaigh an fhormáid seo '%(format)s'"
+"Teaghrán dáta neamhbhailí '%(datestr)s' nuair formáid '%(format)s' á húsáid"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
msgstr "Níl bhfuarthas %(verbose_name)s le hadhaigh an iarratas"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-"Níl an leathanach 'deireanach', agus ní féidir é a thiontú go dtí slánuimhir."
+"Ní 'deireanach' é an leathanach, agus ní féidir é a thiontú go slánuimhir."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Leathanach neamhbhailí (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "Liosta Folamh agus tá '%(class_name)s .allow_empty' Bréagach."
+msgstr "Liosta folamh agus tá '%(class_name)s .allow_empty' Bréagach."
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index e263f2fcc0..24f5420272 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 d491aba3ee..a38e4db239 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@@ -1,571 +1,632 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# fasouto <fsoutomoure@gmail.com>, 2011.
+# fonso <fonzzo@gmail.com>, 2011.
+# <fsoutomoure@gmail.com>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:08-0400\n"
-"PO-Revision-Date: 2011-03-08 18:21+0000\n"
-"Last-Translator: fonso <fonzzo@gmail.com>\n"
-"Language-Team: Galician <None>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: fasouto <fsoutomoure@gmail.com>\n"
+"Language-Team: Galician (http://www.transifex.net/projects/p/django/language/"
+"gl/)\n"
+"Language: gl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "árabe"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "azerí"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "búlgaro"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengalí"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosníaco"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "catalán"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "checo"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "galés"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "dinamarqués"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "alemán"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "grego"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "inglés"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "inglés británico"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "español"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "español da Arxentina"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "español de México"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Español de Nicaragua"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estoniano"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "vasco"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "finés"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "francés"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frisón"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irlandés"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galego"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "hebreo"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "croata"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "húngaro"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonesio"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandés"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "xaponés"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "xeorxiano"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "camboxano"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "canará"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "coreano"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "letón"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "macedonio"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "mala"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongol"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holandés"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "noruegués"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "malaiala"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "noruegués (nynorsk)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "panxabiano"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "polaco"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugués"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "portugués do Brasil"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "romanés"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "esloveno"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albanés"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "serbio (alfabeto latino)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "támil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "tai"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ucraíno"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "chinés simplificado"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "chinés tradicional"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Insira un valor válido."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Semella que este URL é unha ligazón rota."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Insira un URL válido."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Insira un enderezo de correo electrónico válido."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Insira un 'slug' valido composto por letras, números, guións baixos ou "
"medios."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Insira unha dirección IPv4 válida."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Insira unha dirección IPv6 válida"
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Insira unha dirección IPv4 ou IPv6 válida"
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Insira só díxitos separados por comas."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Asegúrese de que este valor é %(limit_value)s (agora é %(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegure que este valor é menor ou igual a %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegure que este valor é maior ou igual a %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Asegúrese que este valor é de polo menos %(limit_value)d caracteres (agora "
"ten %(show_value)d). "
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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 %(limit_value)d caracteres "
"(agora ten %(show_value)d))."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-"O campo %(field_name)s debe ser único para a busca %(lookup)s en %"
-"(date_field)s."
+"O campo %(field_name)s debe ser único para a busca %(lookup)s en "
+"%(date_field)s."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "e"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
"Xa existe un modelo %(model_name)s coa etiqueta de campo %(field_label)s."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "e"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "O valor %r non é unha opción válida."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Este campo non pode ser nulo."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Este campo non pode estar baleiro."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo do tipo: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Número enteiro"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Este valor ten que ser un número enteiro."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' debe ser un número enteiro."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Este valor ten que verdadeiro ou falso."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' debe ser verdadeiro ou falso."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Valor booleano (verdadeiro ou falso)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadea (máximo %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Números enteiros separados por comas"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Data (sen a hora)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Insira unha data válida en formato AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Data non válida: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Insira unha data e tempo válido co formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]] "
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Data (coa hora)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Este valor ten que ser un número decimal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' debe ser un número en formato decimal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Ruta do ficheiro"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Este valor ten que ser un número en coma flotante."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' debe ser un número en coma flotante."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Número en coma flotante"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Enteiro grande (8 bytes)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "Dirección IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Enderezo IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Este valor ten que verdadeiro, falso ou nulo."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (verdadeiro, falso ou ningún)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Enteiro positivo"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (ata %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Insira unha data válida no formato HH:MM[:ss[.uuuuuu]]"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Texto XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Arquivo"
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Imaxe"
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Non existe modelo %(model)s coa clave primaria %(pk)r."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Clave Estranxeira (tipo determinado por un campo relacionado)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relación un a un"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relación moitos a moitos"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
" Para seleccionar máis dunha entrada, manteña premida a tecla \"Control\", "
"ou \"Comando\" nun Mac."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Requírese este campo."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Insira un número enteiro."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Insira un número."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asegñurese de que non hai máis de %s díxitos en total."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asegúrese de que non hai máis de %s lugares decimais."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
"Asegúrese de que no hai máis de %s díxitos antes do punto ou coma decimal."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Insira unha data válida."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Insira unha hora válida."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Insira unha data/hora válida."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Non se enviou ficheiro ningún. Comprobe o tipo de codificación do formulario."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Non se enviou ficheiro ningún."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "O ficheiro enviado está baleiro."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -573,13 +634,13 @@ msgstr ""
"Asegúrese de que o nome de ficheiro ten como máximo %(max)d caracteres "
"(agora ten %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Ou ben envíe un ficheiro, ou ben marque a casilla de eliminar, pero non "
"ambas as dúas cousas."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -587,36 +648,36 @@ msgstr ""
"Suba unha imaxe válida. O ficheiro subido non era unha imaxe ou esta estaba "
"corrupta."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Escolla unha opción válida. %(value)s non se atopa entre as opción "
"dispoñibles."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Insira unha lista de valores."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Orde"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Corrixa os datos duplicados no campo %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Corrixa os datos duplicados no campo %(field)s, que debe ser único."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -625,113 +686,120 @@ msgstr ""
"Corrixa os datos duplicados no campo %(field_name)s, que debe ser único para "
"a busca %(lookup)s no campo %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Corrixa os valores duplicados embaixo."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"A clave estranxeira en liña non coincide coa clave primaria da instancia nai."
-#: forms/models.py:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" non é un valor válido para unha clave primaria."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Actualmente"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Limpar"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Descoñecido"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Si"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Non"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "si,non,quizais"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "medianoite"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "mediodía"
@@ -1007,84 +1075,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "decembro"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "ou"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "ano"
msgstr[1] "anos"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mes"
msgstr[1] "meses"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "semana"
msgstr[1] "semanas"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "día"
msgstr[1] "días"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "hora"
msgstr[1] "horas"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutos"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "d-m-Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "d-m-Y H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "m Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" non existe"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "d m"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Índice de %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1117,12 +1185,12 @@ msgstr "Non se especificou un día"
msgid "No week specified"
msgstr "Non se especificou unha semana"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Non hai %(verbose_name_plural)s dispoñibles"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1131,7 +1199,7 @@ msgstr ""
"Non hai dispoñibles %(verbose_name_plural)s futuros/as porque %(class_name)s."
"allow_futuro é False"
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "A cadea de data '%(datestr)s' non é válida para o formato '%(format)s'"
@@ -1141,16 +1209,16 @@ msgstr "A cadea de data '%(datestr)s' non é válida para o formato '%(format)s'
msgid "No %(verbose_name)s found matching the query"
msgstr "Non se atopou ningún/ha %(verbose_name)s que coincidise coa consulta"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "A páxina non é 'last' nin se pode converter a int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Páxina non válida (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "A lista está baleira pero '%(class_name)s.allow_empty' é False."
diff --git a/django/conf/locale/he/LC_MESSAGES/django.mo b/django/conf/locale/he/LC_MESSAGES/django.mo
index 970c210ef8..8535455d46 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 5b5698e168..e09280425e 100644
--- a/django/conf/locale/he/LC_MESSAGES/django.po
+++ b/django/conf/locale/he/LC_MESSAGES/django.po
@@ -1,607 +1,668 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Alex Gaynor <alex.gaynor@gmail.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Meir Kriheli <meir@mksoft.co.il>, 2011.
+# Meir Kriheli <mkriheli@gmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 20:59+0100\n"
-"PO-Revision-Date: 2011-03-19 10:21+0000\n"
-"Last-Translator: mksoft <meir@mksoft.co.il>\n"
-"Language-Team: Hebrew <>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Meir Kriheli <mkriheli@gmail.com>\n"
+"Language-Team: Hebrew (http://www.transifex.net/projects/p/django/language/"
+"he/)\n"
+"Language: he\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "ערבית"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "אזרית"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "בולגרית"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "בנגאלית"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "בוסנית"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "קאטלונית"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "צ'כית"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "וולשית"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "דנית"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "גרמנית"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "יוונית"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "אנגלית"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "אנגלית בריטית"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "ספרדית"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "ספרדית ארגנטינית"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "ספרדית מקסיקנית"
-#: conf/global_settings.py:60
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
-msgstr "ספרדית מקסיקנית"
+msgstr "ספרדית ניקרגואה"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "אסטונית"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "בסקית"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "פרסית"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "פינית"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr "צרפתית"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "פריזית"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "אירית"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "גאליציאנית"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "עברית"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "הינדי"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "קרואטית"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "הונגרית"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "אינדונזית"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "איסלנדית"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "איטלקית"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "יפנית"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "גיאורגית"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "חמר"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "קאנאדה"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "קוריאנית"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "ליטאית"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "לטבית"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "מקדונית"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "מלאיאלאם"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "מונגולי"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "הולנדית"
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr "נורווגית"
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "נורבגית ספרותית"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "נורבגית חדשה"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "פנג'אבי"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "פולנית"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "פורטוגזית"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "פורטוגזית ברזילאית"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "רומנית"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "רוסית"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "סלובקית"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "סלובנית"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "אלבנית"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "סרבית"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "סרבית לטינית"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "שוודית"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "טמילית"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "טלגו"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "תאילנדית"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "טורקית"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "אוקראינית"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "אורדו"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "וייטנאמית"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "סינית פשוטה"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "סינית מסורתית"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "יש להזין ערך חוקי."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "ה־URL הזה נראה כקישור שבור."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "יש להזין URL חוקי."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "יש להזין כתובת דוא\"ל חוקית."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "יש להזין ערך המכיל אותיות, ספרות, קווים תחתונים ומקפים בלבד."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "יש להזין כתובת IPv4 חוקית."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "יש להזין כתובת IPv6 חוקית."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "יש להזין כתובת IPv4 או IPv6 חוקית."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "יש להזין רק ספרות מופרדות בפסיקים."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "יש לוודא שערך זה פחות מ או שווה ל־%(limit_value)s ."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "יש לוודא שהערך גדול מ או שווה ל־%(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"יש לוודא שערך זה מכיל לפחות %(limit_value)d תווים (מכיל %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"יש לוודא שערך זה מכיל %(limit_value)d תווים לכל היותר (מכיל %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "ו"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s·עם·%(field_label)s·זה קיימת כבר."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "ו"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "ערך %r אינו אפשרות חוקית."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "שדה זה אינו יכול להיות ריק."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "שדה זה אינו יכול להיות ריק."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "מספר שלם"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "ערך זה חייב להיות מספר שלם."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "הערך '%s' חייב להיות מספר שלם."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "ערך זה חייב להיות אמת או שקר."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "הערך '%s' חייב להיות אמת או שקר."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "בוליאני (אמת או שקר)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "מחרוזת (עד %(max_length)s תווים)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "מספרים שלמים מופרדים בפסיקים"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "הערך '%s' מכיל תאריך בפורמט לא חוקי. חייב להיות בפורמט YYYY-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "הערך '%s' בפורמט הנכון (YYYY-MM-DD), אך אינו תאריך חוקי."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "תאריך (ללא שעה)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "יש להזין תאריך במבנה YYYY-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "תאריך שגוי: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"התחביר של ערך '%s' אינו חוקי. התחביר חייב להיות YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ]."
-#: 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]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"התחביר של ערך '%s' חוקי (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) אך אינו תאריך/"
+"זמן חוקי."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "תאריך (כולל שעה)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "ערך זה חייב להיות מספר עשרוני."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "הערך '%s' חייב להיות מספר עשרוני."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "מספר עשרוני"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "כתובת דוא\"ל"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "נתיב קובץ"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "על הערך הזה להיות ערך מספר עשרוני."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "הערך '%s' חייב להיות מספר עם נקודה צפה."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "מספר עשרוני"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "מספר שלם גדול (8 בתים)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "כתובת IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "כתובת IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "ערך זה חייב להיות כלום, אמת או שקר."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "הערך '%s' חייב להיות None‏, True או False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "בוליאני (אמת, שקר או כלום)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "מספר שלם חיובי"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "מספר שלם חיובי קטן"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "מספר שלם קטן"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "טקסט"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "זמן"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "נא להזין זמן חוקי בתבנית HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "טקסט XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "קובץ"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "תמונה"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "מודל %(model)s עם מפתח ראשי %(pk)r אינו קיים."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (הסוג נקבע לפי השדה המקושר)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "יחס של אחד לאחד"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "יחס של רבים לרבים"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"יש להחזיק את \"Control\", או \"Command\" על מק, לחוץ כדי לבחור יותר מאחד."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "יש להזין תוכן בשדה זה."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "נא להזין מספר שלם."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "נא להזין מספר."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "נא לוודא שאין יותר מ־%s ספרות סה\"כ"
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "נא לוודא שאין יותר מ־%s ספרות אחרי הנקודה"
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "נא לוודא שאין יותר מ־%s ספרות לפני הנקודה העשרונית"
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "יש להזין תאריך חוקי."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "יש להזין שעה חוקית."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "יש להזין תאריך ושעה חוקיים."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "לא נשלח שום קובץ. נא לבדוק את סוג הקידוד של הטופס."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "לא נשלח שום קובץ"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "הקובץ שנשלח ריק."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "נא לשים קובץ או סימן את התיבה לניקוי, לא שניהם."
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "יש להזין רשימת ערכים"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "מיון"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "מחיקה"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "נא לתקן את הערכים הכפולים ל%(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "נא לתקן את הערכים הכפולים ל%(field)s, שערכים בו חייבים להיות ייחודיים."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -610,109 +671,116 @@ msgstr ""
"נא לתקן את הערכים הכפולים %(field_name)s, שחייבים להיות ייחודיים ל%(lookup)s "
"של %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "נא לתקן את הערכים הכפולים למטה."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "המפתח הזר ה־inline לא התאים למפתח הראשי של האב."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "יש לבחור אפשרות חוקית; אפשרות זו אינה אחת מהזמינות."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "יש לבחור אפשרות חוקית. %s אינו בין האפשרויות הזמינות."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" איננו חוקי כמפתח ראשי."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "עכשיו"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "שינוי"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "לסלק"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "לא ידוע"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "כן"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "לא"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "כן,לא,אולי"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "בית %(size)d "
msgstr[1] "%(size)d בתים"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s ק\"ב"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s מ\"ב"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s ג\"ב"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s ט\"ב"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s פ\"ב"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "אחר הצהריים"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "בבוקר"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "אחר הצהריים"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "בבוקר"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "חצות"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "12 בצהריים"
@@ -988,84 +1056,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "דצמבר"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "או"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "שנה"
msgstr[1] "שנים"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "חודש"
msgstr[1] "חודשים"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "שבוע"
msgstr[1] "שבועות"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "יום"
msgstr[1] "ימים"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "שעה"
msgstr[1] "שעות"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "דקה"
msgstr[1] "דקות"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "דקות"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "d.m.Y"
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "d.m.‏Y H:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "אינדקסים על תיקיה אסורים כאן."
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
-
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "m.Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" אינו קיים"
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "d.m"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "אינדקס של %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1098,12 +1166,12 @@ msgstr "לא צויין יום"
msgid "No week specified"
msgstr "לא צויין שבוע"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "לא נמצאו %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1112,7 +1180,7 @@ msgstr ""
"לא נמצאו %(verbose_name_plural)s בזמן עתיד מאחר ש-%(class_name)s."
"allow_future מוגדר False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "מחרוזת תאריך לא חוקית '%(datestr)s' בהתחשב בתחביר '%(format)s'"
@@ -1122,16 +1190,16 @@ msgstr "מחרוזת תאריך לא חוקית '%(datestr)s' בהתחשב בת
msgid "No %(verbose_name)s found matching the query"
msgstr "לא נמצא/ה %(verbose_name)s התואם/ת לשאילתה"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "העמוד אינו 'last', או אינו ניתן להמרה למספר."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "עמוד לא חוקי (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "רשימה ריקה -ו'%(class_name)s.allow_empty' מוגדר False."
diff --git a/django/conf/locale/hi/LC_MESSAGES/django.mo b/django/conf/locale/hi/LC_MESSAGES/django.mo
index 7e4d153531..a7d4b2c14f 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 da3a48388b..832dbc2040 100644
--- a/django/conf/locale/hi/LC_MESSAGES/django.po
+++ b/django/conf/locale/hi/LC_MESSAGES/django.po
@@ -1,708 +1,791 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Chandan kumar <chandankumar.093047@gmail.com>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:08-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Hindi <None>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Chandan kumar <chandankumar.093047@gmail.com>\n"
+"Language-Team: Hindi (http://www.transifex.net/projects/p/django/language/"
+"hi/)\n"
+"Language: hi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "अरबी"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "आज़रबाइजानी"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "बलगारियन"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "बंगाली"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
-msgstr ""
+msgstr "बोस्नियन"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "कटलान"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "च्चेक"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "वेल्श"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "दानिश"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "जर्मन"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "ग्रीक"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "अंग्रेज़ी "
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
-msgstr ""
+msgstr "ब्रिटिश अंग्रेजी"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "स्पानिश"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
-msgstr ""
+msgstr "अर्जेंटीना स्पैनिश "
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr ""
+msgstr "मेक्सिकन स्पैनिश"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "निकारागुआ स्पैनिश"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "एस्टोनियन"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "बास्क"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "पारसी"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "फ़िन्निश"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "फ्रेंच"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
-msgstr ""
+msgstr "फ्रिसियन"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "आयरिश"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "गलिशियन"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "हि‍ब्रू"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
-msgstr ""
+msgstr "हिंदी"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "क्रोयेशियन"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "हंगेरियन"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
-msgstr ""
+msgstr "इन्डोनेशियन "
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "आयिस्लान्डिक"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "इटैलियन"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "जपानी"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "ज्योर्जियन"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "ख्मेर"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "कन्‍नड़"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "कोरियन"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "लिथुवेनियन"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "लात्वियन"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "मेसिडोनियन"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
-msgstr ""
+msgstr "मलयालम"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
-msgstr ""
+msgstr "मंगोलियन"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "डच"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "नार्वेजियन"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "नार्वेजियन बोकमाल"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "नार्वेजियन नायनॉर्स्क"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
-msgstr ""
+msgstr "पंजाबी"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "पोलिश"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
-msgstr ""
+msgstr "पुर्तगाली"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "ब्रजिलियन पुर्तगाली"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "रोमानियन"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "रूसी"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "स्लोवाक"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "स्लोवेनियन"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
-msgstr ""
+msgstr "अल्बेनियन्"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "सर्बियन"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
-msgstr ""
+msgstr "सर्बियाई लैटिन"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "स्वीडिश"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "तमिल"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "तेलुगु"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
-msgstr ""
+msgstr "थाई"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "तुर्किश"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "यूक्रानियन"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "उर्दू"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
-msgstr ""
+msgstr "वियतनामी"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "सरल चीनी"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "पारम्परिक चीनी"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "एक मान्य मूल्य दर्ज करें"
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
-msgstr ""
+msgstr "यह यूआरएल टूटी हुई लिंक के सामान प्रतीत होता है।"
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "वैध यू.आर.एल भरें ।"
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "मान्य ईमेल पता भरें"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr ""
+msgstr "एक वैध 'काउंटर' वर्णों, संख्याओं,रेखांकित चिन्ह ,या हाइफ़न से मिलाकर दर्ज करें ।"
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "वैध आइ.पि वी 4 पता भरें ।"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "वैध IPv6 पता दर्ज करें."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "वैध IPv4 या IPv6 पता दर्ज करें."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "अल्पविराम अंक मात्र ही भरें ।"
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
+"सुनिश्चित करें कि यह मान %(limit_value)s (यह\n"
+" %(show_value)s है) है ।"
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
+msgstr "सुनिश्चित करें कि यह मान %(limit_value)s से कम या बराबर है ।"
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
+msgstr "सुनिश्चित करें यह मान %(limit_value)s से बड़ा या बराबर है ।"
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
+"सुनिश्चित करें कि यह मान में कम से कम %(limit_value)d अक्षरों (इसका\n"
+" %(show_value)d है) की है."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
+"सुनिश्चित करें कि यह मान अधिकांश %(limit_value)d अक्षरों (इसका \n"
+" %(show_value)d है) में है."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "और"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "इस %(field_label)s के साथ एक %(model_name)s पहले से ही उपस्थित है ।"
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "और"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "मान %r एक वैध चुनाव नहीं है."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "यह मूल्य खाली नहीं हो सकता ।"
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
-msgstr ""
+msgstr "इस फ़ील्ड रिक्त नहीं हो सकता है."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, 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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "पूर्णांक"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "यह मूल्य पूर्णांक होना चाहिए ।"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' मान पूर्णांक होना चाहिए."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "यह मूल्य सही अथवा गलत होना चाहिए ।"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' मान या तो सही है या गलत होना चाहिए."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "बूलियन (सही अथ‌वा गलत)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "स्ट्रिंग (अधिकतम लम्बाई %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "अल्पविराम सीमांकित संख्या"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "'%s' मान एक अमान्य दिनांक फॉर्मेट मे है. यह YYYY-MM-DD फॉर्मेट में होना चाहिए."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "'%s' मान को सही प्रारूप (YYYY-MM-DD) है, लेकिन यह एक अमान्य तिथि है."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "तिथि (बिना समय)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "वैध तिथि को सससस-मम-दिदि सरूप में भरें"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "अमान्य तिथि : %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' मान एक अमान्य स्वरूप में है. यह YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] में होना "
+"चाहिए."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "वैध तिथि/समय को सससस-मम-दिदि[:सेसे[.सूसूसूसूसूसू]] सुरूप में भरें"
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+".'%s' मान सही प्रारूप (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) मे नहीं है लेकिन यह एक "
+"अमान्य तिथि / समय है."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "तिथि (समय के साथ)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "यस मूल्य दशांश संख्या मात्र ही हो सकता है ।"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' मान को एक दशमलव संख्या में होना चाहिए."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "दशमलव संख्या"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "ईमेल पता"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "संचिका पथ"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr ""
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' मान को दशमलब मे होना चाहिए."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "चल बिन्दु संख्या"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "बड़ा (8 बाइट) पूर्णांक "
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 पता"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "आइ.पि पता"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "यह मूल्य कोई नहीं, सही अथवा गलत ही हो सकता है ।"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' मान को सही है या गलत या तो कोई नहीं, होना चाहिए."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "बूलियन (सही, गलत या कुछ नहीं)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "पाठ"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr "'%s' मान एक अमान्य स्वरूप में है.यह HH:MM[:ss[.uuuuuu]] स्वरूप में होना चाहिए."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr "'%s' मान सही स्वरूप (HH:MM[:ss[.uuuuuu]]) मे है, लेकिन यह एक अवैध समय है."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "समय"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr ""
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "यू.आर.एल"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "एक्स.एम.एल पाठ"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "मॉडल%(model)s pk %(pk)r के साथ मौजूद नहीं है. "
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "विदेशी कुंजी (संबंधित क्षेत्र के द्वारा प्रकार निर्धारित)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
-msgstr ""
+msgstr "एक-एक संबंध"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "बहुत से कई संबंध"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
+msgstr "एक से अधिक का चयन करने के लिए मैक पर \"कमांड\",या\"नियंत्रण\" नीचे दबाए रखें."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "यह क्षेत्र अपेक्षित हैं"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "एक पूर्ण संख्या दर्ज करें ।"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "एक संख्या दर्ज करें ।"
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
-msgstr ""
+msgstr "सुनिश्चित करें कि वहाँ कुल में %s से अधिक अंक न हो."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
-msgstr ""
+msgstr "सुनिश्चित करें कि वहाँ %s से अधिक दशमलव स्थान न हो."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr ""
+msgstr "सुनिश्चित करें कि वहाँ %s से अधिक अंको के पहले दशमलव बिंदु न हो."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "वैध तिथि भरें ।"
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "वैध समय भरें ।"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "वैध तिथि/समय भरें ।"
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "कोई संचिका निवेदित नहीं हुई । कृपया कूटलेखन की जाँच करें ।"
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "कोई संचिका निवेदित नहीं हुई ।"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "निवेदित संचिका खाली है ।"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
+"सुनिश्चित करें कि इस फ़ाइल का नाम अधिकांश %(max)d वर्णों (इसका \n"
+"%(length)d है)को है"
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "कृपया या फ़ाइल प्रस्तुत करे या साफ जांचपेटी की जाँच करे,दोनों नहीं ."
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "मूल्य सूची दर्ज करें ।"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "छाटें"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "मिटाएँ"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
+msgstr "कृपया %(field)s के लिए डुप्लिकेट डेटा को सही करे."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
+msgstr "कृपया %(field)s के डुप्लिकेट डेटा जो अद्वितीय होना चाहिए को सही करें."
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
-msgstr ""
+msgstr "कृपया डुप्लिकेट मानों को सही करें."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "इनलाइन विदेशी कुंजी पैरेंट आवृत्ति प्राथमिक कुंजी से मेल नहीं खाता है ."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "मान्य विकल्प चयन करें । यह विकल्प उपस्थित विकल्पों में नहीं है ।"
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "मान्य विकल्प चयन करें । %s उपस्थित विकल्पों में नहीं है ।"
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
+msgstr "प्राथमिक कुंजी के लिए \"%s\" वैध मान नहीं है."
+
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
msgstr ""
+"%(current_timezone)s समय क्षेत्र में %(datetime)s का व्याख्या नहीं कर सकता है, यह "
+"अस्पष्ट हो सकता है या नहीं मौजूद हो सकते हैं."
-#: forms/widgets.py:299
+#: forms/widgets.py:325
msgid "Currently"
-msgstr ""
+msgstr "फिलहाल"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "बदलें"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
-msgstr ""
+msgstr "रिक्त करें"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "अनजान"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "हाँ"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "नहीं"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "हाँ, नहीं, शायद"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d बाइट"
msgstr[1] "%(size)d बाइट"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
-msgstr ""
+msgstr "%s केबी "
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
-msgstr ""
+msgstr "%s मेबी "
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
-msgstr ""
+msgstr "%s जीबी "
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
-msgstr ""
+msgstr "%s टीबी"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
-msgstr ""
+msgstr "%s पीबी"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "बजे"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "बजे"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "बजे"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "बजे"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "मध्यरात्री"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "दोपहर"
@@ -861,201 +944,201 @@ 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
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "जनवरी"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "फरवरी"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "मार्च"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "अप्रैल"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "मई"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "जून"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "जुलाई"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "अगस्त"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "सितंबर"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "अक्टूबर"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "नवंबर"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
-msgstr ""
+msgstr "दिसंबर"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "अथवा"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
-msgstr ""
+msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "साल"
msgstr[1] "साल"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "महीना"
msgstr[1] "महीना"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "सप्ताह"
msgstr[1] "सप्ताह"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "दिन"
msgstr[1] "दिन"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "घंटा"
msgstr[1] "घंटा"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "मिनट"
msgstr[1] "मिनट"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "मिनट"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "तिथि_प्रारूप"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "तिथिसमय_प्रारूप"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "समय_प्रारूप"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "वर्ष_महीना_प्रारूप"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "महीना_दिन_प्रारूप"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1074,52 +1157,54 @@ msgstr "%(verbose_name)s को मिटाया गया हैं ।"
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr ""
+msgstr "कोई साल निर्दिष्ट नहीं किया गया "
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "कोई महीने निर्दिष्ट नहीं किया गया "
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "कोई दिन निर्दिष्ट नहीं किया गया "
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "कोई सप्ताह निर्दिष्ट नहीं किया गया "
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "%(verbose_name_plural)s उपलब्ध नहीं है"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"भविष्य %(verbose_name_plural)s उपलब्ध नहीं है क्योंकि %(class_name)s.allow_future "
+"गलत है."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "तिथि स्ट्रिंग '%(datestr)s' दिया गया प्रारूप '%(format)s' अवैध है "
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr " इस प्रश्न %(verbose_name)s से मेल नहीं खाते है"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "पृष्ठ 'अंतिम' नहीं है और न ही यह एक पूर्णांक के लिए परिवर्तित किया जा सकता है."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgstr "अमान्य पृष्ठ (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "रिक्त सूची और '%(class_name)s.allow_empty' गलत है."
diff --git a/django/conf/locale/hr/LC_MESSAGES/django.mo b/django/conf/locale/hr/LC_MESSAGES/django.mo
index f0f8918ba6..faff7cc833 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 2aa848a8d6..3aa3268784 100644
--- a/django/conf/locale/hr/LC_MESSAGES/django.po
+++ b/django/conf/locale/hr/LC_MESSAGES/django.po
@@ -1,588 +1,644 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# aljosa <aljosa.mohorovic@gmail.com>, 2011.
+# Davor Lučić <r.dav.lc@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Ylodi <stjepan@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 20:59+0100\n"
-"PO-Revision-Date: 2011-03-13 21:27+0000\n"
-"Last-Translator: aljosa <aljosa.mohorovic@gmail.com>\n"
-"Language-Team: Croatian <>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Davor Lučić <r.dav.lc@gmail.com>\n"
+"Language-Team: Croatian (http://www.transifex.net/projects/p/django/language/"
+"hr/)\n"
+"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hr\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"
+"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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arapski"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azarbejdžanac"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bugarski"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalski"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bošnjački"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalanski"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Češki"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Velški"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danski"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Njemački"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Grčki"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Engleski"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Britanski engleski"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Španjolski"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentinski španjolski"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Meksički španjolski"
-#: conf/global_settings.py:60
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
-msgstr "Meksički španjolski"
+msgstr "Nikaragvanski Španjolski"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estonski"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskijski"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Perzijski"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finski"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr "Francuski"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frizijski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irski"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galičanski"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebrejski"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Hrvatski"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Mađarski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonezijski"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Talijanski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japanski"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Gruzijski"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Kambođanski"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreanski"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litvanski"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Latvijski"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonski"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolski"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Nizozemski"
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr "Norveški"
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norveški Bokmal"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norveški Nynorsk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Pendžabljanin"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Poljski"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugalski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brazilski portugalski"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumunjski"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Ruski"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovački"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovenski"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanski"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Srpski"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Latinski srpski"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Švedski"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamilski"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Teluški"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thai (tajlandski)"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turski"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrajinski"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vijetnamski"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Pojednostavljeni kineski"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Tradicionalni kineski"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Unesite ispravnu vrijednost."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Izgleda da je URL neispravan."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Unesite ispravan URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Unesite ispravnu e-mail adresu."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Unesite ispravnu IPv4 adresu."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Unesite samo brojeve razdvojene zarezom."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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)."
+"Osigurajte da ova vrijednost ima %(limit_value)s (trenutno je "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Osigurajte da ova vrijednost ima najmanje %(limit_value)d znakova (ima %"
-"(show_value)d)."
+"Osigurajte da ova vrijednost ima najmanje %(limit_value)d znakova (ima "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Osigurajte da ova vrijednost ima najviše %(limit_value)d znakova (ima %"
-"(show_value)d)."
+"Osigurajte da ova vrijednost ima najviše %(limit_value)d znakova (ima "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "i"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "i"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Vrijednost %r nije ispravan izbor."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Ovo polje ne može biti null."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Ovo polje ne može biti prazno."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Polje tipa: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Cijeli broj"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Vrijednost mora biti cijeli broj."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Vrijednost mora biti True ili False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (True ili False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Slova (do %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Cijeli brojevi odvojeni zarezom"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Datum (bez vremena/sati)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Unesite ispravan datum u formatu YYYY-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Neispravan datum: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Unesite ispravan datum/vrijeme u formatu YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datum (sa vremenom/satima)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Vrijednost mora biti decimalan broj."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Decimalni broj"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Put do datoteke"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Vrijednost mora biti float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Broj s pomičnim zarezom (floating point number)"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Big (8 byte) integer"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP adresa"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Vrijednost mora biti None, True ili False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (True, False ili None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Vrijeme"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Unesite ispravno vrijeme formata HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML tekst"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (type determined by related field)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "One-to-one relationship"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Many-to-many relationship"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Držite \"Control\", ili \"Command\" na Mac-u, da bi odabrali više od jednog "
"objekta."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Unos za ovo polje je obavezan."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Unesite cijeli broj."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Unesite broj."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Osigurajte da ukupno nema više od %s numeričkih znakova."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Osigurajte da ukupno nema više od %s decimalnih mjesta."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
"Osigurajte da ukupno nema više od %s numeričkih znakova prije decimalne "
"točke."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Unesite ispravan datum."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Unesite ispravno vrijeme."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Unesite ispravan datum/vrijeme."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Datoteka nije poslana. Provjerite 'encoding type' forme."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Datoteka nije poslana."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Poslana datoteka je prazna."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Osigurajte da ova datoteka ima najviše %(max)d znakova (trenutno ima %"
-"(length)d)."
+"Osigurajte da ova datoteka ima najviše %(max)d znakova (trenutno ima "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Molimo Vas da pošaljete ili datoteku ili označite izbor, a ne oboje."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -590,36 +646,36 @@ msgstr ""
"Upload-ajte ispravnu sliku. Datoteka koju ste upload-ali ili nije slika ili "
"je oštečena."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Unesite listu vrijednosti."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Redoslijed:"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Izbriši"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ispravite duplicirane podatke za %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -628,57 +684,64 @@ msgstr ""
"Molimo ispravite duplicirane podatke za %(field_name)s koji moraju biti "
"jedinstveni za %(lookup)s u %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Molimo ispravite duplicirane vrijednosti ispod."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Trenutno"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Promijeni"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Isprazni"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Nepoznat pojam"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "da,ne,možda"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -686,52 +749,52 @@ msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d byte-a"
msgstr[2] "%(size)d byte-a"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "popodne"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "ujutro"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "popodne"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "ujutro"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "ponoć"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "podne"
@@ -1007,90 +1070,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "prosinca"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "ili"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "godina"
msgstr[1] "godine"
msgstr[2] "godine"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mjesec"
msgstr[1] "mjeseci"
msgstr[2] "mjeseci"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "tjedan"
msgstr[1] "tjedna"
msgstr[2] "tjedna"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dan"
msgstr[1] "dani"
msgstr[2] "dana"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "sat"
msgstr[1] "sati"
msgstr[2] "sata"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuta"
msgstr[1] "minute"
msgstr[2] "minute"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuta"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "j. N Y."
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "j. N Y. G:i T"
-
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "G:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y."
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1123,12 +1186,12 @@ msgstr "Nije naveden dan"
msgid "No week specified"
msgstr "Tjedan nije određen"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Nije dostupno: %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1137,7 +1200,7 @@ msgstr ""
"%(verbose_name_plural)s nije dostupno jer je %(class_name)s.allow_future "
"False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Neispravan datum '%(datestr)s' za format '%(format)s'"
@@ -1147,16 +1210,16 @@ msgstr "Neispravan datum '%(datestr)s' za format '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "%(verbose_name)s - pretragom nisu pronađeni rezultati za upit"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Stranica nije 'zadnja', niti se može pretvoriti u cijeli broj."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Neispravna stranica (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Prazna lista i '%(class_name)s.allow_empty' je False."
diff --git a/django/conf/locale/hu/LC_MESSAGES/django.mo b/django/conf/locale/hu/LC_MESSAGES/django.mo
index 5702bc5902..ab3f0e7469 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 70830d7e0c..010f6916bf 100644
--- a/django/conf/locale/hu/LC_MESSAGES/django.po
+++ b/django/conf/locale/hu/LC_MESSAGES/django.po
@@ -1,573 +1,631 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# János Péter Ronkay <transifex@hangya.net>, 2011, 2012.
+# Szilveszter Farkas <szilveszter.farkas@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:08-0400\n"
-"PO-Revision-Date: 2011-03-05 16:58+0000\n"
-"Last-Translator: szilveszter <szilveszter.farkas@gmail.com>\n"
-"Language-Team: Hungarian <>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: János Péter Ronkay <transifex@hangya.net>\n"
+"Language-Team: Hungarian (http://www.transifex.net/projects/p/django/"
+"language/hu/)\n"
+"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arab"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "azerbajdzsáni"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bolgár"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengáli"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnyák"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalán"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Cseh"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Walesi"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Dán"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Német"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Görög"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Angol"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Brit angol"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spanyol"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentin spanyol"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr "mexikói spanyol"
+msgstr "Mexikói spanyol"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nicaraguai spanyol"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Észt"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baszk "
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Perzsa"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finn"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Francia"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Fríz"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Ír"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Gall"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Héber"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Horvát"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Magyar"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonéz"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Izlandi"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Olasz"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japán"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Grúz"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreai"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litván"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Lett"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Macedón"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malajálam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongol"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Holland"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norvég"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Bokmål norvég"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Nynorsk norvég"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Lengyel"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugál"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brazíliai portugál"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Román"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Orosz"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Szlovák"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Szlovén"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albán"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Szerb"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Latin betűs szerb"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Svéd"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Török"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrán"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnámi"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Egyszerű kínai"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Hagyományos kínai"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Adjon meg egy érvényes értéket."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Ez a hivatkozás törött linknek tűnik."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Adjon meg egy érvényes URL-t."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Írjon be egy érvényes e-mail címet."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Írjon be egy érvényes IPv4 címet."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Írjon be egy érvényes IPv6 címet."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Írjon be egy érvényes IPv4 vagy IPv6 címet."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Csak számokat adjon meg, vesszővel elválasztva."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Bizonyosodjon meg arról, hogy az érték %(limit_value)s (jelenleg: %"
-"(show_value)s)."
+"Bizonyosodjon meg arról, hogy az érték %(limit_value)s (jelenleg: "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Bizonyosodjon meg arról, hogy az érték %(limit_value)s, vagy kisebb."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Bizonyosodjon meg arról, hogy az érték %(limit_value)s, vagy nagyobb."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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 %(limit_value)d karaktert "
"tartalmaz (jelenlegi hossza: %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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 %(limit_value)d "
"karaktert tartalmaz (jelenlegi hossza: %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-"%(field_name)s egyedi kell hogy legyen %(lookup)s alapján a dátum mezőn: %"
-"(date_field)s."
+"%(field_name)s egyedi kell hogy legyen %(lookup)s alapján a dátum mezőn: "
+"%(date_field)s."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "és"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Már létezik %(model_name)s ilyennel: %(field_label)s."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "és"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "%r érték érvénytelen."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Ez a mező nem lehet nulla."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Ez a mező nem lehet üres."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Mezőtípus: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Egész"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Az értéknek egész számnak kell lennie."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Az értéknek igaznak (True) vagy hamisnak (False) kell lennie."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Logikai (True vagy False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Karakterlánc (%(max_length)s hosszig)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Vesszővel elválasztott egészek"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Dátum (idő nélkül)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Írjon be egy érvényes dátumot 'ÉÉÉÉ-HH-NN' alakban."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Érvénytelen dátum: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Írjon be egy érvényes dátumot/időt 'ÉÉÉÉ-HH-NN ÓÓ-PP[:MP[.MILLIS]] alakban."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Dátum (idővel)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Az értéknek decimálisnak kell lennie."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Tizes számrendszerű (decimális) szám"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Elérési út"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Ennek az értéknek lebegőpontos számnak kell lennie."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Lebegőpontos szám"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Nagy egész szám (8 bájtos)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 cím"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP cím"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
msgstr ""
-"Az értéknek semminek (None), igaznak (True), vagy hamisnak (False) kell "
-"lennie."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Logikai (True, False vagy None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Pozitív egész"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Pozitív kis egész"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Kis egész"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Szöveg"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Idő"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Írjon be egy érvényes időt 'ÓÓ:PP[:MP[:MILLIS]]' alakban."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML szöveg"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Fájl"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Kép"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "%(model)s modell %(pk)r elsődleges kulccsal nem létezik."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Idegen kulcs (típusa a kapcsolódó mezőtől függ)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Egy-egy kapcsolat"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Több-több kapcsolat"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Tartsa lenyomva a \"Control\"-t (vagy Mac-en a \"Command\"-ot) több elem "
"kiválasztásához."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Ennek a mezőnek a megadása kötelező."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Adjon meg egy egész számot."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Adj meg egy számot."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Bizonyosodjon meg arról, hogy nincs ennél több számjegy: %s."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Bizonyosodjon meg arról, hogy nincs ennél több tizedesjegy: %s."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
"Bizonyosodjon meg arról, hogy nincs ennél több számjegy a tizedesvessző "
"előtt: %s."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Adjon meg egy érvényes dátumot."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Adjon meg egy érvényes időt."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Adjon meg egy érvényes dátumot/időt."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Nem küldött el fájlt. Ellenőrizze a kódolás típusát az űrlapon."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Semmilyen fájl sem került feltöltésre."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "A küldött fájl üres."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -575,13 +633,13 @@ msgstr ""
"Bizonyosodjon meg arról, hogy a fájlnév legfeljebb %(max)d karakterből áll "
"(jelenlegi hossza: %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Küldjön egy új fájlt, vagy jelölje be a törlés négyzetet, de ne mindkettőt "
"egyszerre."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -589,37 +647,37 @@ msgstr ""
"Töltsön fel egy érvényes képfájlt. A feltöltött fájl nem kép volt, vagy "
"megsérült."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Adja meg értékek egy listáját."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Sorrend"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Törlés"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Javítsa a mezőhöz tartozó duplikált adatokat: %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Javítsa a mezőhöz tartozó duplikált adatokat: %(field)s (egyedinek kell "
"lenniük)."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -628,113 +686,120 @@ msgstr ""
"Javítsa a mezőhöz tartozó duplikált adatokat: %(field_name)s (egyedinek kell "
"lenniük %(lookup)s alapján a dátum mezőn: %(date_field)s)."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Javítsa az alábbi duplikált értékeket."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"A beágyazott idegen kulcs nem egyezik meg a szülő példány elsődleges "
"kulcsával."
-#: forms/models.py:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" egy érvénytelen elsődleges kulcs érték."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Jelenleg"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Módosítás"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Törlés"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Ismeretlen"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Igen"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nem"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "igen,nem,talán"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, 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:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "du"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "de"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "DU"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "DE"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "éjfél"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "dél"
@@ -1010,84 +1075,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "december"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "vagy"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "év"
msgstr[1] "év"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "hónap"
msgstr[1] "hónap"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "hét"
msgstr[1] "hét"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "nap"
msgstr[1] "nap"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "óra"
msgstr[1] "óra"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "perc"
msgstr[1] "perc"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "perc"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "Y. F j."
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "Y. F j., H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y. F j."
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "Y. F j."
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1120,12 +1185,12 @@ msgstr "Nincs nap megadva"
msgid "No week specified"
msgstr "Nincs hét megadva"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Nincsenek elérhető %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1134,7 +1199,7 @@ msgstr ""
"Jövőbeli %(verbose_name_plural)s nem elérhetők, mert %(class_name)s."
"allow_future értéke False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1145,16 +1210,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr "Nincs a keresési feltételeknek megfelelő %(verbose_name)s"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Az oldal nem 'last', vagy nem lehet egésszé alakítani."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Érvénytelen oldal (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Üres lista, és '%(class_name)s.allow_empty' értéke False."
diff --git a/django/conf/locale/id/LC_MESSAGES/django.mo b/django/conf/locale/id/LC_MESSAGES/django.mo
index f6a175003f..66c3aefe54 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 96e93c7a46..4fa7ffe8fd 100644
--- a/django/conf/locale/id/LC_MESSAGES/django.po
+++ b/django/conf/locale/id/LC_MESSAGES/django.po
@@ -1,580 +1,647 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# rodin <romihardiyanto@gmail.com>, 2011.
+# <romihardiyanto@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
"Last-Translator: rodin <romihardiyanto@gmail.com>\n"
-"Language-Team: Indonesian <None>\n"
+"Language-Team: Indonesian (http://www.transifex.net/projects/p/django/"
+"language/id/)\n"
+"Language: id\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
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arab"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbaijani"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgaria"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengali"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnia"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalan"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Ceska"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Wales"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Denmark"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Jerman"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Yunani"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Inggris"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Inggris Britania"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spanyol"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Spanyol Argentina"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Spanyol Meksiko"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Spanyol Nikaragua"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estonia"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Basque"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persia"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finlandia"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Perancis"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisia"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irlandia"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galicia"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Ibrani"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroasia"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Hungaria"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonesia"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandia"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italia"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Jepang"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgia"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Korea"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lithuania"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Latvia"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonia"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolia"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Belanda"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norwegia"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norwegia Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norwegia Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polandia"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugis"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Portugis Brazil"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Romania"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Rusia"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovakia"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovenia"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albania"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbia"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbia Latin"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Swedia"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thailand"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turki"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainia"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnam"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Cina Sederhana"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Cina Tradisionil"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Masukkan nilai yang valid."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL ini tampaknya merupakan tautan rusak."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Masukkan URL yang valid."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Masukkan alamat e-mail yang valid."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Masukkan 'slug' yang terdiri dari huruf, bilangan, garis bawah, atau tanda "
"minus."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Masukkan alamat IPv4 yang valid."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Masukkan alamat IPv6 yang valid"
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Masukkan alamat IPv4 atau IPv6 yang valid"
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Hanya masukkan angka yang dipisahkan dengan koma."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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 karakter)."
+"Pastikan nilai ini memiliki sedikitnya %(limit_value)d karakter (saat ini "
+"%(show_value)d karakter)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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 karakter)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "dan"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "dan"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Nilai %r bukan pilihan yang valid."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Field ini tidak boleh null."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Field ini tidak boleh kosong."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Field dengan tipe: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "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 bilangan asli."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Nilai '%s' harus berupa bilangan asli."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Nilai ini harus salah satu dari True atau False"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Nilai '%s' harus bernilai True atau False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Nilai Boolean (Salah satu dari True atau False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (maksimum %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Bilangan asli yang dipisahkan dengan koma"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "Format nilai '%s' tidak valid. Format yang benar adalah YYYY-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "Format nilai '%s' benar (YYYY-MM-DD) tetapi tanggalnya tidak valid."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Tanggal (tanpa waktu)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Masukkan tanggal valid dalam format YYYY-MM-DD"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Tanggal tidak valid: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Format nilai '%s' tidak valid. Format yang benar adalah YYYY-MM-DD HH:MM[:ss"
+"[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Masukkan tanggal/waktu yang valid dalam format YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"Format nilai '%s' benar (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) tetapi tanggal/"
+"waktunya tidak valid."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Tanggal (dengan waktu)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Nilai ini harus berupa bilangan desimal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Nilai '%s' harus berupa angka desimal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Bilangan desimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Alamat email"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Lokasi berkas"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Nilai ini harus berupa bilangan pecahan."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Nilai '%s' harus berupa bilangan real."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Bilangan 'floating point'"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Bilangan asli raksasa (8 byte)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "Alamat IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Alamat IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Nilai harus berupa salah satu dari None, True, atau False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Nilai '%s' harus bernilai None, True, atau False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Salah satu dari True, False, atau None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Bilangan asli positif"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Bilangan asli kecil positif"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (hingga %(max_length)s karakter)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Bilangan asli kecil"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Teks"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Format nilai '%s' tidak valid. Format yang benar adalah HH:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Format nilai '%s' benar (HH:MM[:ss[.uuuuuu]]) tetapi nilai waktunya tidak "
+"valid."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Waktu"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Masukkan waktu yang valid dalam format HH:MM[:ss[.uuuuuu]]"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Teks XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Berkas"
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Gambar"
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Kunci Asing (tipe tergantung dari bidang yang berkaitan)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Hubungan satu-ke-satu"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Hubungan banyak-ke-banyak"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Tekan \"Control\", atau \"Command\" pada Mac untuk memilih lebih dari satu."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Bidang ini tidak boleh kosong."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Masukkan keseluruhan angka bilangan."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Masukkan sebuah bilangan."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Pastikan jumlah angka pada bilangan tidak melebihi %s angka."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Pastikan bilangan tidak memiliki lebih dari %s angka desimal."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
"Pastikan jumlah angka sebelum desimal pada bilangan tidak memiliki lebih "
"dari %s angka."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Masukkan tanggal yang valid."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Masukkan waktu yang valid."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Masukkan tanggal/waktu yang valid."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Tidak ada berkas yang dikirimkan. Periksa tipe pengaksaraan formulir."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Tidak ada berkas yang dikirimkan."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Berkas yang dikirimkan kosong."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Pastikan nama berkas ini tidak melebihi %(max)d karakter (saat ini %(length)"
-"d karakter)."
+"Pastikan nama berkas ini tidak melebihi %(max)d karakter (saat ini "
+"%(length)d karakter)."
-#: forms/fields.py:464
+#: forms/fields.py:489
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
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -582,36 +649,36 @@ msgstr ""
"Unggah gambar yang valid. Berkas yang Anda unggah bukan merupakan berkas "
"gambar atau gambarnya rusak."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Masukkan beberapa nilai."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Urutan"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Hapus"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Perbaiki data ganda untuk %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Perbaiki data ganda untuk %(field)s yang nilainya harus unik."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -620,112 +687,121 @@ msgstr ""
"Perbaiki data ganda untuk %(field_name)s yang nilainya harus unik untuk "
"pencarian %(lookup)s pada %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Perbaiki nilai ganda di bawah ini."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Kunci asing 'inline' tidak cocok dengan kunci utama 'instance' milik induk."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Masukkan pilihan yang valid. Pilihan tersebut bukan salah satu dari pilihan "
"yang tersedia."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Masukkan pilihan yang valid. %s bukan salah satu pilihan yang tersedia."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" bukan nilai yang benar untuk kunci utama."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s tidak dapat diinterpretasikan pada zona waktu "
+"%(current_timezone)s; mungkin nilainya ambigu atau mungkin tidak ada."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Saat ini"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Ubah"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Hapus"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Tidak diketahui"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ya"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Tidak"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ya,tidak,mungkin"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bita"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "tengah malam"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "siang"
@@ -1001,78 +1077,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "Desember"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "atau"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "tahun"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "bulan"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "minggu"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "hari"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "jam"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "menit"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "menit"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j N Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j N Y, G.i.s"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "G.i.s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Indeks direktori tidak diizinkan di sini."
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" tidak ada"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Daftar isi %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1105,12 +1181,12 @@ msgstr "Tidak ada hari dipilih"
msgid "No week specified"
msgstr "Tidak ada minggu dipilih"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Tidak ada %(verbose_name_plural)s tersedia"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1119,7 +1195,7 @@ msgstr ""
"%(verbose_name_plural)s di masa depan tidak tersedia karena %(class_name)s."
"allow_future bernilai False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Teks tanggal tidak valid '%(datestr)s' dalam format '%(format)s'"
@@ -1129,18 +1205,18 @@ msgstr "Teks tanggal tidak valid '%(datestr)s' dalam format '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Tidak ada %(verbose_name)s yang cocok dengan kueri"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Laman bukan yang 'terakhir' atau juga tidak dapat dikonversikan ke bilangan "
"bulat."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Laman tidak valid (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Daftar kosong dan '%(class_name)s.allow_empty' bernilai False."
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index d062546514..b1f6c08152 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 983a3e18a7..3d99ee25ff 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.po
+++ b/django/conf/locale/is/LC_MESSAGES/django.po
@@ -1,578 +1,647 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# gudmundur <gudmundur.bjarni@gmail.com>, 2011.
+# Hafsteinn Einarsson <haffi67@gmail.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# saevarom <saevar@saevar.is>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: haffi67 <haffi67@gmail.com>\n"
-"Language-Team: Icelandic <None>\n"
+"POT-Creation-Date: 2012-03-14 00:07-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Hafsteinn Einarsson <haffi67@gmail.com>\n"
+"Language-Team: Icelandic (http://www.transifex.net/projects/p/django/"
+"language/is/)\n"
+"Language: is\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabíska"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Aserbaídsjíska"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Búlgarska"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalska"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosníska"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalónska"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tékkneska"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Velska"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danska"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Þýska"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Gríska"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Enska"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Bresk enska"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spænska"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentínsk spænska"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Mexíkósk Spænska"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Níkaragva spænska"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Eistland"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskneska"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persneska"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finnska"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Franska"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frísneska"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Írska"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galíska"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebreska"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindí"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Króatíska"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Ungverska"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indónesíska"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Íslenska"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Ítalska"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japanska"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgíska"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Kmeríska"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannadanska"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Kóreska"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litháenska"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Lettneska"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedónska"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malajalamska"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongólska"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Hollenska"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norska"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norska bókmál"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Nýnorska"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Púndjabíska"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Pólska"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portúgalska"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brasilísk Portúgalska"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rúmenska"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Rússneska"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slóvaska"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slóvenska"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanska"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbneska"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbnesk latína"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Sænska"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamílska"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telúgúska"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tælenska"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Tyrkneska"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Úkraínska"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Úrdú"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Víetnamska"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Einfölduð kínverska "
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Hefðbundin kínverska"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Sláðu inn gilt gildi."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Síðan á þessari slóð lítur út fyrir að skila villu."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Sláðu inn gilt veffang (URL)."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Sláðu inn gilt tölvupóstfang."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Sláðu inn gilda IPv4 tölu."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Sláðu inn gilt IPv6 vistfang."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Sláðu inn gilt IPv4 eða IPv6 vistfang."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Skrifaðu einungis tölur aðskildar með kommum."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Gakktu úr skugga um að gildi sé %(limit_value)s (það er %(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Gakktu úr skugga um að gildið sé minna en eða jafnt og %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Gakktu úr skugga um að gildið sé stærra en eða jafnt og %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Gakktu úr skugga um að þetta gildi hafi a.m.k. %(limit_value)d stafi (it has "
"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Gakktu úr skugga um að þetta gildi hafi í mesta lagi %(limit_value)d stafi "
"(it has %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"%(field_name)s verður að vera einkvæmt fyrir %(date_field)s %(lookup)s."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "og"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "og"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Gildið %r er ógilt."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Þessi reitur getur ekki haft tómgildi (null)."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Þessi reitur má ekki vera tómur."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Reitur af gerð: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Heiltala"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Þetta gildi verður að vera heil tala."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Gildi '%s' verður að vera heiltala."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Þetta gildi verður að vera Satt eða Ósatt."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Gildi '%s' verður að vera annaðhvort satt eða ósatt."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boole-gildi (True eða False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Strengur (mest %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Heiltölur aðgreindar með kommum"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"Gildi '%s' er ógilt dagsetningarsnið. Það verður að vera á ÁÁÁÁ-MM-DD sniði."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "Gildi '%s' hefur rétt snið (ÁÁÁÁ-MM-DD) en dagsetningin er ógild."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Dagsetning (án tíma)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Sláðu inn gilda dagsetningu á YYYY-MM-DD sniði."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Ógild dagsetning: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Gildi '%s' hefur ógilt snið. Það verður að vera á sniðinu: ÁÁÁÁ-MM-DD KK:MM "
+"[:ss[.uuuuuu]] [TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Sláðu inn gilda dagsetningu/tíma í ÁÁÁÁ-MM-DD KK:MM[:ss[.uuuuuu]] sniði."
+"Gildi '%s' hefur rétt snið (YYYY-MM-DD HH:MM [:ss[.uuuuuu]] [TZ]) en það er "
+"ógild dagsetning / tími."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Dagsetning (með tíma)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Þetta gildi verður að vera tugatala (decimal number)."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Gildi '%s' verður að vera heiltala."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Tugatala"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Skjalaslóð"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Þetta gildi verður að vera fleytitala"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Gildi '%s' verður að vera fleytitala."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Fleytitala (floating point number)"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Stór (8 bæta) heiltala"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 vistfang"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP tala"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Þetta gildi verður að vera annaðhvort None, True eða False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Gildi '%s' verða að vera eitt eftirtalinna: None, True eða False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boole-gildi (True, False eða None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Texti"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Gildi '%s' er á ógildu sniði. Það verður að vera á sniðinu HH: MM [: ss [."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Gildi '%s' er á réttu sniði (HH:MM[:ss[.uuuuuu]]), en gildið er ekki gilt."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Tími"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Sláðu inn gildan tíma á KK:MM sniði."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "Veffang"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML texti"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Módel %(model)s með lykil %(pk)r er ekki til."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Ytri lykill (Gerð ákveðin af skyldum reit)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Einn-á-einn samband."
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Margir-til-margra samband."
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Haltu inni „Control“, eða „Command“ á Mac til þess að velja fleira en eitt."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Þennan reit þarf að fylla út."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Sláðu inn heila tölu."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Sláðu inn heila tölu."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Gildið má ekki hafa fleiri en %s tölur."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Gildið má ekki hafa meira en %s tugatölustafi (decimal places)."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Gildið má ekki hafa fleiri en %s tölur fyrir tugabrotskil."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Sláðu inn gilda dagsetningu."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Sláðu inn gilda tímasetningu."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Sláðu inn gilda dagsetningu ásamt tíma."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Engin skrá var send. Athugaðu kótunartegund á forminu (encoding type)."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Engin skrá var send."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Innsend skrá er tóm."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Vinsamlegast sendu annað hvort inn skrá eða merktu í boxið, ekki bæði."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -580,36 +649,36 @@ msgstr ""
"Halaðu upp gildri myndskrá. Skráin sem þú halaðir upp var annað hvort gölluð "
"eða ekki mynd."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Sláðu inn lista af gildum."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Röð"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Eyða"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Vinsamlegast leiðréttu tvítekin gögn í reit %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Vinsamlegast lagfærðu gögn í reit %(field)s, sem verða að vera einstök."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -618,111 +687,120 @@ msgstr ""
"Vinsamlegast leiðréttu tvítekin gögn í reit %(field_name)s sem verða að vera "
"einstök fyrir %(lookup)s í %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Vinsamlegast lagfærðu tvítöldu gögnin fyrir neðan."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Ytri lykill virðist ekki passa við aðallykil eiganda."
-#: forms/models.py:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" er ekki gilt sem lykill."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s er ekki hægt að túlka í tímabelti %(current_timezone)s, það "
+"getur verið óljóst eða að það er ekki til."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Eins og er:"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Breyta"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Hreinsa"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Óþekkt"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Já"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nei"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "já,nei,kannski"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, 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:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "eftirmiðdegi"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "morgun"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "Eftirmiðdegi"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "Morgun"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "miðnætti"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "hádegi"
@@ -998,84 +1076,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Desember"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "eða"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "ár"
msgstr[1] "ár"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mánuður"
msgstr[1] "mánuðir"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "vika"
msgstr[1] "vikur"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dagur"
msgstr[1] "dagar"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "klukkutími"
msgstr[1] "klukkutímar"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "mínúta"
msgstr[1] "mínútur"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "mínútur"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. N Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. N Y, H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "j. N Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. N Y"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1108,12 +1186,12 @@ msgstr "Enginn dagur tilgreindur"
msgid "No week specified"
msgstr "Engin vika tilgreind"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Ekkert %(verbose_name_plural)s í boði."
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1122,7 +1200,7 @@ msgstr ""
"Framtíðar %(verbose_name_plural)s ekki í boði því %(class_name)s."
"allow_future er Ósatt."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Ógilt snið dagsetningar \"%(datestr)s\" gefið sniðið \"%(format)s\""
@@ -1132,16 +1210,16 @@ msgstr "Ógilt snið dagsetningar \"%(datestr)s\" gefið sniðið \"%(format)s\"
msgid "No %(verbose_name)s found matching the query"
msgstr "Ekkert %(verbose_name)s sem uppfyllir skilyrði"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Þetta er hvorki síðasta síða, né er hægt að breyta í heiltölu."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Ógild síða (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Tómur listi og '%(class_name)s.allow_empty er Ósatt."
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 0c1dfc4eff..7141d0da76 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 ba5fd5d270..d1e5b48d4c 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -1,566 +1,638 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# C8E <C8E@miron.it>, 2011.
+# Denis Darii <sinednx@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Nicola Larosa <transifex@teknico.net>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-08 19:35+0000\n"
-"Last-Translator: teknico <transifex@teknico.net>\n"
-"Language-Team: Italian <>\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Nicola Larosa <transifex@teknico.net>\n"
+"Language-Team: Italian (http://www.transifex.net/projects/p/django/language/"
+"it/)\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "arabo"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azero"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "bulgaro"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengali"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosniaco"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "catalano"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "ceco"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "gallese"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "danese"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "tedesco"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "greco"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "inglese"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "inglese britannico"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "spagnolo"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "spagnolo argentino"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Spagnolo messicano"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Spagnolo nicaraguense"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estone"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "basco"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persiano"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "finlandese"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "francese"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frisone"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irlandese"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galiziano"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ebraico"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "croato"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ungherese"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonesiano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandese"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "giapponese"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "georgiano"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "coreano"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "lettone"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "macedone"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongolo"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "olandese"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "norvegese"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "norvegese bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "norvegese nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "polacco"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portoghese"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "brasiliano portoghese"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumeno"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "russo"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "slovacco"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "sloveno"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albanese"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "serbo"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "serbo latino"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "svedese"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "tailandese"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ucraino"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "cinese semplificato"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "cinese tradizionale"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Inserisci un valore valido."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Questa URL non sembra funzionare."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Inserisci una URL valida."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Inserisci un indirizzo e-mail valido."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Inserisci un indirizzo IPv4 valido."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Inserisci un indirizzo IPv6 valido."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Inserisci un indirizzo IPv4 o IPv6 valido."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Inserisci solo cifre separate da virgole."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Assicurati che questo valore sia %(limit_value)s (ora è %(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Assicurati che questo valore sia minore o uguale a %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Assicuratii che questo valore sia maggiore o uguale a %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Assicurati che questo valore contenga almeno %(limit_value)d caratteri (ne "
"ha %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Assicuratii che questo valore non contenga più di %(limit_value)d caratteri "
"(ne ha %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "e"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "e"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Il valore %r non è una scelta valida."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Questo campo non può essere nullo."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Questo campo non può essere vuoto."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo di tipo: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Intero"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Questo valore deve essere un intero."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Il valore '%s' deve essere un numero intero."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Questo valore deve essere True o False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Il valore '%s' deve essere True o False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Booleano (True o False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Stringa (fino a %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Interi separati da virgole"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"Il valore '%s' ha un formato di data non valido. Deve essere nel formato "
+"AAAA-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Il valore '%s' ha il formato corretto (AAAA-MM-DD), ma è una data non valida."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Data (senza ora)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Inserisci una data valida in formato AAAA-MM-GG."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Data non valida: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Il valore '%s' ha un formato non valido. Deve essere nel formato AAAA-MM-GG "
+"HH:MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Inserisci una data/ora valida nel formato AAAA-MM-GG OO:MM[ss[.uuuuuu]]."
+"Il valore '%s' ha il formato corretto (AAAA-MM-GG HH:MM[:ss[.uuuuuu]][TZ]), "
+"ma è una data/ora non valida."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Data (con ora)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Questo valore deve essere un numero decimale."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Il valore '%s' deve essere un numero decimale."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Numero decimale"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Percorso di file"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Questo valore deve essere un numero a virgola mobile."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Il valore '%s' deve essere un numero in virgola mobile."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Numero decimale"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Intero grande (8 byte)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "Indirizzo IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Indirizzo IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Questo valore deve essere None, True o False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Il valore '%s' deve essere None, True o False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (True, False o None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Intero positivo"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Piccolo intero positivo"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (fino a %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Piccolo intero"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Testo"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Il valore '%s' ha un formato non valido. Deve essere nel formato HH:MM[:ss[."
+"uuuuuu]][TZ]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Il valore '%s' ha il formato corretto (HH:MM[:ss[.uuuuuu]][TZ]), ma è una "
+"data/ora non valida."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Ora"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Inserisci un'ora valida nel formato OO:MM[ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Testo XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "File"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Immagine"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (tipo determinato dal campo collegato)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relazione uno a uno"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relazione molti a molti"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Questo campo è obbligatorio."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Inserisci un numero intero."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Inserisci un numero."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Assicurati che non vi siano più di %s cifre in totale."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Assicurati che non vi siano più di %s cifre decimali."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assicurati che non vi siano più di %s cifre prima della virgola."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Inserisci una data valida."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Inserisci un'ora valida."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Inserisci una data/ora valida."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Non è stato inviato alcun file. Verifica il tipo di codifica sulla form."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Nessun file è stato inviato."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Il file inviato è vuoto."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -568,162 +640,171 @@ msgstr ""
"Assicurati che questo nome di file non contenga più di %(max)d caratteri (ne "
"ha %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"È possibile inviare un file o selezionare la casella \"svuota\", ma non "
"entrambi."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
"Carica un'immagine valida. Il file caricato non è un'immagine o è corrotto."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Inserisci una lista di valori."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ordine"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Cancella"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Correggi i dati duplicati di %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, 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 ""
-"Correggi i dati duplicati di %(field_name)s che deve essere unico/a per %"
-"(lookup)s in %(date_field)s."
+"Correggi i dati duplicati di %(field_name)s che deve essere unico/a per "
+"%(lookup)s in %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Correggi i dati duplicati qui sotto."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+" %(datetime)s non può essere interpretato nel fuso orario "
+"%(current_timezone)s: potrebbe essere ambiguo o non esistere."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Attualmente"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Modifica"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Svuota"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Sconosciuto"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Sì"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "sì,no,forse"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d byte"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "mezzanotte"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "mezzogiorno"
@@ -999,84 +1080,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Dicembre"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr " %(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "o"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "anno"
msgstr[1] "anni"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mese"
msgstr[1] "mesi"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "settimana"
msgstr[1] "settimane"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "giorno"
msgstr[1] "giorni"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ora"
msgstr[1] "ore"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minuti"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuti"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j F Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j F Y, H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Indici di directory non sono consentiti qui."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y F"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" non esiste"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indice di %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1109,12 +1190,12 @@ msgstr "Giorno non specificato"
msgid "No week specified"
msgstr "Settimana non specificata"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Nessun %(verbose_name_plural)s disponibile"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1123,7 +1204,7 @@ msgstr ""
"%(verbose_name_plural)s futuri/e non disponibili/e poichè %(class_name)s."
"allow_future è False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Data non valida '%(datestr)s' con il formato '%(format)s'"
@@ -1133,16 +1214,16 @@ msgstr "Data non valida '%(datestr)s' con il formato '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Trovato nessun %(verbose_name)s corrispondente alla query"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "La pagina non è 'ultima', né può essere convertita in un int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Pagina non valida (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Elenco vuoto e '%(class_name)s.allow_empty' è False."
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo
index 5f5573d122..2df3dbcbcd 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 4c285dfe58..fea8ed5fc1 100644
--- a/django/conf/locale/ja/LC_MESSAGES/django.po
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@@ -1,567 +1,628 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Shinya Okano <tokibito@gmail.com>, 2012.
+# Tetsuya Morimoto <tetsuya.morimoto@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: t2y <tetsuya.morimoto@gmail.com>\n"
-"Language-Team: Japanese <None>\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-08 14:54+0000\n"
+"Last-Translator: Shinya Okano <tokibito@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.net/projects/p/django/language/"
+"ja/)\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "アラビア語"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "アゼルバイジャン語"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "ブルガリア語"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "ベンガル語"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "ボスニア語"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "カタロニア語"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "チェコ語"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "ウェールズ語"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "デンマーク語"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "ドイツ語"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "ギリシャ語"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "英語(米国)"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "英語(英国)"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "スペイン語"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "アルゼンチンスペイン語"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr ""
+msgstr "メキシコスペイン語"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "ニカラグアスペイン語"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "エストニア語"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "バスク語"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "ペルシア語"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "フィンランド語"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "フランス語"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "フリジア語"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "アイルランド語"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "ガリシア語"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ヘブライ語"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "ヒンディー語"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "クロアチア語"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ハンガリー語"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "インドネシア語"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "アイスランド語"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "イタリア語"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "日本語"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "グルジア語"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "クメール語"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "カンナダ語"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "韓国語"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "リトアニア語"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "ラトビア語"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "マケドニア語"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "マラヤーラム語"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "モンゴル語"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "オランダ語"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "ノルウェー語"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "ノルウェーのブークモール"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "ノルウェーのニーノシュク"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "パンジャブ語"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "ポーランド語"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "ポルトガル語"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "ブラジルポルトガル語"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "ルーマニア語"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ロシア語"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "スロバキア語"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "スロヴェニア語"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "アルバニア語"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "セルビア語"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "セルビア語ラテン文字"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "スウェーデン語"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "タミル語"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "テルグ語"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "タイ語"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "トルコ語"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ウクライナ語"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "ウルドゥー語"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "ベトナム語"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "簡体字中国語"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "繁体字中国語"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "値を正しく入力してください。"
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "このURLはリンクが壊れています。"
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "URLを正しく入力してください。"
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "有効なメールアドレスを入力してください。"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "slug には半角の英数字、アンダースコア、ハイフン以外は使用できません。"
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "有効なIPアドレス (IPv4) を入力してください。"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "IPv6の正しいアドレスを入力してください。"
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "IPv4またはIPv6の正しいアドレスを入力してください。"
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "カンマ区切りの数字だけを入力してください。"
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "この値は %(limit_value)s 以下でなければなりません。"
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "この値は %(limit_value)s 以上でなければなりません。"
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"%(limit_value)d 字以上で入力してください(実際には %(show_value)d 文字でし"
"た)。"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"%(limit_value)d 字以下で入力してください(実際には %(show_value)d 文字でし"
"た)。"
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "と"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "この %(field_label)s を持った %(model_name)s が既に存在します。"
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "と"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "%r は有効な選択肢ではありません。"
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "このフィールドには NULL を指定できません。"
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "このフィールドは空ではいけません。"
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "整数"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "値は整数でなければなりません。"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' は整数値にしなければなりません。"
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "値は真: True または偽: False でなければなりません。"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' は真偽値にしなければなりません。"
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "ブール値 (真: True または偽: False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "文字列 ( %(max_length)s 字まで )"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "カンマ区切りの整数"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "'%s' は無効な日付形式です。YYYY-MM-DD形式にしなければなりません。"
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "'%s' は有効な日付形式(YYYY-MM-DD)ですが、日付が不正です。"
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "日付"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "YYYY-MM-DD形式で日付を入力してください。"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "無効な日付: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]]形式で日時を入力してください。"
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "日時"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "値は整数でなければなりません。"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' は10進浮動小数値にしなければなりません。"
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "10 進数 (小数可)"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "メールアドレス"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "ファイルの場所"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "値は浮動小数点数でなければなりません。"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' は小数値にしなければなりません。"
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "浮動小数点"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "大きな(8バイト)整数"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4アドレス"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP アドレス"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "値は、空: None、真: True または偽: False でなければなりません。"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "ブール値 (真: True 、偽: False または None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "テキスト"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "時刻"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "HH:MM[:ss[.uuuuuu]]形式で時刻を入力してください。"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XMLテキスト"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "ファイル"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "画像"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "主キーが %(pk)r である %(model)s モデルは存在しません。"
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "外部キー(型は関連フィールドによって決まります)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "1対1の関連"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "多対多の関連"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"複数選択するときには Control キーを押したまま選択してください。Mac は "
"Command キーを使ってください"
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "このフィールドは必須です。"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "整数を入力してください。"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "整数を入力してください。"
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "整数部と少数部を併せて %s 桁までで入力して下さい。"
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "少数部は %s 桁までで入力して下さい。"
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "整数部は %s 桁までで入力して下さい。"
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "日付を正しく入力してください。"
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "時間を正しく入力してください。"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "日付/時間を正しく入力してください。"
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"ファイルが取得できませんでした。formのencoding typeを確認してください。"
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "ファイルが送信されていません。"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "入力されたファイルは空です。"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -569,13 +630,13 @@ msgstr ""
"ファイル名は %(max)d 字以上で入力してください( %(length)d 文字入力されまし"
"た)。"
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"ファイルを投稿するか、クリアチェックボックスをチェックするかどちらかを選択し"
"てください。両方とも行ってはいけません。"
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -583,36 +644,36 @@ msgstr ""
"画像をアップロードしてください。アップロードしたファイルは画像でないか、また"
"は壊れています。"
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "リストを入力してください。"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "並び変え"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "削除"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s の重複したデータを修正してください。"
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"%(field)s の重複したデータを修正してください。このフィールドはユニークである"
"必要があります。"
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -621,108 +682,115 @@ msgstr ""
"%(field_name)s の重複したデータを修正してください。%(date_field)s %(lookup)s "
"では %(field_name)s がユニークである必要があります。"
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "下記の重複したデータを修正してください。"
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "インライン外部キーが親インスタンスの主キーと一致しません。"
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "正しく選択してください。選択したものは候補にありません。"
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "正しく選択してください。 %s は候補にありません。"
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" はプライマリキーとして無効な値です。"
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "現在"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "変更"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "クリア"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "不明"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "はい"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "いいえ"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "はい,いいえ,たぶん"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d バイト"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "0時"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "12時"
@@ -998,78 +1066,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "12月"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "または"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "年"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "ヶ月"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "週間"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "日"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "時間"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "分"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "分"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "Y/m/d"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "Y/m/d H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Directory indexes are not allowed here."
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y/m/d"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" does not exist"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "m/d"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index of %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1088,33 +1156,33 @@ msgstr " %(verbose_name)s を削除しました。"
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr ""
+msgstr "年が未指定です"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "月が未指定です"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "日が未指定です"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "週が未指定です"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1124,16 +1192,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 9da9cc547e..a4b46408e5 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 82bc039d40..8c7bc13473 100644
--- a/django/conf/locale/ka/LC_MESSAGES/django.po
+++ b/django/conf/locale/ka/LC_MESSAGES/django.po
@@ -1,577 +1,637 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# avsd05 <avsd05@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
"Last-Translator: avsd05 <avsd05@gmail.com>\n"
-"Language-Team: Georgian <None>\n"
+"Language-Team: Georgian (http://www.transifex.net/projects/p/django/language/"
+"ka/)\n"
+"Language: ka\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
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "არაბული"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "ბულგარული"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "ბენგალიური"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "ბოსნიური"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "კატალანური"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "ჩეხური"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "უელსური"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "დანიური"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "გერმანული"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "ბერძნული"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "ინგლისური"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "ბრიტანეთის ინგლისური"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "ესპანური"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "არგენტინის ესპანური"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "ესტონური"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "ბასკური"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "სპარსული"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "ფინური"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ფრანგული"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "ფრისიული"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "ირლანდიური"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "გალიციური"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ებრაული"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "ჰინდი"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "ხორვატიული"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "უნგრული"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "ინდონეზიური"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "ისლანდიური"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "იტალიური"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "იაპონური"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "ქართული"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "ხმერული"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "კანნადა"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "კორეული"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "ლიტვური"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "ლატვიური"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "მაკედონიური"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "მალაიზიური"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "მონღოლური"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "ჰოლანდიური"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "ნორვეგიული"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "ნორვეგიული-ბოკმალი"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "ნორვეგიული-ნინორსკი"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "პუნჯაბი"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "პოლონური"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "პორტუგალიური"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "ბრაზილიური პორტუგალიური"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "რუმინული"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "რუსული"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "სლოვაკური"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "სლოვენიური"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "ალბანური"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "სერბული"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "სერბული (ლათინური)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "შვედური"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "თამილური"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "ტელუგუ"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "ტაი"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "თურქული"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "უკრაინული"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "ვიეტნამური"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "გამარტივებული ჩინური"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "ტრადიციული ჩინური"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "შეიყვანეთ სწორი მნიშვნელობა."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "როგორც ჩანს, URL არის გაწყვეტილი ბმული."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "შეიყვანეთ სწორი URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "შეიყვანეთ სწორი ელ. ფოსტის მისამართი."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"შეიყვანეთ სწორი 'slug'-მნიშვნელობა, რომელიც შეიცავს მხოლოდ ასოებს, ციფრებს, "
"ხაზგასმის ნიშნებს და დეფისებს."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "შეიყვანეთ სწორი IPv4 მისამართი."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "შეიყვანეთ მხოლოდ მძიმეებით გამოყოფილი ციფრები."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "მნიშვნელობა უნდა იყოს %(limit_value)s-ზე ნაკლები ან ტოლი."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "მნიშვნელობა უნდა იყოს %(limit_value)s-ზე მეტი ან ტოლი."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"მნიშვნელობა უნდა შეიცავდეს სულ მცირე %(limit_value)d სიმბოლოს (იგი შეიცავს %"
-"(show_value)d-ს)."
+"მნიშვნელობა უნდა შეიცავდეს სულ მცირე %(limit_value)d სიმბოლოს (იგი შეიცავს "
+"%(show_value)d-ს)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"მნიშვნელობა უნდა შეიცავდეს არაუმეტეს %(limit_value)d სიმბოლოს (იგი შეიცავს %"
-"(show_value)d-ს)."
+"მნიშვნელობა უნდა შეიცავდეს არაუმეტეს %(limit_value)d სიმბოლოს (იგი შეიცავს "
+"%(show_value)d-ს)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "და"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s მოცემული %(field_label)s-ით უკვე არსებობს."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "და"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "მნიშვნელობა %r არ არის დასაშვები."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "ეს ველი არ შეიძლება იყოს null."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "ეს ველი არ შეიძლება იყოს ცარიელი."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "მთელი"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "ეს მნიშვნელობა უნდა იყოს მთელი."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "ეს მნიშვნელობა უნდა იყოს True ან False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "ლოგიკური (True ან False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "სტრიქონი (%(max_length)s სიმბოლომდე)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "მძიმით გამოყოფილი მთელი რიცხვები"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "თარიღი (დროის გარეშე)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "შეიყვანეთ სწორი თარიღი YYYY-MM-DD ფორმატში."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "არასწორი თარიღი: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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 ფორმატში."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "თარიღი (დროსთან ერთად)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "ეს მნიშვნელობა უნდა იყოს ათობითი რიცხვი."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "ათობითი რიცხვი"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "ელ. ფოსტის მისამართი"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "გზა ფაილისაკენ"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "მნიშვნელობა უნდა იყოს ნატურალური რიცხვი"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "რიცხვი მცოცავი წერტილით"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "დიდი მთელი (8-ბაიტიანი)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP-მისამართი"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "ეს მნიშვნელობა უნდა იყოს None, True ან False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "ლოგიკური (True, False ან None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "ტექსტი"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "დრო"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "შეიყვანეთ სწორი დრო HH:MM ფორმატში."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML ტექსტი"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "მოდელი %(model)s პირველადი გასაღებით %(pk)r არ არსებობს."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "გარე გასაღები (ტიპი განისაზღვრება დაკავშირებული ველის ტიპით)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "კავშირი ერთი-ერთტან"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "კავშირი მრავალი-მრავალთან"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"დააჭირეთ \"Control\", ან \"Command\" Mac-ზე, ერთზე მეტი მნიშვნელობის "
"ასარჩევად."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "ეს ველი აუცილებელია."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "შეიყვანეთ მთელი რიცხვი"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "შეიყვანეთ რიცხვი."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "დარწმუნდით, რომ მნიშვნელობა %s თანრიგს არ აღემატება."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "დარწმუნდით, რომ წილადი ნაწილი %s თანრიგს არ აღემატება."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "დარწმუნდით, რომ მთელი ნაწილი %s თანრიგს არ აღემატება."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "შეიყვანეთ სწორი თარიღი."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "შეიყვანეთ სწორი დრო."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "შეიყვანეთ სწორი თარიღი და დრო."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"ფაილი არ იყო გამოგზავნილი. შეამოწმეთ კოდირების ტიპი მოცემული ფორმისათვის."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "ფაილი არ იყო გამოგზავნილი."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "გამოგზავნილი ფაილი ცარიელია."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "ან გამოგზავნეთ ფაილი, ან მონიშნეთ \"წაშლის\" დროშა."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -579,36 +639,36 @@ msgstr ""
"ატვირთეთ დასაშვები გამოსახულება. თქვენს მიერ გამოგზავნილი ფაილი ან არ არის "
"გამოსახულება, ან დაზიანებულია."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "შეიყვანეთ მნიშვნელობების სია."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "დალაგება"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "წავშალოთ"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "გთხოვთ, შეასწოროთ დუბლირებული მონაცემები %(field)s-თვის."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობა %(field)s ველისთვის, რომელიც უნდა "
"იყოს უნიკალური."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -617,108 +677,115 @@ msgstr ""
"გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობა %(field_name)s ველისთვის, რომელიც "
"უნდა იყოს უნიკალური %(lookup)s-ზე, %(date_field)s-თვის."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობები."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "გარე გასაღების მნიშვნელობა მშობლის პირველად გასაღებს არ ემთხვევა."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. ეს არჩევანი დასაშვები არ არის."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. %s დასაშვები არ არის."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" არ არის დასაშვები მნიშვნელობა პირველადი გასაღებისათვის."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "ამჟამად"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "შეცვლა"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "წაშლა"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "გაურკვეველი"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "კი"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "არა"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "კი,არა,შესაძლოა"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ბაიტი"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s კბ"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s მბ"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s გბ"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s ტბ"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s პბ"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "შუაღამე"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "შუადღე"
@@ -994,78 +1061,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "დეკემბერი"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "ან"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "წელი"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "თვე"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "კვირა"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "დღე"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "საათი"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "წუთი"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "წუთი"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "d.m.Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "d.m.Y H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "d.m.Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "d.m.Y"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1098,19 +1165,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1120,16 +1187,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 a743415e2c..931b3327e9 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 601e8f8e58..286a91335f 100644
--- a/django/conf/locale/km/LC_MESSAGES/django.po
+++ b/django/conf/locale/km/LC_MESSAGES/django.po
@@ -1,708 +1,773 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: km\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: km\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "ភាសាអារ៉ាប់"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "ភាសាបេឡារុស្ស"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "ភាសាឆេក"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "ភាសាអ៊ុយក្រែន"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "ភាសាដាណឺម៉ាក"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "ភាសាអាល្លឺម៉ង់"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "ភាសាហ្កែលិគ"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "ភាសាអង់គ្លេស"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr ""
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "ភាសាអេស្ប៉ាញ"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr ""
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr ""
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr ""
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr ""
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "ភាសាហ្វាំងឡង់"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ភាសាបារាំង"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr ""
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr ""
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "ភាសាហ្កែលិគ"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ភាសាហេប្រិ"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ភាសាហុងគ្រី"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "ភាសាអ៉ីស្លង់"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "ភាសាអ៊ីតាលី"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "ភាសាជប៉ុន"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "ភាសាហ្វាំងឡង់"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "ភាសាន័រវែស"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "ភាសារូម៉ានី"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ភាសាรัរូស្ស៉ី"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "ភាសាស្លូវ៉ាគី"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "ភាសាស្លូវ៉ានី"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "ភាសាស៊ុយអែដ"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "ភាសាតាមីល"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "ភាសាទួរគី"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ភាសាអ៊ុយក្រែន"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr ""
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "ភាសាចិនសាមញ្ញ"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "ភាសាចិនបុរាណ"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr ""
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr ""
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "សូមបំពេញអ៊ីមែល"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "បំពេញតែលេខហើយផ្តាច់ចេញពីគ្នាដោយសញ្ញាក្បៀស។"
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "និង"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "និង"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "ចាំបាច់បំពេញទិន្នន័យកន្លែងនេះ។"
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: 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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "ចំនួនពិត(Integer)"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "តំលៃនេះត្រូវតែជាចំនួនលេខ។"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "តំលៃអាចជា True ឬ False។"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (អាច​ជា True រឺ False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "ចំនួនពិត(Integer) ដែលផ្តាច់ចេញពីគ្នាដោយ​ក្បៀស"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "កាល​បរិច្ឆេទ (Date) (មិនមានសរសេរម៉ោង)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "សូមបំពេញកាលបរិច្ឆេទក្នុងទំរង់ជា YYYY-MM-DD ។"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "កាល​បរិច្ឆេទ (Date) (មានសរសេរម៉ោង)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "ចំនួនទសភាគ (Decimal)"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "អ៊ីម៉ែល"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "ផ្លូវទៅកាន់ឯកសារ"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "លេខ IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (អាចជា True​ រឺ False រឺ None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "អត្ថបទ"
-#: db/models/fields/__init__.py:1040
-msgid "Time"
-msgstr "ពេលវេលា"
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
msgstr ""
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1185
+msgid "Time"
+msgstr "ពេលវេលា"
+
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "អាស័យដ្ឋានគេហទំព័រ(URL)"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "អត្ថបទ XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"សូមចុចប៉ូតុន \"Control\", ឬ \"Command\" ចំពោះកុំព្យូទ័រ Mac, ដើម្បីជ្រើសរើសច្រើនជាងមួយ។"
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "ចាំបាច់បំពេញទិន្នន័យកន្លែងនេះ។"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "បំពេញចំនួនទាំងអស់។"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr ""
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr ""
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr ""
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr ""
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr ""
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr ""
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "មិនមានឯកសារត្រូវបានជ្រើសរើស។ សូមពិនិត្យប្រភេទឯកសារម្តងទៀត។"
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr ""
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "ពុំមានឯកសារ។​"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr ""
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr ""
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "លប់"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr ""
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "ផ្លាស់ប្តូរ"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "មិន​ដឹង"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "យល់ព្រម"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "មិនយល់ព្រម"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "យល់ព្រម មិនយល់ព្រម​ ប្រហែល"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr ""
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr ""
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr ""
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr ""
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr ""
@@ -871,27 +936,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"
@@ -921,135 +986,135 @@ msgstr ""
#: utils/dates.py:45
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "មករា"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "កុម្ភៈ"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "មិនា"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "មេសា"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "ឧសភា"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "មិថុនា"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "កក្កដា"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "សីហា"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "កញ្ញា"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "តុលា"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "វិច្ឆិកា"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
+msgstr "ធ្នូ"
+
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:136
+#: utils/text.py:234
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ""
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "ឆ្នាំ"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "ខែ"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "សប្តាហ៍"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "ថ្ងៃ"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ម៉ោង"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "នាទី"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
-msgstr ""
+msgstr "នាទី"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr ""
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "ថ្ងៃទី j ​ខែ N ឆ្នាំ Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "ថ្ងៃទី j ​ខែ N ឆ្នាំ Y ម៉ោង P"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "ម៉ោង P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "ខែ F ឆ្នាំ Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "ថ្ងៃទី​​ j ខែ F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1082,19 +1147,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1104,16 +1169,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 3a6cb0ff6a..447519a25c 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 96231e355a..54c6bd6fad 100644
--- a/django/conf/locale/kn/LC_MESSAGES/django.po
+++ b/django/conf/locale/kn/LC_MESSAGES/django.po
@@ -1,713 +1,805 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# <karthikbgl@gmail.com>, 2011, 2012.
+# Ramakrishna Yekulla <ramkrsna@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-05 19:14+0000\n"
-"Last-Translator: ramkrsna <ramkrsna@gmail.com>\n"
-"Language-Team: Kannada <None>\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: karthikbgl <karthikbgl@gmail.com>\n"
+"Language-Team: Kannada (http://www.transifex.net/projects/p/django/language/"
+"kn/)\n"
+"Language: kn\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
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "ಅರೇಬಿಕ್"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "ಆಜೆರ್ಬೈಜನಿ"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
-msgstr "ಬಲ್ಗರಿಯನ್"
+msgstr "ಬಲ್ಗೇರಿಯನ್"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "ಬೆಂಗಾಲಿ"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "ಬೋಸ್ನಿಯನ್"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
-msgstr "ಕ್ಯಾಟಲನ್"
+msgstr "ಕೆಟಲಾನ್"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "ಝೆಕ್"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "ವೆಲ್ಷ್"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "ಡ್ಯಾನಿಷ್"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "ಜರ್ಮನ್"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "ಗ್ರೀಕ್"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "ಇಂಗ್ಲಿಷ್"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
-msgstr "ಬ್ರಿಟಿಶ್ ಇಂಗ್ಲಿಷ್"
+msgstr "ಬ್ರಿಟೀಶ್ ಇಂಗ್ಲಿಷ್"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "ಸ್ಪ್ಯಾನಿಷ್"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
-msgstr "ಅರ್ಗೆನ್ತಿನ ಸ್ಪಾನಿಷ್"
+msgstr "ಅರ್ಜೆಂಟಿನಿಯನ್ ಸ್ಪಾನಿಷ್"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr "ಮೆಕ್ಸಿಕನ್ ಸ್ಪಾನಿಷ್"
+msgstr "ಮೆಕ್ಸಿಕನ್ ಸ್ಪಾನಿಷ್"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "nicarguan ಸ್ಪಾನಿಷ್"
+
+#: conf/global_settings.py:65
msgid "Estonian"
-msgstr "ಎಷ್ಟೋನಿಯಾನ್"
+msgstr "ಎಷ್ಟೋನಿಯನ್"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
-msgstr "ಬಾಸ್ಕೆ"
+msgstr "ಬಾಸ್ಕ್‍"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
-msgstr "ಪೆರ್ಸಿಯನ್"
+msgstr "ಪರ್ಶಿಯನ್"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "ಫಿನ್ನಿಶ್"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ಫ್ರೆಂಚ್"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
-msgstr "ಫರಿಸಿಯನ್"
+msgstr "ಫ್ರಿಸಿಯನ್"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
-msgstr "ಇರಿಶ್"
+msgstr "ಐರಿಶ್"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
-msgstr "ಗ್ಯಾಲಿಶಿಯನ್"
+msgstr "ಗೆಲಿಶಿಯನ್"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ಹೀಬ್ರೂ"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "ಹಿಂದಿ"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
-msgstr "ಕ್ರೊಯೇಸಿಯನ್"
+msgstr "ಕ್ರೊಯೇಶಿಯನ್"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ಹಂಗೇರಿಯನ್"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
-msgstr "ಇಂಡೋನೆಸಿಯನ್ "
+msgstr "ಇಂಡೋನಿಶಿಯನ್"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
-msgstr "ಐಸ್‍ಲ್ಯಾಂಡಿಕ್"
+msgstr "ಐಸ್‌ಲ್ಯಾಂಡಿಕ್"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "ಇಟಾಲಿಯನ್"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
-msgstr "ಜಪಾನೀಸ್"
+msgstr "ಜಾಪನೀಸ್"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
-msgstr "ಜಾರ್ಜೆಯಾನ್ "
+msgstr "ಜಾರ್ಜೆಯನ್ "
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
-msgstr ""
+msgstr "ಖಮೇರ್"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "ಕನ್ನಡ"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "ಕೊರಿಯನ್"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
-msgstr "ಲಿತುಎನಿಯಾನ್ "
+msgstr "ಲಿತುವಾನಿಯನ್ "
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
-msgstr "ಲತ್ವಿಯನ್"
+msgstr "ಲಾಟ್ವಿಯನ್"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
-msgstr "ಮಸಡೊನಿಯನ್"
+msgstr "ಮೆಸಡೊನಿಯನ್"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "ಮಲಯಾಳಂ"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
-msgstr "ಮೊಂಗೊಲಿಯನ್"
+msgstr "ಮಂಗೊಲಿಯನ್"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "ಡಚ್"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "ನಾರ್ವೇಜಿಯನ್"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "ನಾರ್ವೇಜಿಯನ್ ಬೋಕ್ಮಲ್"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "ನಾರ್ವೇಜಿಯನ್ ನಿನೋರ್ಕ್"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "ಪಂಜಾಬಿ"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "ಪೋಲಿಷ್"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
-msgstr "ಪೋರ್ತುಗೀಸೆ"
+msgstr "ಪೋರ್ಚುಗೀಸ್"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
-msgstr "ಬ್ರ್ರಜೀಲಿಅನ್ ಪೋರ್ತುಗೀಸೆ"
+msgstr "ಬ್ರಜೀಲಿಯನ್ ಪೋರ್ಚುಗೀಸ್"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "ರೋಮೇನಿಯನ್"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ರಶಿಯನ್"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "ಸ್ಲೋವಾಕ್"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "ಸ್ಲೋವೇನಿಯನ್"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
-msgstr "ಅಲ್ಬೆನಿಅನ್ "
+msgstr "ಅಲ್ಬೆನಿಯನ್ "
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
-msgstr "ಸೆರ್ಬಿಯನ್"
+msgstr "ಸರ್ಬಿಯನ್"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
-msgstr "ಸೆರ್ಬಿಯನ್ ಲಟಿನ್"
+msgstr "ಸರ್ಬಿಯನ್ ಲ್ಯಾಟಿನ್"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "ಸ್ವೀಡಿಷ್"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "ತಮಿಳು"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "ತೆಲುಗು"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
-msgstr "ತಯೀ"
+msgstr "ಥಾಯ್"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "ಟರ್ಕಿಶ್"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
-msgstr "ಯುಕ್ರೇನಿಯನ್"
+msgstr "ಉಕ್ರೇನಿಯನ್"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "ಉರ್ದು"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
-msgstr "ವಿಎತ್ನಂಮಿಸಿ"
+msgstr "ವಿಯೆತ್ನಾಮೀಸ್"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "ಸರಳೀಕೃತ ಚೈನೀಸ್"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "ಸಂಪ್ರದಾಯಿಕ ಚೈನೀಸ್ "
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
-msgstr "ಕ್ರಮಬದ್ಧ ಮೌಲ್ಯ ಬರೆಯಿರಿ"
+msgstr "ಸಿಂಧುವಾದ ಮೌಲ್ಯವನ್ನು ನಮೂದಿಸಿ."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
-msgstr ""
+msgstr "ಈ URL ಒಂದು ತುಂಡಾದ ಜಾಲಕೊಂಡಿಯಾಗಿದೆ."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
-msgstr ""
+msgstr "ಸರಿಯಾದ ಒಂದು URL ಅನ್ನು ನಮೂದಿಸಿ."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
-msgstr "ಕ್ರಮಬದ್ಧ ವಿ-ವಿಳಾಸವೊಂದನ್ನು ಇಲ್ಲಿ ಬರೆಯಿರಿ"
+msgstr "ಸಿಂಧುವಾದ ಇ-ಮೈಲೊಂದನ್ನು ನಮೂದಿಸಿ."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
+"ಅಕ್ಷರಗಳು, ಅಂಕೆಗಳು, ಅಡಿಗೆರೆಗಳು (ಅಂಡರ್ಸ್ಕೋರ್) ಹಾಗು ಅಡ್ಡಗೆರೆಗಳನ್ನು ಹೊಂದಿರುವ ಒಂದು "
+"ಸರಿಯಾದ 'slug' ಅನ್ನು ನಮೂದಿಸಿ."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
-msgstr ""
+msgstr "ಒಂದು ಸರಿಯಾದ IPv4 ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "ಮಾನ್ಯವಾದ IPv6 ವಿಳಾಸ ದಾಖಲಿಸಿ"
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "ಮಾನ್ಯವಾದ IPv4 ಅಥವಾ IPv6 ವಿಳಾಸ ದಾಖಲಿಸಿ"
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
-msgstr "ಅಲ್ಪವಿರಾಮ(,)ಗಳಿಂದ ಬೇರ್ಪಟ್ಟ ಅಂಕೆಗಳನ್ನು ಮಾತ್ರ ಬರೆಯಿರಿ."
+msgstr "ಅಲ್ಪವಿರಾಮ(,)ಗಳಿಂದ ಬೇರ್ಪಟ್ಟ ಅಂಕೆಗಳನ್ನು ಮಾತ್ರ ಬರೆಯಿರಿ."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
+"ಈ ಮೌಲ್ಯವು %(limit_value)s ಕ್ಕಿಂತ ಕಡಿಮೆಯ ಅಥವ ಸಮನಾದ ಮೌಲ್ಯವಾಗಿದೆ ಎಂದು ಖಾತ್ರಿ "
+"ಮಾಡಿಕೊಳ್ಳಿ."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
+"ಈ ಮೌಲ್ಯವು %(limit_value)s ಕ್ಕಿಂತ ಹೆಚ್ಚಿನ ಅಥವ ಸಮನಾದ ಮೌಲ್ಯವಾಗಿದೆ ಎಂದು ಖಾತ್ರಿ "
+"ಮಾಡಿಕೊಳ್ಳಿ."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
+"ಈ ಮೌಲ್ಯವು ಕನಿಷ್ಟ %(limit_value)d ಅಕ್ಷರಗಳನ್ನು ಅನ್ನು ಹೊಂದಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ "
+"(ಇದು %(show_value)d ಹೊಂದಿದೆ)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
+"ಈ ಮೌಲ್ಯವು ಗರಿಷ್ಟ %(limit_value)d ಅಕ್ಷರಗಳನ್ನು ಅನ್ನು ಹೊಂದಿದೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ "
+"(ಇದು %(show_value)d ಹೊಂದಿದೆ)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:787 forms/models.py:577
+msgid "and"
+msgstr "ಮತ್ತು"
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
+"ಈ %(field_label)s ಅನ್ನು ಹೊಂದಿರುವ ಒಂದು %(model_name)s ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "ಮತ್ತು"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "%r ಎಂಬ ಮೌಲ್ಯವು ಒಂದು ಸರಿಯಾದ ಆಯ್ಕೆಯಾಗಿಲ್ಲ."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "ಈ ಅಂಶವನ್ನು ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
-msgstr ""
+msgstr "ಈ ಸ್ಥಳವು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, 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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
-msgstr "ಸಂಖ್ಯೆ"
+msgstr "ಪೂರ್ಣಾಂಕ"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "ಈ ಬೆಲೆಯು ಪೂರ್ಣ ಸಂಖ್ಯೆ ಇರಬೇಕು."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' ಪೂರ್ಣಾಂಕ ಇರಬೇಕು"
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "ಈ ಬೆಲೆಯು ಹೌದು ಅಥವಾ ಇಲ್ಲ ಇರಬೇಕು."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "%s True ಅಥವಾ False ಇರಬೇಕು"
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
-msgstr "ಬೂಲಿಯನ್( ನಿಜ ಅಥವಾ ಸುಳ್ಳು)"
+msgstr "ಬೂಲಿಯನ್ (ಹೌದು ಅಥವ ಅಲ್ಲ)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
-msgstr ""
+msgstr "ಪದಪುಂಜ (%(max_length)s ವರೆಗೆ)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
-msgstr "ಅಲ್ಪವಿರಾಮ(,) ದಿಂದ ಬೇರ್ಪಟ್ಟ ಸಂಖ್ಯೆಗಳು"
+msgstr "ಅಲ್ಪವಿರಾಮ(,) ದಿಂದ ಬೇರ್ಪಟ್ಟ ಪೂರ್ಣಸಂಖ್ಯೆಗಳು"
-#: db/models/fields/__init__.py:584
-msgid "Date (without time)"
-msgstr "ದಿನಾಂಕ (ಸಮಯರಹಿತ)"
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "'%s' ಅಮಾನ್ಯ ದಿನಾಂಕದ ಸ್ವರೂಪ ಹೊಂದಿದೆ. YYYY-MM-DD ಆಗಿರಬೇಕು"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "ಸರಿಯಾದ ದಿನಾಂಕವನ್ನು ವವವವ-ತಿತಿ-ದಿದಿ ರೀತಿಗೆ ಹೊಂದುವಂತೆ ಸೂಚಿಸಿರಿ."
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
+msgid "Date (without time)"
+msgstr "ದಿನಾಂಕ (ಸಮಯವಿಲ್ಲದೆ)"
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
-msgstr "ದಿನಾಂಕ(ಸಮಯದೊಂದಿಗೆ)"
+msgstr "ದಿನಾಂಕ (ಸಮಯದೊಂದಿಗೆ)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "ಕೊಟ್ಟ ಸಂಖ್ಯೆ ದಶಾಂಶದ ಕ್ರಮದಲ್ಲಿ ಇರ ಬೇಕು"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' ದಶಮಾಂಶ ಸಂಖ್ಯೆ ಆಗಿರಬೇಕು"
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "ದಶಮಾನ ಸಂಖ್ಯೆ"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
-msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
+msgstr "ಇ-ಮೈಲ್ ವಿಳಾಸ"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "ಕಡತದ ಸ್ಥಾನಪಥ"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "ಕೊಟ್ಟ ಸಂಖ್ಯೆ ಫ್ಲೋಟ್ ಕ್ರಮದಲ್ಲಿ ಇರ ಬೇಕು "
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' float ಆಗಿರಬೇಕು"
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
-msgstr ""
+msgstr "ತೇಲುವ-ಬಿಂದು ಸಂಖ್ಯೆ"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
-msgstr "ಬೃಹತ್ (೮ byte) ಇಡೀ ಅಂಕೆ "
+msgstr "ಬೃಹತ್ (೮ ಬೈಟ್) ಪೂರ್ಣ ಸಂಖ್ಯೆ"
+
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 ವಿಳಾಸ"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP ವಿಳಾಸ"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "ಕೊಟ್ಟ ಮಹತ್ವ ನಿಜ ಅಥವಾ ಸುಳ್ಳು ಅಥವಾ ಯಾವುದೂ ಅಲ್ಲ ಕ್ರಮದಲ್ಲಿ ಇರ ಬೇಕು "
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' None, True ಅಥವಾ False ಇರಬೇಕು"
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
-msgstr "ಬೂಲಿಯನ್( ನಿಜ ಅಥವಾ ಸುಳ್ಳು ಅಥವಾ ಯಾವುದೂ ಅಲ್ಲ)"
+msgstr "ಬೂಲಿಯನ್ (ನಿಜ, ಸುಳ್ಳು ಅಥವ ಯಾವುದೂ ಅಲ್ಲ ಇವುಗಳಲ್ಲಿ ಒಂದು)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "ಪಠ್ಯ"
-#: db/models/fields/__init__.py:1040
-msgid "Time"
-msgstr "ಸಮಯ"
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
msgstr ""
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1185
+msgid "Time"
+msgstr "ಸಮಯ"
+
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML ಪಠ್ಯ"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "ಬಾಹ್ಯ ಕೀಲಿ (ಸಂಬಂಧಿತ ಸ್ಥಳದಿಂದ ಪ್ರಕಾರವನ್ನು ನಿರ್ಧರಿಸಲಾಗುತ್ತದೆ)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
-msgstr ""
+msgstr "ಒನ್-ಟು-ಒನ್ (ಪರಸ್ಪರ) ಸಂಬಂಧ"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "ಮೆನಿ-ಟು-ಮೆನಿ (ಸಾರ್ವಜನಿಕ) ಸಂಬಂಧ"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-"ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚನ್ನು ಆಯ್ದುಕೊಳ್ಳಲು ಮ್ಯಾಕ್ ಗಣಕದ ಮೇಲೆ \"ಕಂಟ್ರೋಲ್\", ಅಥವಾ \"ಕಮ್ಯಾಂಡ್\" ಅನ್ನು "
+"ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚನ್ನು ಆಯ್ದುಕೊಳ್ಳಲು ಮ್ಯಾಕ್ ಗಣಕದಲ್ಲಿನ \"ಕಂಟ್ರೋಲ್\", ಅಥವಾ \"ಕಮ್ಯಾಂಡ್\" ಅನ್ನು "
"ಒತ್ತಿ ಹಿಡಿಯಿರಿ."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
-msgstr "ಈ ಅಂಶ ಅಗತ್ಯ."
+msgstr "ಈ ಸ್ಥಳವು ಅಗತ್ಯವಿರುತ್ತದೆ."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
-msgstr "ಪೂರ್ಣಾಂಕವೊಂದನ್ನು ಬರೆಯಿರಿ"
+msgstr "ಪೂರ್ಣಾಂಕವೊಂದನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
-msgstr "ಸಂಖ್ಯೆಯನ್ನು ಬರೆಯಿರಿ "
+msgstr "ಒಂದು ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
-msgstr ""
+msgstr "ಒಟ್ಟು %s ಅಂಕಿಗಳಿಗಿಂತ ಹೆಚ್ಚಿನ ಅಂಕಿಗಳು ಇಲ್ಲ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
-msgstr ""
+msgstr "ಒಟ್ಟು %s ದಶಮಾಂಶ ಸ್ಥಾನಗಳಿಗಿಂತ ಹೆಚ್ಚಿನವುಗಳು ಇಲ್ಲ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
+"ದಶಾಂಶ ಬಿಂದುವಿನ ಮೊದಲು %s ಅಂಕಿಗಳಿಗಿಂರ ಹೆಚ್ಚಿನ ಅಂಕಿಗಳು ಇಲ್ಲ ಎಂದು ಖಾತ್ರಿ ಮಾಡಿಕೊಳ್ಳಿ."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
-msgstr "ಸರಿಯಾದ ದಿನಾಂಕ ಬರೆಯಿರಿ"
+msgstr "ಸರಿಯಾದ ದಿನಾಂಕವನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
-msgstr "ಸರಿಯಾದ ಸಮಯ ಬರೆಯಿರಿ"
+msgstr "ಸರಿಯಾದ ಸಮಯವನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
-msgstr "ಸರಿಯಾದ ದಿನಾಂಕ/ವೇಳೆ ಬರೆಯಿರಿ"
+msgstr "ಸರಿಯಾದ ದಿನಾಂಕ/ಸಮಯವನ್ನು ನಮೂದಿಸಿ."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
-msgstr "ಯಾವದೇ ಕಡತವನ್ನೂ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ.ನಮೂನೆಯ ಮೇಲಿನ ಸಂಕೇತೀಕರಣ ಬಗೆಯನ್ನು ಪರೀಕ್ಷಿಸಿ."
+msgstr ""
+"ಯಾವದೇ ಕಡತವನ್ನೂ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ. ನಮೂನೆಯ ಮೇಲಿನ ಸಂಕೇತೀಕರಣ (ಎನ್ಕೋಡಿಂಗ್) ಬಗೆಯನ್ನು "
+"ಪರೀಕ್ಷಿಸಿ."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
-msgstr "ಯಾವದೇ ಕಡತವನ್ನೂ ಸಲ್ಲಿಸಲಾಗಿ"
+msgstr "ಯಾವದೇ ಕಡತವನ್ನೂ ಸಲ್ಲಿಸಲಾಗಿಲ್ಲ."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "ಸಲ್ಲಿಸಲಾದ ಕಡತ ಖಾಲಿ ಇದೆ."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"ದಯವಿಟ್ಟು ಕಡತವನ್ನು ಸಲ್ಲಿಸಿ ಅಥವ ಅಳಿಸುವ ಗುರುತುಚೌಕವನ್ನು ಗುರುತು ಹಾಕಿ, ಎರಡನ್ನೂ ಒಟ್ಟಿಗೆ "
+"ಮಾಡಬೇಡಿ."
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
+msgstr "ಸರಿಯಾದ ಒಂದು ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ. %(value)s ಎನ್ನುವುದು ಲಭ್ಯವಿರುವ ಆಯ್ಕೆಗಳಲ್ಲಿ ಇಲ್ಲ."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
-msgstr ""
+msgstr "ಮೌಲ್ಯಗಳ ಒಂದು ಪಟ್ಟಿಯನ್ನು ನಮೂದಿಸಿ."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
-msgstr "ರೀತಿ"
+msgstr "ಕ್ರಮ"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "ಅಳಿಸಿಹಾಕಿ"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
+msgstr "%(field)s ಗಾಗಿ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮಾಹಿತಿಯನ್ನು ಸರಿಪಡಿಸಿ."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
+"%(field)s ಗಾಗಿ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮಾಹಿತಿಯನ್ನು ಸರಿಪಡಿಸಿ, ಇದರ ಮೌಲ್ಯವು "
+"ವಿಶಿಷ್ಟವಾಗಿರಬೇಕು."
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
-msgstr ""
+msgstr "ದಯವಿಟ್ಟು ಈ ಕೆಳಗೆ ಎರಡು ಬಾರಿ ನಮೂದಿಸಲಾದ ಮೌಲ್ಯವನ್ನು ಸರಿಪಡಿಸಿ."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "ಸಾಲಿನೊಳಗಿನ ಪ್ರಾಥಮಿಕ ಕೀಲಿಯು ಮೂಲ ಇನ್‌ಸ್ಟನ್ಸ್‍ ಪ್ರಾಥಮಿಕ ಕೀಲಿಗೆ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
+msgstr "ಸರಿಯಾದ ಒಂದು ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ. ಆ ಆಯ್ಕೆಯು ಲಭ್ಯವಿರುವ ಆಯ್ಕೆಗಳಲ್ಲಿ ಇಲ್ಲ."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr ""
+msgstr "ಸರಿಯಾದ ಒಂದು ಆಯ್ಕೆಯನ್ನು ಆರಿಸಿ. %s ಎನ್ನುವುದು ಲಭ್ಯವಿರುವ ಆಯ್ಕೆಗಳಲ್ಲಿ ಇಲ್ಲ."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
+msgstr "\"%s\" ಎನ್ನುವುದು ಒಂದು ಸರಿಯಾದ ಪ್ರಾಥಮಿಕ ಕೀಲಿಯಲ್ಲ."
+
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:299
+#: forms/widgets.py:325
msgid "Currently"
-msgstr "ಸಲುವಳಿ"
+msgstr "ಪ್ರಸಕ್ತ"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
-msgstr "ಬದಲಿಸಿ/ಬದಲಾವಣೆ"
+msgstr "ಬದಲಾವಣೆ"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "ಮುಕ್ತಗೊಳಿಸು"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
-msgstr "ಗೊತ್ತಿಲ್ಲ(ದ/ದ್ದು)"
+msgstr "ಗೊತ್ತಿರದ"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "ಹೌದು"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "ಇಲ್ಲ"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ಹೌದು,ಇಲ್ಲ,ಇರಬಹುದು"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] ""
+msgstr[0] "%(size)d ಬೈಟ್‌ಗಳು"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
-msgstr "%s ಕೆಬಿ"
+msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
-msgstr "%s ಯಂಬಿ "
+msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
-msgstr "%s ಜಿಬಿ"
+msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
-msgstr "%s ಟಿಬಿ"
+msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
-msgstr "%s ಪಿಬಿ"
+msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
-msgstr ""
+msgstr "ಅಪರಾಹ್ನ"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
-msgstr ""
+msgstr "ಪೂರ್ವಾಹ್ನ"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
-msgstr ""
+msgstr "ಅಪರಾಹ್ನ"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
-msgstr ""
+msgstr "ಪೂರ್ವಾಹ್ನ"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "ಮಧ್ಯರಾತ್ರಿ"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
-msgstr "ಸರಿಹಗಳು "
+msgstr "ಮಧ್ಯಾಹ್ನ"
#: utils/dates.py:6
msgid "Monday"
@@ -843,7 +935,7 @@ msgstr "ಜುಲೈ"
#: utils/dates.py:24
msgid "aug"
-msgstr "ಆಗಸ್ಟ್"
+msgstr "ಆಗಸ್ಟ್‍"
#: utils/dates.py:24
msgid "sep"
@@ -864,12 +956,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"
@@ -899,224 +991,228 @@ 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
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "ಜನವರಿ"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "ಫೆಬ್ರವರಿ"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "ಮಾರ್ಚ್"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "ಏಪ್ರಿಲ್"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "ಮೇ"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "ಜೂನ್"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "ಜುಲೈ"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "ಆಗಸ್ಟ್‍"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "ಸಪ್ಟೆಂಬರ್"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "ಅಕ್ಟೋಬರ್"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "ನವೆಂಬರ್"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
+msgstr "ಡಿಸೆಂಬರ್"
+
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:136
+#: utils/text.py:234
msgid "or"
-msgstr ""
+msgstr "ಅಥವ"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
-msgstr ""
+msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
-msgstr[0] ""
+msgstr[0] "ವರ್ಷಗಳು"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
-msgstr[0] ""
+msgstr[0] "ತಿಂಗಳುಗಳು"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
-msgstr[0] ""
+msgstr[0] "ವಾರಗಳು"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
-msgstr[0] ""
+msgstr[0] "ದಿನಗಳು"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
-msgstr[0] ""
+msgstr[0] "ಗಂಟೆಗಳು"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
-msgstr[0] ""
+msgstr[0] "ನಿಮಿಷಗಳು"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
-msgstr ""
+msgstr "ನಿಮಿಷಗಳು"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
-msgstr ""
+msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
-msgstr ""
-
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
+msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
msgid "The %(verbose_name)s was created successfully."
-msgstr " %(verbose_name)s ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ನಿರ್ಮಿಸಲಾಯಿತು."
+msgstr " %(verbose_name)s ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ರಚಿಸಲಾಗಿದೆ."
#: views/generic/create_update.py:164
#, python-format
msgid "The %(verbose_name)s was updated successfully."
-msgstr " %(verbose_name)s ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಮಾರ್ಪಡಿಸಲಾಯಿತು."
+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 ""
+msgstr "ಯಾವುದೆ ವರ್ಷವನ್ನು ಸೂಚಿಲಾಗಿಲ್ಲ"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "ಯಾವುದೆ ತಿಂಗಳನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "ಯಾವುದೆ ದಿನವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "ಯಾವುದೆ ವಾರವನ್ನು ಸೂಚಿಸಲಾಗಿಲ್ಲ"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "ಯಾವುದೆ %(verbose_name_plural)s ಲಭ್ಯವಿಲ್ಲ"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"ಭವಿಷ್ಯದ %(verbose_name_plural)s ಲಭ್ಯವಿಲ್ಲ ಏಕೆಂದರೆ %(class_name)s.allow_future "
+"ಎನ್ನುವುದು ಅಸತ್ಯವಾಗಿದೆ (ಫಾಲ್ಸ್‍) ಆಗಿದೆ."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
+"ಅಸಿಂಧುವಾದ '%(datestr)s' ದಿನಾಂಕ ಪದಪುಂಜ ಒದಗಿಸಲಾದ ವಿನ್ಯಾಸವು '%(format)s' ಆಗಿದೆ"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "ಮನವಿಗೆ ತಾಳೆಯಾಗುವ ಯಾವುದೆ %(verbose_name)s ಕಂಡುಬಂದಿಲ್ಲ"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "ಪುಟವು 'ಕೊನೆಯ'ದಲ್ಲ, ಅಥವ ಅದನ್ನು ಒಂದು int ಆಗಿ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "ಅಸಿಂಧುವಾದ ಪುಟ (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
+"ಖಾಲಿ ಪಟ್ಟಿ ಹಾಗು '%(class_name)s.allow_empty' ಎನ್ನುವುದು ಅಸತ್ಯವಾಗಿದೆ (ಫಾಲ್ಸ್‍)."
diff --git a/django/conf/locale/ko/LC_MESSAGES/django.mo b/django/conf/locale/ko/LC_MESSAGES/django.mo
index e20a20906e..87c53aee98 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 ede8a919cf..9b86489481 100644
--- a/django/conf/locale/ko/LC_MESSAGES/django.po
+++ b/django/conf/locale/ko/LC_MESSAGES/django.po
@@ -1,565 +1,625 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jaehong Kim <mixe@korea.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-06 03:47+0000\n"
-"Last-Translator: mixe <mixe@korea.com>\n"
-"Language-Team: Korean <None>\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Jaehong Kim <mixe@korea.com>\n"
+"Language-Team: Korean (http://www.transifex.net/projects/p/django/language/"
+"ko/)\n"
+"Language: ko\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
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "아랍어"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "아제르바이잔어"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "불가리어"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "방글라데시어"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "보스니아어"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "카탈로니아어"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "체코어"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "웨일즈어"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "덴마크어"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "독일어"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "그리스어"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "영어"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "영어 (영국)"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "스페인어"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "아르헨티나 스페인어"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "멕시컨 스페인어"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "에스토니아어"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "바스크어"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "페르시아어"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "핀란드어"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "프랑스어"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "프리슬란트어"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "아일랜드어"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "갈리시아어"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "히브리어"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "힌두어"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "크로아티아어"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "헝가리어"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "인도네시아어"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "아이슬란드어"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "이탈리아어"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "일본어"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "조지아어"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "크메르어"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "칸나다어"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "한국어"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "리투아니아어"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "라트비아어"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "마케도니아어"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "말레이지아어"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "몽고어"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "네덜란드어"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "노르웨이어"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "노르웨이어 (보크몰)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "노르웨이어 (뉘노르스크)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "펀자브어"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "폴란드어"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "포르투갈어"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "브라질 포르투갈어"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "루마니아어"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "러시아어"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "슬로바키아어"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "슬로베니아어"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "알바니아어"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "세르비아어"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "세르비아어"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "스웨덴어"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "타밀어"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "텔루구어"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "태국어"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "터키어"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "우크라이나어"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "우르드어"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "베트남어"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "중국어 간체"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "중국어 번체"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "올바른 값을 입력하세요."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "해당 URL의 링크가 잘못 되어 있습니다."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "올바른 URL을 입력하세요."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "올바른 이메일 주소를 입력하세요."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "문자, 숫자, '_', '-'만 가능합니다."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "올바른 IPv4 주소를 입력하세요."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "콤마로 구분된 숫자만 입력하세요."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "%(limit_value)s 이하의 값을 입력해 주세요."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "%(limit_value)s 이상의 값을 입력해 주세요."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"%(limit_value)d글자 이상 입력해 주세요. (입력하신 내용은 %(show_value)d글자입"
"니다.)"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"%(limit_value)d글자 이하로 입력해 주세요. (입력하신 내용은 %(show_value)d글자"
"입니다)"
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "또한"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s의 %(field_label)s(은)는 이미 존재합니다."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "또한"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "%r은 올바른 선택사항이 아닙니다."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "이 필드는 null 값은 사용할 수 없습니다. "
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "이 필드는 null 값은 사용할 수 없습니다. "
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "정수"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "정수 값을 사용하세요."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "True 또는 False 값을 사용하세요."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "boolean(참 또는 거짓)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "문자열(%(max_length)s 글자까지)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "정수(콤마로 구분)"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "날짜(시간 제외)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "날짜는 YYYY-MM-DD 형식으로 입력하세요."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "날짜가 부적절합니다.: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]] 형식으로 입력하세요."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "날짜(시간 포함)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "십진수 실수(decimal) 값을 사용하세요."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "10진수"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "이메일 주소"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "파일 경로"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "부동소수점 실수(float) 값을 사용해 주세요."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "부동소수점 숫자"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "큰 정수 (8 byte)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP 주소"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "None, True 또는 False 값을 사용하세요."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "boolean (참, 거짓 또는 none)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "텍스트"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "시각"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "시각은 HH:MM[:ss[.uuuuuu]] 형식으로 입력하세요."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML 텍스트"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "외래 키 (연관 필드에 의해 형식 결정)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "일대일 관계"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "다대다 관계"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"복수 선택 시에는 \"Control\" 키를 누른 상태에서 선택해 주세요.(Mac은 "
"\"Command\" 키)"
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "필수 항목입니다."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "정수를 입력하세요."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "숫자를 입력하세요."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "전체 자릿수가 %s 개를 넘지 않도록 해주세요."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "전체 유효자리 개수가 %s 개를 넘지 않도록 해주세요."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "소숫점 앞의 자릿수가 %s 개를 넘지 않도록 해주세요."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "올바른 날짜를 입력하세요."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "올바른 시각을 입력하세요."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "올바른 날짜/시각을 입력하세요."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "등록된 파일이 없습니다. 인코딩 형식을 확인하세요."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "파일이 전송되지 않았습니다."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "입력하신 파일은 빈 파일입니다."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -567,11 +627,11 @@ msgstr ""
"파일 이름은 %(max)d 글자 이하로 입력해 주세요. (입력하신 내용은 %(length)d 자"
"입니다)"
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "파일을 보내거나 취소 체크박스를 체크하세요. 또는 둘다 비워두세요."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -579,34 +639,34 @@ msgstr ""
"올바른 이미지를 업로드하세요. 업로드하신 파일은 이미지 파일이 아니거나 파일"
"이 깨져 있습니다."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "리스트를 입력하세요."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "순서:"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "삭제"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s의 중복된 데이터를 고쳐주세요."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "%(field)s의 중복된 데이터를 고쳐주세요. 유일한 값이어야 합니다."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -615,108 +675,115 @@ msgstr ""
"%(field_name)s의 값은 %(date_field)s의 %(lookup)s에 대해 유일해야 합니다. 중"
"복된 데이터를 고쳐주세요."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "아래의 중복된 값들을 고쳐주세요."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "부모 오브젝트의 primary key와 inline foreign key가 맞지 않습니다."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "올바르게 선택해 주세요. 선택하신 것이 선택가능항목에 없습니다."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "올바르게 선택해 주세요. %s (이)가 선택가능항목에 없습니다."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\"은 primary key로 적합하지 않습니다."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "현재"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "변경"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "취소"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "알 수 없습니다."
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "예"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "아니오"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "예,아니오,아마도"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d 바이트"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "오후"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "오전"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "오후"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "오전"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "자정"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "정오"
@@ -992,78 +1059,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "12월"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "또는"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "년"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "개월"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "주"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "일"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "시간"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "분"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "분"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d%(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d%(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "Y년 n월 j일"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "Y년 n월 j일 H:i:s"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y년 n월"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "n월 j일"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1096,12 +1163,12 @@ msgstr "날짜가 없습니다."
msgid "No week specified"
msgstr "주가 없습니다."
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr " %(verbose_name_plural)s를 사용할 수 없습니다."
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1110,7 +1177,7 @@ msgstr ""
"Future 모듈 %(verbose_name_plural)s을 사용할 수 없습니다. %(class_name)s."
"allow_future가 False 입니다."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "날짜 문자열 '%(datestr)s'이 표준 형식 '%(format)s'과 다릅니다."
@@ -1120,16 +1187,16 @@ msgstr "날짜 문자열 '%(datestr)s'이 표준 형식 '%(format)s'과 다릅
msgid "No %(verbose_name)s found matching the query"
msgstr "쿼리 결과에 %(verbose_name)s가 없습니다."
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "'마지막' 페이지가 아니거나, 정수형으로 변환할 수 없습니다."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "잘못된 페이지 (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "빈 리스트이고 '%(class_name)s.allow_empty'가 False입니다."
diff --git a/django/conf/locale/lt/LC_MESSAGES/django.mo b/django/conf/locale/lt/LC_MESSAGES/django.mo
index 2f16b35678..b01186a528 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 336668ae53..aee3674f22 100644
--- a/django/conf/locale/lt/LC_MESSAGES/django.po
+++ b/django/conf/locale/lt/LC_MESSAGES/django.po
@@ -1,579 +1,652 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Kostas <tamosiunas@gmail.com>, 2011.
+# lauris <lauris@runbox.com>, 2011.
+# Povilas Balzaravičius <pavvka@gmail.com>, 2011, 2012.
+# Simonas Simas <simonas@kazlauskas.me>, 2012.
+# Vytautas Astrauskas <vastrauskas@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-05 20:14+0000\n"
-"Last-Translator: lauris <lauris@runbox.com>\n"
-"Language-Team: Lithuanian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-09 11:37+0000\n"
+"Last-Translator: Simonas Simas <simonas@kazlauskas.me>\n"
+"Language-Team: Lithuanian (http://www.transifex.net/projects/p/django/"
+"language/lt/)\n"
+"Language: lt\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"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabų"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbaidžaniečių"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgarų"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalų"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnių"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalonų"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Čekų"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Velso"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danų"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Vokiečių"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Graikų"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Anglų"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Britų Anglų"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Ispanų"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentiniečių Ispanų"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Meksikiečių Ispanų"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nikaragvos Ispanijos"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estų"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskų"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persų"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Suomių"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Prancūzų"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Fryzų"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Airių"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galų"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebrajų"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroatų"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Vengrų"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonecijos"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandų"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italų"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japonų"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Gruzinų"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmerų"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Dravidų"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Korėjiečių"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lietuvių"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Latvių"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonų"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malajalių"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolų"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Olandų"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norvegų"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norvegų Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norvegų Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Pandžabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Lenkų"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Protugalų"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brazilijos Portugalų"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumunų"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Rusų"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovakų"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovėnų"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanų"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbų"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbų Lotynų"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Švedų"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamilų"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugų"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tailando"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turkų"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainiečių"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamiečių"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Supaprastinta kinų"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Tradicinė kinų"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Įveskite tinkamą reikšmę."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL adresas atrodo sugadintas."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Įveskite tinkamą URL adresą."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
-msgstr "Įveskite tinkamą e-mailą."
+msgstr "Įveskite tinkamą el. pašto adresą."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Šią reikšmę gali sudaryti tik raidės, skaičiai, pabraukimo arba paprasto "
"brūkšnio simboliai."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Įveskite validų IPv4 adresą."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Įveskite validų IPv6 adresą."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Įveskite validų IPv4 arba IPv6 adresą."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Įveskite skaitmenis atskirtus kableliais."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Įsitikinkite, kad reikšmę sudaro %(limit_value)s simbolių (dabar yra %"
-"(show_value)s)."
+"Įsitikinkite, kad reikšmę sudaro %(limit_value)s simbolių (dabar yra "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Įsitikinkite, kad reikšmė yra mažesnė arba lygi %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Įsitikinkite, kad reikšmė yra didesnė arba lygi %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Įsitikinkite, kad reikšmę sudaro bent %(limit_value)d simboliai (dabar %"
-"(show_value)d)."
+"Įsitikinkite, kad reikšmę sudaro bent %(limit_value)d simboliai (dabar "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Įsitikinkite, kad reikšmės ilgis mažesnis nei %(limit_value)d simboliai "
"(dabar %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s privalo būti unikalus %(date_field)s %(lookup)s."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "ir"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s su šiuo %(field_label)s jau egzistuoja."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "ir"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Reikšmės %r rinktis negalima."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Šis laukas negali būti null."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Lauką privaloma užpildyti."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Lauko tipas: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Sveikas skaičius"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Ši reikšme turi būti sveikas skaičius."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' reikšmė privalo būti sveikas skaičius."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Ši reikšmė turi būti True arba False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' reikšmė privalo būti True arba False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Loginė reikšmė (True arba False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Eilutė (ilgis iki %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Kableliais atskirti sveikieji skaičiai"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "'%s' reikšmė yra netinkamo formato. Ji turi būti YYYY-MM-DD formatu."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"'%s' reikšmė yra teisingo formato (YYYY-MM-DD), tačiau data yra neteisinga."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Data (be laiko)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Įveskite datą YYYY-MM-DD formatu."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Netinkama data: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' reikšmė yra neteisingo formato. Ji turi būti pateikta YYYY-MM-DD HH:MM[:"
+"ss[.uuuuuu]][TZ] formatu."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Įveskite datą/laiką YYYY-MM-DD HH:MM[:ss[.milisekunes]] formatu."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"'%s' reikšmė yra teisingo formato (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), "
+"tačiau data yra neteisinga."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Data (su laiku)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Ši reikšmė privalo būti dešimtainis skaičius."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' reikšmė turi būti dešimtainis skaičius."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Dešimtainis skaičius"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "El. pašto adresas"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Kelias iki failo"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Ši reikšmė privalo būti realus skaičius."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' reikšmė turi būti slankiojo kablelio skaičius."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Slankaus kablelio skaičius"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Didelis (8 baitų) sveikas skaičius"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 adresas"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP adresas"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Ši reikšmė turi būti None, True arba False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' reikšmė turi būti None, True arba False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Loginė reikšmė (True, False arba None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Teigiamas sveikasis skaičius"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Nedidelis teigiamas sveikasis skaičius"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Unikalus adresas (iki %(max_length)s ženklų)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Nedidelis sveikasis skaičius"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekstas"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' reikšmė yra neteisingo formato. Ji turi būti HH:MM[:ss[.uuuuuu]] "
+"formatu."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' reikšmė yra teisingo formato (HH:MM[:ss[.uuuuuu]]), tačiau tai nėra "
+"teisingas laikas."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Laikas"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Įveskite laiką HH:MM[:ss[.uuuuuu]] formatu."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML tekstas"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Failas"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Paveiksliukas"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modelis %(model)s su pirminiu raktu %(pk)r neegzistuoja."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Išorinis raktas (tipas nustatomas susijusiame lauke)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Sąryšis vienas su vienu"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Sąryšis daug su daug"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Nuspauskite \"Control\", arba \"Command\" Mac kompiuteriuose, kad pasirinkti "
"daugiau nei vieną."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Šis laukas yra privalomas."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Įveskite pilną skaičių."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Įveskite skaičių."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Užtikrinkite, kad visumoje nėra daugiau skaitmenų nei %s."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Užtikrinkite, kad dešimtainių reikšmių nėra daugiau nei %s."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Užtikrinkite, kad skaitmenų prieš keblelį nėra daugiau nei %s."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Įveskite tinkamą datą."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Įveskite tinkamą laiką."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Įveskite tinkamą datą/laiką."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Nebuvo nurodytas failas. Patikrinkite formos koduotę."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Failas nebuvo nurodytas."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Nurodytas failas yra tuščias."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Įsitikinkite, kad reikšmę sudaro daugiausia %(max)d simbolių (dabar %(length)"
-"d)."
+"Įsitikinkite, kad reikšmę sudaro daugiausia %(max)d simbolių (dabar "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Nurodykite failą arba pažymėkite išvalyti. Abu pasirinkimai negalimi."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -581,36 +654,36 @@ msgstr ""
"Atsiųskite tinkamą paveiksliuką. Failas, kurį siuntėte nebuvo paveiksliukas, "
"arba buvo sugadintas."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Nurodykite tinkamą reikšmę. %(value)s nėra galimas pasirinkimas."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Įveskite reikšmių sarašą."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Nurodyti"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Ištrinti"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Pataisykite pasikartojančius duomenis laukui %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Pataisykite pasikartojančius duomenis laukui %(field)s. Duomenys privalo "
"būti unikalūs."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -619,57 +692,66 @@ msgstr ""
"Pataisykite pasikartojančius duomenis laukui %(field_name)s. Duomenys "
"privalo būti unikalūs %(lookup)s peržiūroms per %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Pataisykite žemiau esančias pasikartojančias reikšmes."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Išorinis raktas neatitinka tėvinio objekto pirminio rakto."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Pasirinkite tinkamą reikšmę. Parinkta reikšmė nėra galima."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Pasirinkite tinkamą. %s nėra vienas(-a) iš galimų."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" nėra pirminiam raktui tinkama reikšmė."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"Nepavyko interpretuoti %(datetime)s %(current_timezone)s laiko juostoje; "
+"Data gali turėti keletą reikšmių arba neegzistuoti."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Šiuo metu"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Pakeisti"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Išvalyti"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Nežinomas"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Taip"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "taip,ne,galbūt"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -677,52 +759,52 @@ msgstr[0] "%(size)d baitas"
msgstr[1] "%(size)d baitai"
msgstr[2] "%(size)d baitai"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "vidurnaktis"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "vidurdienis"
@@ -998,90 +1080,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "Gruodis"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "arba"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "metai"
msgstr[1] "metai"
msgstr[2] "metai"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mėnuo"
msgstr[1] "mėnesiai"
msgstr[2] "mėnesiai"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "savaitė"
msgstr[1] "savaitės"
msgstr[2] "savaitės"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "diena"
msgstr[1] "dienos"
msgstr[2] "dienos"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "valanda"
msgstr[1] "valandos"
msgstr[2] "valandos"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutė"
msgstr[1] "minutės"
msgstr[2] "minutės"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutės"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "DATE_FORMAT"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "DATETIME_FORMAT"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Aplankų indeksai čia neleidžiami."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "TIME_FORMAT"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "YEAR_MONTH_FORMAT"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" neegzistuoja"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "MONTH_DAY_FORMAT"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s indeksas"
#: views/generic/create_update.py:121
#, python-format
@@ -1114,12 +1196,12 @@ msgstr "Nenurodyta diena"
msgid "No week specified"
msgstr "Nenurodyta savaitė"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Nėra %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1128,7 +1210,7 @@ msgstr ""
"Ateities %(verbose_name_plural)s nėra prieinami, nes %(class_name)s."
"allow_future yra False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Data '%(datestr)s' neatitinka formato '%(format)s'"
@@ -1138,17 +1220,17 @@ msgstr "Data '%(datestr)s' neatitinka formato '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Atitinkantis užklausą %(verbose_name)s nerastas"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Puslapis nėra 'paskutinis', taip pat negali būti paverstas į sveiką skaičių."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Neegzistuojantis puslapis (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Tuščias sąrašas ir '%(class_name)s.allow_empty' yra False."
diff --git a/django/conf/locale/lv/LC_MESSAGES/django.mo b/django/conf/locale/lv/LC_MESSAGES/django.mo
index 38800b4e7d..8fd784ce84 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 2ce4c9dbf9..22970146c3 100644
--- a/django/conf/locale/lv/LC_MESSAGES/django.po
+++ b/django/conf/locale/lv/LC_MESSAGES/django.po
@@ -1,577 +1,637 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# edgars <edgars.jekabsons@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
"Last-Translator: edgars <edgars.jekabsons@gmail.com>\n"
-"Language-Team: Latvian <None>\n"
+"Language-Team: Latvian (http://www.transifex.net/projects/p/django/language/"
+"lv/)\n"
+"Language: lv\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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "arābu"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "bulgāru"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengāļu"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosniešu"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "katalāņu"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "čehu"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "velsiešu"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "dāņu"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "vācu"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "grieķu"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "angļu"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Lielbritānijas angļu"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "spāņu"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr ""
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "igauņu"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "basku"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persiešu"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "somu"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "franču"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frīzu"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "īru"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galīciešu"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ebreju"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "horvātu"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ungāru"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandiešu"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "itāļu"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japāņu"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "vācu"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "khmeru"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kannādiešu"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "korejiešu"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "lietuviešu"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "latviešu"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "maķedoniešu"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holandiešu"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "norvēģu"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "poļu"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugāļu"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brazīlijas portugāļu"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumāņu"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "krievu"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "slovāku"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "slovēņu"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albāņu"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "serbu"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "serbu latīņu"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "zviedru"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamilu"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "taizemiešu"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turku"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ukraiņu"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vjetnamiešu"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "vienkāršā ķīniešu"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "tradicionālā ķīniešu"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Ievadiet korektu vērtību."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Šī URL adrese šķiet bojāta."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Ievadiet korektu URL adresi."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Ievadiet korektu e-pasta adresi."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Ievadiet korektu IPv4 adresi."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Ievadiet tikai numurus, atdalītus ar komatiem."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Vērtībai jāsatur vismaz %(limit_value)d rakstu zīmes (tā satur %(show_value)"
-"d)."
+"Vērtībai jāsatur vismaz %(limit_value)d rakstu zīmes (tā satur "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Vērtībai jāsatur ne vairāk kā %(limit_value)d rakstu zīmes (tā satur %"
-"(show_value)d)."
+"Vērtībai jāsatur ne vairāk kā %(limit_value)d rakstu zīmes (tā satur "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "un"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "un"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Nederīga izvēle: %r."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Šis lauks nevar neksistēt (būt null)."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Šis lauks nevar būt tukšs"
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Lauks ar tipu: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Vesels skaitlis"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Vērtībai ir jābūt veselam skaitlim."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Vērtībai jābūt True vai False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (True vai False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Simbolu virkne (līdz pat %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Ar komatu atdalīti veselie skaitļi"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Datums (bez laika)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Ievadiet korektu datumu YYYY-MM-DD formātā."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Nekorekts datums: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Ievadiet korektu datumu/laiku YYYY-MM-DD HH:MM[:ss[.uuuuuu]] formātā."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datums (ar laiku)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Vērtībai ir jābūt decimālskaitlim."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Decimāls skaitlis"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Faila ceļš"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Šai vērtībai jābūt decimāldaļskaitlim."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Plūstošā punkta skaitlis"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Liels (8 baitu) vesels skaitlis"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP adrese"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Šai vērtībai jābūt None, True vai False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (jā, nē vai neviens)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Teksts"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Laiks"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Ievadiet korektu laiku HH:MM[:ss[.uuuuuu]] formātā"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML teksts"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Ārējā atslēga (tipu nosaka lauks uz kuru attiecas)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Attiecība viens pret vienu"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Attiecība daudzi pret daudziem"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Lai iezīmētu vairāk par vienu, pieturiet \"Ctrl\" (\"Command\" uz Mac "
"datora) taustiņu."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Šis lauks ir obligāts."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Ievadiet veselu skaitli."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Ievadiet skaitli."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Pārliecinieties, ka kopā nav vairāk par %s cipariem."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Pārliecinieties, ka aiz decimālās zīmes nav vairāk par %s cipariem."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Pārliecinieties, ka pirms decimālās zīmes nav vairāk par %s cipariem."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Ievadiet korektu datumu."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Ievadiet korektu laiku."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Ievadiet korektu datumu/laiku."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Nav nosūtīts fails. Pārbaudiet formas kodējuma tipu."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Netika nosūtīts fails."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Jūsu nosūtītais fails ir tukšs."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Faila nosaukuma garums nedrīkst pārsniegt %(max)d rakstu zīmes (tas satur %"
-"(length)d)."
+"Faila nosaukuma garums nedrīkst pārsniegt %(max)d rakstu zīmes (tas satur "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -579,35 +639,35 @@ msgstr ""
"Augšupielādējiet korektu attēlu. Fails, ko augšupielādējāt, vai nu nav "
"attēls, vai arī ir bojāts."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Ievadiet sarakstu ar vērtībām."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Sakārtojums"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Dzēst"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Lūdzu izlabojiet dublicētos datus priekš %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -616,57 +676,64 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Lūdzu izlabojiet dublicētās vērtības zemāk."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr ""
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Izmainīt"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Nezināms"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Jā"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nē"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "jā,nē,varbūt"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -674,52 +741,52 @@ msgstr[0] "%(size)d baits"
msgstr[1] "%(size)d baiti"
msgstr[2] "%(size)d baitu"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "pusnakts"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "dienasvidus"
@@ -888,27 +955,27 @@ msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr ""
+msgstr "marts"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr ""
+msgstr "aprīlis"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr ""
+msgstr "maijs"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr ""
+msgstr "jūnijs"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr ""
+msgstr "jūlijs"
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -938,147 +1005,147 @@ msgstr ""
#: utils/dates.py:45
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "janvāris"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "februāris"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "marts"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "aprīlis"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "maijs"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "jūnijs"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "jūlijs"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "augusts"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "septembris"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "oktobris"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "novembris"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
+msgstr "decembris"
+
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:136
+#: utils/text.py:234
msgid "or"
msgstr "vai"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ""
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "gads"
msgstr[1] "gadi"
msgstr[2] "gadu"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mēnesis"
msgstr[1] "mēneši"
msgstr[2] "mēnesu"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "nedēļa"
msgstr[1] "nedēļas"
msgstr[2] "nedēļu"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "diena"
msgstr[1] "dienas"
msgstr[2] "dienu"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "stunda"
msgstr[1] "stundas"
msgstr[2] "stundu"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minūte"
msgstr[1] "minūtes"
msgstr[2] "minūšu"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minūtes"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "d.m.Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "d.m.Y H:i:s"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "m.Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "d.m"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1111,19 +1178,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1133,16 +1200,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 a477b9cc8c..87a22cabdc 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 771146f6e3..d5a6b0ffc0 100644
--- a/django/conf/locale/mk/LC_MESSAGES/django.po
+++ b/django/conf/locale/mk/LC_MESSAGES/django.po
@@ -1,580 +1,652 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# <vvangelovski@gmail.com>, 2011, 2012.
+# vvangelovski <vvangelovski@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:09-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-12 11:15+0000\n"
"Last-Translator: vvangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian <>\n"
+"Language-Team: Macedonian (http://www.transifex.net/projects/p/django/"
+"language/mk/)\n"
+"Language: mk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Арапски"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Азербејџански"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Бугарски"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Бенгалски"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Босански"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Каталански"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Чешки"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Велшки"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Дански"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Германски"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Грчки"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Англиски"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Британскиот англиски"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Шпански"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Аргентински Шпански"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr "Мексикански Шпански"
+msgstr "Мексикански шпански"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Никарагва шпански"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Естонски"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Баскиски"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Персиски"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Фински"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Француски"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Фризиски"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Ирски"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Галски"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Еврејски"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Хинди"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Хрватски"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Унгарски"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Индонезиски"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Исландски"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Италијански"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Јапонски"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Грузиски"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Кмер"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Канада"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Корејски"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Литвански"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Латвиски"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Македонски"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Малајалам"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Монголски"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Холандски"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Норвешки"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Норвешка bokmål"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Норвешки Нинорск"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Пунџаби"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Полски"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Португалкски"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Бразилско португалски"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Романски"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Руски"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Словачки"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Словенечки"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Албански"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Српски"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Српски Латиница"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Шведски"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Тамил"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Телугу"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Тајландски"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Турски"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Украински"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Урду"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Виетнамски"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Упростен кинески"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Традиционален кинески"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Внесете правилна вредност."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Оваа веб адреса изгледа дека не е достапна."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Внесете правилна веб адреса."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Внесeте правилна адреса за е-пошта."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Внесете правилно кратко име (slug) кое се соддржи од букви, цифри, долна "
"црта или тире."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Внесeте правилна IPv4 адреса."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Внесете валидна IPv6 адреса."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Внесете валидна IPv4 или IPv6 адреса."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Внесете само цифри одделени со запирки."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Осигурајте се дека оваа вредност е %(limit_value)s (моментално е %"
-"(show_value)s)."
+"Осигурајте се дека оваа вредност е %(limit_value)s (моментално е "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Осигурајте се дека оваа вредност е помала или еднаква со %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Осигурајте се дека оваа вредност е поголема или еднаква со %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Осигурајте се дека оваа вредност има најмалку %(limit_value)d знаци (има %"
-"(show_value)d)."
+"Осигурајте се дека оваа вредност има најмалку %(limit_value)d знаци (има "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Осигурајте се дека оваа вредност има најмногу %(limit_value)d знаци (има %"
-"(show_value)d)."
+"Осигурајте се дека оваа вредност има најмногу %(limit_value)d знаци (има "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "и"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s со %(field_label)s веќе постои."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "и"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Вредноста %r не е валиден избор."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Оваа вредност неможе да биде null."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Ова поле не може да биде празно"
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Цел број"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Оваа вредност мора да биде цел број."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Вредноста '%s' мора да биде цел број."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Оваа вредност мора да биде или точно или неточно."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Вредноста '%s' мора да биде точно или неточно."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Логичка (или точно или неточно)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Збор (до %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Целобројни вредности одделени со запирка"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"Вредноста '%s' има невалиден формат на датум. Таа мора да биде во формат "
+"ГГГГ-ММ-ДД."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Вредноста '%s' има правилен формат (ГГГГ-ММ-ДД), но тоа не е валиден датум."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Датум (без час)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Внесете правилен датум во форматот ГГГГ-ММ-ДД."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Неправилен датум: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Вредноста '%s' има невалиден формат. Таа мора да биде во ГГГГ-ММ-ДД HH:MM[:сс"
+"[uuuuuu].] [ВЗ] формат."
-#: 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]] формат."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"Вредноста '%s' има правилен формат (ГГГГ-ММ-ДД HH:MM [:сс[uuuuuu].] [ВЗ]), "
+"но тоа не е валиден датум / време."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Датум (со час)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Оваа вредност мора да биде децимален број."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Вредноста '%s' мора да биде децимален број."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Децимален број"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Адреса на е-пошта"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Патека на датотека"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Оваа вредност мора да биде број со подвижна запирка."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Вредноста '%s' мора да биде број со подвижна запирка."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Децимален број"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Голем (8 бајти) цел број"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 адреса"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "ИП адреса"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Оваа вредност мора да биде празна, точно или неточно."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Вредноста '%s' мора да биде празна, точно или неточно."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Логичка (точно,неточно или празно)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Позитивен цел број"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Позитивен мал цел број"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Скратено име (до %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Мал цел број"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Текст"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Вредноста '%s' има невалиден формат. Таа мора да биде во HH:MM[:сс[uuuuuu].] "
+"Формат."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Вредноста '%s' има правилен формат (ЧЧ:ММ[:сс[uuuuuu].]), Но тоа не е "
+"валидно време."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Час"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Внесете правилно време во HH:MM[:ss[.uuuuuu]] формат."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML текст"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Датотека"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Слика"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Модел %(model)s со примарен клуч %(pk)r не постои."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Надворешен клуч (типот е одреден според сврзаното поле)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Еден-према-еден релација"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Повеќе-према-повеќе релација"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Држете го „Control“, или „Command“ на Мекинтош, за да изберете повеќе од "
"едно."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Ова поле е задолжително."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Внеси цел број."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Внесете број."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Осигурајте се дека вкупно нема повеќе од %s цифри."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Осигурајте се дека нема повеќе од %s децимални места."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Осигурајте се дека нема повеќе од %s цифри пред децималната запирка."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Внесете правилен датум."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Внесете правилно време."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Внесете правилен датум со време."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Не беше пратена датотека. Проверете го типот на енкодирање на формата."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Не беше пратена датотека."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Пратената датотека е празна."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Или прикачете датотека или оттштиклирајте го полето."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -582,36 +654,36 @@ msgstr ""
"Качете валидна слика. Датотеката која ја качивте или не беше слика или беше "
"расипана датотеката."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Внесете листа на вредности."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Редослед"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Избриши"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ве молам поправете ја дуплираната вредност за %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Ве молам поправете ја дуплираната вредност за %(field)s, која мора да биде "
"уникатна."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -620,111 +692,120 @@ msgstr ""
"Ве молам поправете ја дуплираната вредност за %(field_name)s која мора да "
"биде уникатна за %(lookup)s во %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Ве молам поправете ги дуплираните вредности подолу."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Надворешниот клуч на вгезденото поле не се совпаѓа со примарниот клуч на "
"родителската инстанца."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Изберете правилно. Тоа не е еден од можните избори."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Внесете правилно. %s не е еден од достапните вредности."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" не е правилна вредност за примарен клуч."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s не може да се толкува во временска зона %(current_timezone)s; "
+"можеби е двосмислена или не постои."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Моментално"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Измени"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Исчисти"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Непознато"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Да"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Не"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "да, не, можеби"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d бајт"
msgstr[1] "%(size)d бајти"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "попладне"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "наутро"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "попладне"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "наутро"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "полноќ"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "пладне"
@@ -1000,84 +1081,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Декември"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "или"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "година"
msgstr[1] "години"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "месец"
msgstr[1] "месеци"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "седмица"
msgstr[1] "седмици"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "ден"
msgstr[1] "дена"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "час"
msgstr[1] "часа"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "минута"
msgstr[1] "минути"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "минути"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j M Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j M Y, P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Индекси на директориуми не се дозволени тука."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" не постои"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Индекс на %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1110,12 +1191,12 @@ msgstr "Не е даден ден"
msgid "No week specified"
msgstr "Не е дадена недела"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Нема достапни %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1124,7 +1205,7 @@ msgstr ""
"Идни %(verbose_name_plural)s не се достапни бидејќи %(class_name)s."
"allow_future е False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Невалиден текст за датум '%(datestr)s' даден формат '%(format)s'"
@@ -1134,18 +1215,18 @@ msgstr "Невалиден текст за датум '%(datestr)s' даден
msgid "No %(verbose_name)s found matching the query"
msgstr "Нема %(verbose_name)s што се совпаѓа со пребарувањето"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Страницата не е \"последна\", ниту пак може да се конвертира во еден цел "
"број."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Невалидна страница (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Празна листа и '%(class_name)s .allow_empty' е False."
diff --git a/django/conf/locale/ml/LC_MESSAGES/django.mo b/django/conf/locale/ml/LC_MESSAGES/django.mo
index da90b25493..238b7f46d8 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 97b71b76df..1bdd8db68a 100644
--- a/django/conf/locale/ml/LC_MESSAGES/django.po
+++ b/django/conf/locale/ml/LC_MESSAGES/django.po
@@ -1,560 +1,621 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Jeffy <jeffymj@gmail.com>, 2012.
+# Rajeesh Nair <rajeeshrnair@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: rajeesh <rajeeshrnair@gmail.com>\n"
-"Language-Team: Malayalam <None>\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-10 02:59+0000\n"
+"Last-Translator: Jeffy <jeffymj@gmail.com>\n"
+"Language-Team: Malayalam (http://www.transifex.net/projects/p/django/"
+"language/ml/)\n"
+"Language: ml\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "അറബിക്"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "അസര്‍ബൈജാനി"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "ബള്‍ഗേറിയന്‍"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "ബംഗാളി"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "ബോസ്നിയന്‍"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "കാറ്റലന്‍"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "ചെക്"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "വെല്‍ഷ്"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "ഡാനിഷ്"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "ജര്‍മന്‍"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "ഗ്രീക്ക്"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "ഇംഗ്ളീഷ്"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "ബ്രിട്ടീഷ് ഇംഗ്ളീഷ്"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "സ്പാനിഷ്"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "അര്‍ജന്റീനിയന്‍ സ്പാനിഷ്"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
+msgstr "മെക്സിക്കന്‍ സ്പാനിഷ്"
+
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "എസ്ടോണിയന്‍ സ്പാനിഷ്"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "ബാസ്ക്യു"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "പേര്‍ഷ്യന്‍"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "ഫിന്നിഷ്"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ഫ്രെഞ്ച്"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "ഫ്രിസിയന്‍"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "ഐറിഷ്"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "ഗലിഷ്യന്‍"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ഹീബ്റു"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "ഹിന്ദി"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "ക്രൊയേഷ്യന്‍"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ഹംഗേറിയന്‍"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "ഇന്തൊനേഷ്യന്‍"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "ഐസ്ലാന്‍ഡിക്"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "ഇറ്റാലിയന്‍"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "ജാപ്പനീസ്"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "ജോര്‍ജിയന്‍"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "ഖ്മേര്‍"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "കന്നഡ"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "കൊറിയന്‍"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "ലിത്വാനിയന്‍"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "ലാറ്റ്വിയന്‍"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "മാസിഡോണിയന്‍"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "മലയാളം"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "മംഗോളിയന്‍"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "ഡച്ച്"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "നോര്‍വീജിയന്‍"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "നോര്‍വീജിയന്‍ ബൊക്മാല്‍"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "നോര്‍വീജിയന്‍ നിനോഷ്ക്"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "പഞ്ചാബി"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "പോളിഷ്"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "പോര്‍ചുഗീസ്"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "ബ്റസീലിയന്‍ പോര്‍ചുഗീസ്"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "റൊമാനിയന്‍"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "റഷ്യന്‍"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "സ്ളൊവാക്"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "സ്ളൊവേനിയന്‍"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "അല്‍ബേനിയന്‍"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "സെര്‍ബിയന്‍"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "സെര്‍ബിയന്‍ ലാറ്റിന്‍"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "സ്വീഡിഷ്"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "തമിഴ്"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "തെലുങ്ക്"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "തായ്"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "ടര്‍ക്കിഷ്"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "യുക്രേനിയന്‍"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "ഉര്‍ദു"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "വിയറ്റ്നാമീസ്"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "ലഘു ചൈനീസ്"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "പരമ്പരാഗത ചൈനീസ്"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "ശരിയായ മൂല്യം നല്കണം."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "ഈ URL നിലവില്ലാത്ത വിലാസമാണ് കാണിക്കുന്നത്."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "ശരിയായ URL നല്കണം."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "ശരിയായ ഇ-മെയില്‍ വിലാസം നല്കുക."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "ശരിയായ സ്ളഗ് നല്കുക (അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, അണ്ടര്‍സ്കോര്‍, ഹൈഫന്‍ എന്നിവ മാത്രം ചേര്‍ന്നത്)."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "ശരിയായ IPv4 വിലാസം നല്കണം"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "അക്കങ്ങള്‍ മാത്രം (കോമയിട്ടു വേര്‍തിരിച്ചത്)"
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "ഇത് %(limit_value)s-ഓ അതില്‍ കുറവോ ആവണം"
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "ഇത് %(limit_value)s-ഓ അതില്‍ കൂടുതലോ ആവണം"
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"ഇതിനു ഏറ്റവും കുറഞ്ഞത് %(limit_value)d അക്ഷരങ്ങള്‍ വേണം. (ഇപ്പോള്‍ %(show_value)d "
"അക്ഷരങ്ങളുണ്ട്.)"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"ഇതിനു പരമാവധി %(limit_value)d അക്ഷരങ്ങളേ ഉള്ളൂ എന്നു ഉറപ്പാക്കുക. (ഇപ്പോള്‍ %(show_value)"
-"d അക്ഷരങ്ങളുണ്ട്.)"
+"ഇതിനു പരമാവധി %(limit_value)d അക്ഷരങ്ങളേ ഉള്ളൂ എന്നു ഉറപ്പാക്കുക. (ഇപ്പോള്‍ "
+"%(show_value)d അക്ഷരങ്ങളുണ്ട്.)"
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "ഉം"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(field_label)s-ഓടു കൂടിയ %(model_name)s നിലവിലുണ്ട്."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "ഉം"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "%r അനുയോജ്യമല്ല."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "ഈ കളം (ഫീല്‍ഡ്) ഒഴിച്ചിടരുത്."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "ഈ കളം (ഫീല്‍ഡ്) ഒഴിച്ചിടരുത്."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "പൂര്‍ണ്ണസംഖ്യ"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "പൂര്‍ണ്ണസംഖ്യ മാത്രം"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "ശരിയോ തെറ്റോ എന്നു മാത്രം"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "ശരിയോ തെറ്റോ (True അഥവാ False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "സ്ട്രിങ്ങ് (%(max_length)s വരെ നീളമുള്ളത്)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "കോമയിട്ട് വേര്‍തിരിച്ച സംഖ്യകള്‍"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "തീയതി (സമയം വേണ്ട)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "ശരിയായ തീയതി YYYY-MM-DD എന്ന മാത്രുകയില്‍ നല്കണം."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "തെറ്റായ തീയതി: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]]എന്ന മാത്രുകയില്‍ നല്കണം."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "തീയതി (സമയത്തോടൊപ്പം)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "ഈ വില ദശാംശമാവണം."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "ദശാംശസംഖ്യ"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "ഇ-മെയില്‍ വിലാസം"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "ഫയല്‍ സ്ഥാനം"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "ഈ വില ദശാംശമാവണം."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "ദശാംശസംഖ്യ"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "8 ബൈറ്റ് പൂര്‍ണസംഖ്യ."
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP വിലാസം"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "ഈ മൂല്യം None, True, False എന്നിവയില്‍ ഏതെങ്കിലും ഒന്നാവണം"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "ശരിയോ തെറ്റോ എന്നു മാത്രം (True, False, None എന്നിവയില്‍ ഏതെങ്കിലും ഒന്ന്)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "ടെക്സ്റ്റ്"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "സമയം"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "ശരിയായ സമയം HH:MM[:ss[.uuuuuu]] എന്ന മാത്രുകയില്‍ നല്കണം."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL(വെബ്-വിലാസം)"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML ടെക്സ്റ്റ്"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "%(pk)r എന്ന pk ഉള്ള %(model)s എന്ന മോഡല്‍ നിലവിലില്ല."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "ഫോറിന്‍ കീ (ടൈപ്പ് ബന്ധപ്പെട്ട ഫീല്‍ഡില്‍ നിന്നും നിര്‍ണ്ണയിക്കുന്നതാണ്)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "വണ്‍-ടു-വണ്‍ ബന്ധം"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "മെനി-ടു-മെനി ബന്ധം"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "\"Control\" എന്ന കീ അമര്‍ത്തിപ്പിടിക്കുക. (Macലാണെങ്കില്‍ \"Command\")."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "ഈ കള്ളി(ഫീല്‍ഡ്) നിര്‍ബന്ധമാണ്."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "ഒരു പൂര്‍ണസംഖ്യ നല്കുക."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "ഒരു സംഖ്യ നല്കുക."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "മൊത്തം %s ലേറെ അക്കങ്ങള്‍ ഇല്ലെന്ന് ഉറപ്പു വരുത്തുക."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "%s ലേറെ ദശാംശസ്ഥാനങ്ങള്‍ ഇല്ലെന്ന് ഉറപ്പു വരുത്തുക."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "ദശാംശബിന്ദുവിനു മുമ്പ് %sലേറെ അക്കങ്ങള്‍ ഇല്ലെന്നു ഉറപ്പു വരുത്തുക."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "ശരിയായ തീയതി നല്കുക."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "ശരിയായ സമയം നല്കുക."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "ശരിയായ തീയതിയും സമയവും നല്കുക."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "ഫയലൊന്നും ലഭിച്ചിട്ടില്ല. ഫോമിലെ എന്‍-കോഡിംഗ് പരിശോധിക്കുക."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "ഫയലൊന്നും ലഭിച്ചിട്ടില്ല."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "ലഭിച്ച ഫയല്‍ ശൂന്യമാണ്."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -562,13 +623,13 @@ msgstr ""
"ഈ ഫയലിന്റെ പേര് പരമാവധി %(max)d അക്ഷരങ്ങളുള്ളതായിരിക്കണം. (ഇപ്പോള്‍ %(length)d അക്ഷരങ്ങള്‍ "
"ഉണ്ട്)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"ഒന്നുകില്‍ ഫയല്‍ സമര്‍പ്പിക്കണം, അല്ലെങ്കില്‍ ക്ളിയര്‍ എന്ന ചെക്ബോക്സ് ടിക് ചെയ്യണം. ദയവായി രണ്ടും "
"കൂടി ചെയ്യരുത്."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -576,34 +637,34 @@ msgstr ""
"ശരിയായ ചിത്രം അപ് ലോഡ് ചെയ്യുക. നിങ്ങള്‍ നല്കിയ ഫയല്‍ ഒന്നുകില്‍ ഒരു ചിത്രമല്ല, അല്ലെങ്കില്‍ "
"വികലമാണ്."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "മൂല്യങ്ങളുടെ പട്ടിക(ലിസ്റ്റ്) നല്കുക."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "ക്രമം"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "ഡിലീറ്റ്"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s-നായി നല്കുന്ന വിവരം ആവര്‍ത്തിച്ചത് ദയവായി തിരുത്തുക."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "%(field)s-നായി നല്കുന്ന വിവരം ആവര്‍ത്തിക്കാന്‍ പാടില്ല. ദയവായി തിരുത്തുക."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -612,109 +673,116 @@ msgstr ""
"%(date_field)s ലെ %(lookup)s നു വേണ്ടി %(field_name)s നു നല്കുന്ന വിവരം ആവര്‍ത്തിക്കാന്‍ "
"പാടില്ല. ദയവായി തിരുത്തുക."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "താഴെ കൊടുത്തവയില്‍ ആവര്‍ത്തനം ഒഴിവാക്കുക."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "ഇന്‍ലൈനായി നല്കിയ ഫോറിന്‍ കീ മാത്രു വസ്തുവിന്റെ പ്രാഥമിക കീയുമായി യോജിക്കുന്നില്ല."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "യോഗ്യമായത് തെരഞ്ഞെടുക്കുക. നിങ്ങള്‍ നല്കിയത് ലഭ്യമായവയില്‍ ഉള്‍പ്പെടുന്നില്ല."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "യോഗ്യമായത് തെരഞ്ഞെടുക്കുക. %s തന്നിരിക്കുന്നവയില്‍ ഉള്‍പ്പെടുന്നില്ല."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" പ്രാഥമിക കീ ആവാന്‍ അനുയോജ്യമായ മൂല്യമല്ല."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "നിലവിലുള്ളത്"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "മാറ്റുക"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "കാലിയാക്കുക"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "അജ്ഞാതം"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "അതെ"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "അല്ല"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ഉണ്ട്, ഇല്ല, ഉണ്ടായേക്കാം"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ബൈറ്റ്"
msgstr[1] "%(size)d ബൈറ്റുകള്‍"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s കെ.ബി"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s എം.ബി"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s ജി.ബി"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s ടി.ബി"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s പി.ബി"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "പി. എം (ഉച്ചയ്ക്കു ശേഷം) "
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "എ. എം (ഉച്ചയ്ക്കു മുമ്പ്)"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "പി. എം (ഉച്ചയ്ക്കു ശേഷം) "
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "എ. എം (ഉച്ചയ്ക്കു മുമ്പ്)"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "അര്‍ധരാത്രി"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "ഉച്ച"
@@ -990,84 +1058,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "ഡിസംബര്‍"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "അഥവാ"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "വര്‍ഷം"
msgstr[1] "വര്‍ഷങ്ങള്‍"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "മാസം"
msgstr[1] "മാസങ്ങള്‍"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "ആഴ്ച്ച"
msgstr[1] "ആഴ്ച്ചകള്‍"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "ദിവസം"
msgstr[1] "ദിവസങ്ങള്‍"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "മണിക്കൂര്‍"
msgstr[1] "മണിക്കൂറുകള്‍"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "മിനുട്ട്"
msgstr[1] "മിനുട്ടുകള്‍"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "മിനുട്ടുകള്‍"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "തീയതിയുടെ മാത്രുക"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "തീയതിയും സമയവും ചേര്‍ന്ന മാത്രുക"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "സമയത്തിന്റെ മാത്രുക"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "വര്‍ഷം-മാസം എന്ന മാത്രുക"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "മാസം-ദിവസം എന്ന മാത്രുക"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1086,33 +1154,33 @@ msgstr "%(verbose_name)s ഡിലീറ്റ് ചെയ്യപ്പെട
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr ""
+msgstr "വര്‍ഷം പരാമര്‍ശിച്ചിട്ടില്ല"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "മാസം പരാമര്‍ശിച്ചിട്ടില്ല"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "ദിവസം പരാമര്‍ശിച്ചിട്ടില്ല"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "ആഴ്ച പരാമര്‍ശിച്ചിട്ടില്ല"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "%(verbose_name_plural)s ഒന്നും ലഭ്യമല്ല"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1120,18 +1188,18 @@ msgstr ""
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "ചോദ്യത്തിനു ചേരുന്ന് %(verbose_name)s ഇല്ല"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgstr "താള് (%(page_number)s) അസാധുവാണ്"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 1221ad15c6..7f33e6dcf6 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 692aea629e..5ce8c924be 100644
--- a/django/conf/locale/mn/LC_MESSAGES/django.po
+++ b/django/conf/locale/mn/LC_MESSAGES/django.po
@@ -1,565 +1,640 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jacara <baskhuujacara@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# jargalan <jargalanch@gmail.com>, 2011.
+# Tsolmon <mnts26@gmail.com>, 2011.
+# Анхбаяр Анхаа <l.ankhbayar@gmail.com>, 2011, 2012.
+# Баясгалан Цэвлээ <bayasaa_7672@yahoo.com>, 2011.
+# Ганзориг БП <ganzo.bp@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-10 03:30+0000\n"
-"Last-Translator: Ankhbayar <l.ankhbayar@gmail.com>\n"
-"Language-Team: Mongolian <>\n"
+"POT-Creation-Date: 2012-03-14 00:08-0700\n"
+"PO-Revision-Date: 2012-03-08 16:12+0000\n"
+"Last-Translator: Анхбаяр Анхаа <l.ankhbayar@gmail.com>\n"
+"Language-Team: Mongolian (http://www.transifex.net/projects/p/django/"
+"language/mn/)\n"
+"Language: mn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: mn\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Араб"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Азербажан"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Болгар"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Бенгал"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Босни"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Каталан"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Чех"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Уэльс"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Дани"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Герман"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Грек"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Англи"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Британи Англи"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Испани"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Аргентинийн Испани"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Мексикийн Испани"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Никрагуан Испани"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Эстони"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Баск"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Перс"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Финлянд"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Франц"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Фриз"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Ирланд"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Галици"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Еврэй"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Хинди"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Хорват"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Унгар"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Индонези"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Исланд"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Итали"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Япон"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Гүрж"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Кхмер"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Канад"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Солонгос"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Литва"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Латви"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Македон"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Малайз"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Монгол"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Голланд"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Норвеги"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Норвеги бокмал"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Норвегийн нюнорск"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Панжаби"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Польш"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Португал"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Бразилийн Португали"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Румын"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Орос"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Словак"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Словен"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Альбани"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Серби"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Серби латин"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Щвед"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Тамил"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Тэлүгү"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Тайланд"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Турк"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Украйн"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Урду"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Вьетнам"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Хятад (хялбаршуулсан) "
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Хятад (уламжлалт)"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Зөв утга оруулна уу."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Энэ URL холбоос хүчингүй эсвэл буруу байна."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Зөв, хүчинтэй хаяг (URL) оруулна уу."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Зөв мэйл хаяг оруулна уу"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Үсэг, тоо, доогуур зураас, дундуур зурааснаас бүрдэх зөв 'slug' оруулна уу."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Зөв IPv4 хаяг оруулна уу. "
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Зөв IPv6 хаяг оруулна уу."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Зөв IPv4 эсвэл IPv6 хаяг оруулна уу."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Зөвхөн таслалаар тусгаарлагдсан цифр оруулна уу."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Энэ утга %(limit_value)s -с бага эсвэл тэнцүү байх ёстой."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Энэ утга %(limit_value)s -с их эсвэл тэнцүү байх нөхцлийг хангана уу."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Энэ утгын тэмдэгтийн тоо %(limit_value)d -с бага байх ёстой. (одоо %"
-"(show_value)d байна)"
+"Энэ утгын тэмдэгтийн тоо %(limit_value)d -с бага байх ёстой. (одоо "
+"%(show_value)d байна)"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Энэ утгын тэмдэгтийн тоо %(limit_value)d -с их байх ёстой. (одоо %"
-"(show_value)d байна)"
+"Энэ утгын тэмдэгтийн тоо %(limit_value)d -с их байх ёстой. (одоо "
+"%(show_value)d байна)"
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "ба"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(field_label)s-тэй %(model_name)s-ийг аль хэдийнэ оруулсан байна."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "ба"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Энэ утга %r буруу сонголт байна."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Энэ хэсгийг хоосон орхиж болохгүй."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Энэ хэсэг хоосон байж болохгүй."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Бүхэл тоо"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Энэ бүхэл тоон утга байх ёстой."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' талбарт заавал бүхэн тоон утга оруулна."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Энэ True, False-ийн аль нэг нь байх ёстой. "
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' талбарт заавал True эсвэл False ийн аль нэг нь байна."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (Үнэн худлын аль нэг нь)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Бичвэр (%(max_length)s хүртэл)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Таслалаар тусгаарлагдсан бүхэл тоо"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "'%s' утга буруу форматтай байна. Формат нь YYYY-MM-DD байх хэрэгтэй."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"'%s' утга зөв форматтай байна. Гэвч огнооны хэсэгийн формат буруу байна. "
+"Формат нь (YYYY-MM-DD) байх хэрэгтэй."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Огноо (цаггүй)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Огноогоо YYYY-MM-DD гэсэн хэлбэрээр оруулна уу."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Буруу огноо: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' утга буруу форматтай байна. Формат нь заавал YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] байх хэрэгтэй."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Огноо/цагаа ЖЖЖЖ-СС-ӨӨ ЦЦ:ММ[:сс[.uuuuuu]] гэсэн хэлбэрээр оруулна уу."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"'%s' утга зөв форматтай байна(YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) гэвч буруу "
+"огноо/цаг байна. "
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Огноо (цагтай)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Энэ бутархай тоо байх ёстой."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' заавал decimal утга байх."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Аравтын бутархайт тоо"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Цахим шуудангийн хаяг"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Файлын зам "
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Энэ хэсэгт бутархай тоо оруулна"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' заавал float утга байх."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Хөвөгч таслалтай тоо"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Том (8 байт) бүхэл тоо"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 хаяг"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP хаяг"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Энэ утга None, True, False-ийн аль нэг байх ёстой."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' заавал None, True эсвэл False утга авах."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Үнэн, худал, эсвэл юу ч биш)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Бүхэл тоох утга"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Бага бүхэл тоон утга"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Слаг (ихдээ %(max_length)s )"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Бага тоон утна"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Текст"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' утга буруу форматтай байна. Формат нь заавал HH:MM[:ss[.uuuuuu]] байх "
+"хэрэгтэй."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' утгын формат нь зөв байна гэвч цагийн формат нь буруу байна. Цагийн "
+"формат заавал (HH:MM[:ss[.uuuuuu]]) байна."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Цаг"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Цагийг HH:MM[:ss[.uuuuuu]] гэсэн хэлбэрээр оруулна уу. "
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML текст"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Файл"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Зураг"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr " pk %(pk)r-тай %(model)s модель байхгүй байна."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Гадаад түлхүүр (тодорхой төрлийн холбоос талбар)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Нэг-нэг холбоос"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Олон-олон холбоос"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Олон утга сонгохын тулд \"Control\" (Mac дээр \"Command\") товчыг ашиглана."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Энэ талбарыг бөглөх шаардлагатай."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Бүхэл тоон утга оруулна уу."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Тоон утга оруулна уу."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Энд нийтдээ %s -аас олонгүй цифр байх ёстой."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Энд %s -аас олонгүй бутархайн орон байх ёстой. "
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Энд бутархайн таслалаас өмнө %s-аас олонгүй цифр байх ёстой."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Зөв огноо оруулна уу."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Зөв цаг оруулна уу."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Огноо/цаг-ыг зөв оруулна уу."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Файл оруулаагүй байна. Маягтаас кодлох төрлийг чагтал. "
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Файл оруулаагүй байна."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Оруулсан файл хоосон байна. "
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -567,13 +642,13 @@ msgstr ""
"Энэ файлын нэрний урт %(length)d байна. Файлын нэр хамгийн ихдээ %(max)d "
"тэмдэгтээс бүрдэх нөхцлийг хангана уу."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Нэг бол сонголтын чягтыг авах эсвэл файл оруулна уу. Зэрэг хэрэгжих "
"боломжгүй."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -581,148 +656,157 @@ msgstr ""
"Зөв зураг оруулна уу. Таны оруулсан файл нэг бол зургийн файл биш эсвэл "
"гэмтсэн зураг байна."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Өгөгдхүүний жагсаалтаа оруулна уу."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Эрэмбэлэх"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Устгах"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s хэсэг дэх давхардсан утгыг засварлана уу. "
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"%(field)s хэсэг дэх давхардсан утгыг засварлана уу. Түүний утгууд "
"давхардахгүй байх ёстой."
-#: forms/models.py:566
+#: forms/models.py:581
#, 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 хувьд давхардахгүй байх ёстой."
+"%(field_name)s хэсэг дэх давхардсан утгыг засварлана уу. %(date_field)s-н "
+"%(lookup)s хувьд давхардахгүй байх ёстой."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Доорх давхардсан утгуудыг засна уу."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Inline обектийн гадаад түлхүүр Эцэг обектийн түлхүүртэй таарахгүй байна. "
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Зөв сонголт хийнэ үү. Энэ утга сонголтонд алга."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Зөв сонголт хийгээрэй. %s гэсэн сонголт байхгүй байна."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" нь primary key талбарт тохирохгүй утга байна."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s цагийн бүсийг хөрвүүлэж чадахгүй байна. %(current_timezone)s; "
+"цагийн бүс буруу эсвэл байхгүй байж магадгүй."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Одоогийн"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Засах"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Цэвэрлэх"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Тодорхойгүй"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Тийм"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Үгүй"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "тийм,үгүй,магадгүй"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d байт"
msgstr[1] "%(size)d байт"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "шөнө дунд"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "үд дунд"
@@ -998,84 +1082,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Гахай"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "буюу"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "жил "
msgstr[1] "жил"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "сар"
msgstr[1] "сар"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "долоо хоног"
msgstr[1] "долоо хоног"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "өдөр"
msgstr[1] "өдөр"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "цаг"
msgstr[1] "цаг"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "минут"
msgstr[1] "минут"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "минут"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "Y-m-d"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "Y-m-d, H:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Файлын жагсаалтыг энд зөвшөөрөөгүй."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "TIME_FORMAT"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y F"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" байхгүй байна."
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s ийн жагсаалт"
#: views/generic/create_update.py:121
#, python-format
@@ -1108,12 +1192,12 @@ msgstr "Өдөр тодорхойлоогүй байна"
msgid "No week specified"
msgstr "Долоо хоног тодорхойлоогүй байна"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s боломжгүй"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1122,7 +1206,7 @@ msgstr ""
"%(class_name)s.allow_future нь худлаа учраас %(verbose_name_plural)s нь "
"боломжгүй."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1133,16 +1217,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr "Шүүлтүүрт таарах %(verbose_name)s олдсонгүй "
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Хуудас нь 'last' биш, эсвэл тоонд хөрвүүлэж болохгүй байна."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "(%(page_number)s)-р хуудас байхгүй"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 8e4a4b946e..8f5c1b18c7 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 c312384bc3..7a1f0a22dc 100644
--- a/django/conf/locale/nb/LC_MESSAGES/django.po
+++ b/django/conf/locale/nb/LC_MESSAGES/django.po
@@ -1,569 +1,642 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# <jonklo@gmail.com>, 2012.
+# jonklo <jonklo@gmail.com>, 2011.
+# <sigurdga-transifex@sigurdga.no>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: jonklo <jonklo@gmail.com>\n"
-"Language-Team: Norwegian Bokmål <>\n"
+"POT-Creation-Date: 2012-03-14 00:09-0700\n"
+"PO-Revision-Date: 2012-03-12 14:49+0000\n"
+"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
+"Language-Team: Norwegian Bokmål (http://www.transifex.net/projects/p/django/"
+"language/nb/)\n"
+"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabisk"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Aserbajdsjansk"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgarsk"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalsk"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnisk"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalansk"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tsjekkisk"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Walisisk"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Dansk"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Tysk"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Gresk"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Engelsk"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Engelsk (britisk)"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spansk"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentinsk spansk"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Meksikansk spansk"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nicaraguansk spansk"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estisk"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskisk"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persisk"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finsk"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisisk"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irsk"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galisisk"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebraisk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroatisk"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Ungarsk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonesisk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japansk"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgisk"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreansk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litauisk"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Latvisk"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonsk"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolsk"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Nederlandsk"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norsk (bokmål)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norsk (nynorsk)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Panjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polsk"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugisisk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brasiliansk portugisisk"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumensk"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovensk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albansk"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbisk latin"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Tyrkisk"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamesisk"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Forenklet kinesisk"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Tradisjonell kinesisk"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Oppgi en gyldig verdi."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Nettadressen fører til en side som ikke eksisterer."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Oppgi en gyldig nettadresse."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Oppgi en gyldig e-postadresse."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Oppgi en gyldig 'slug' bestående av bokstaver, nummer, understreker eller "
+"Oppgi en gyldig «slug» bestående av bokstaver, nummer, understreker eller "
"bindestreker."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Oppgi en gyldig IPv4-adresse."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Oppgi en gyldig IPv6-adresse."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Oppgi en gyldig IPv4- eller IPv6-adresse."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Oppgi kun tall adskilt med komma."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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."
+msgstr "Verdien må være mindre enn eller lik %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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."
+msgstr "Verdien må være større enn eller lik %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "og"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "og"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Verdien %r er ikke et gyldig valg."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Feltet kan ikke være tomt."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Feltet kan ikke være blankt."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Felt av typen: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Heltall"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Verdien må være et heltall."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "«%s»-verdien må være et heltall."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Verdien må være True eller False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "«%s»-verdien må være enten True eller False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolsk (True eller False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Tekst (opp til %(max_length)s tegn)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Heltall adskilt med komma"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"«%s»-verdien har et ugyldig datoformat. Det må være på formen YYYY-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"«%s»-verdien er på den korrekte formen (YYYY-MM-DD), men det er en ugyldig "
+"dato."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Dato (uten tid)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Oppgi en gyldig dato på formen ÅÅÅÅ-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Ugyldig dato: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"«%s»-verdien har et ugyldig datoformat. Det må være på formen YYYY-MM-DD HH:"
+"MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Oppgi dato og tid på formen ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"«%s»-verdien er på den korrekte formen (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), "
+"men er ugyldig dato/tid."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Dato (med tid)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Verdien må være et desimaltall."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "«%s»-verdien må være et desimaltall."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Desimaltall"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "E-postadresse"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Filsti"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Verdien må være et flyttall."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "«%s»-verdien må være et flyttall."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Flyttall"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Stort (8 byte) heltall"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4-adresse"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP-adresse"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Verdien må være None, True eller False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "«%s»-verdien må være enten None, True eller False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolsk (True, False eller None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Positivt heltall"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Positivt lite heltall"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (opp til %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Lite heltall"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"«%s»-verdien har et ugyldig format. Det må være på formen HH:MM[:ss[."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"«%s»-verdien er på den korrekte formen (HH:MM[:ss[.uuuuuu]]), men det er en "
+"ugyldig dato."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Tid"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Oppgi tiden på formen TT:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "Nettadresse"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML-tekst"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Fil"
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Bilde"
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Fremmednøkkel (type bestemmes av relatert felt)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "En-til-en-relasjon"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Mange-til-mange-relasjon"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-"Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mer enn en."
+"Hold nede «Control», eller «Command» på en Mac, for å velge mer enn en."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Feltet er påkrevet."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Oppgi et heltall."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Oppgi et tall."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Verdien kan ikke ha mer enn %s siffer totalt."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Verdien kan ikke ha mer enn %s desimaler."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Verdien kan ikke ha mer enn %s siffer foran komma."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Oppgi en gyldig dato."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Oppgi et gyldig tidspunkt."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Oppgi gyldig dato og tidspunkt."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Ingen fil ble sendt. Sjekk \"encoding\"-typen på skjemaet."
+msgstr "Ingen fil ble sendt. Sjekk «encoding»-typen på skjemaet."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Ingen fil ble sendt."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Filen er tom."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr "Filnavnet kan maksimalt ha %(max)d tegn (det har %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Vennligst last opp en ny fil eller marker fjern-boksen, ikke begge."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -571,145 +644,154 @@ msgstr ""
"Last opp et gyldig bilde. Filen du lastet opp var ødelagt eller ikke et "
"bilde."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Oppgi en liste med verdier."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Rekkefølge"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Slett"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Vennligst korriger duplisert data for %(field)s."
+msgstr "Vennligst korriger dupliserte data for %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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."
+msgstr "Vennligst korriger dupliserte data for %(field)s, som må være unike."
-#: forms/models.py:566
+#: forms/models.py:581
#, 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 ""
-"Vennligst korriger duplisert data for %(field_name)s, som må være unik for %"
-"(lookup)s i %(date_field)s."
+"Vennligst korriger dupliserte data for %(field_name)s, som må være unike for "
+"%(lookup)s i %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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."
+msgstr "Velg et gyldig valg. Valget er ikke av de tilgjengelige valgene."
-#: forms/models.py:986
+#: forms/models.py:1000
#, 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."
+msgstr "Velg et gyldig valg. %s er ikke av de tilgjengelige valgene."
-#: forms/models.py:988
+#: forms/models.py:1002
#, 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."
+msgstr "«%s» er ikke en gyldig verdi for en primærnøkkel."
+
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s kunne ikke tolkes i tidssonen %(current_timezone)s, det kan "
+"være tvetydig eller ikke eksistere."
-#: forms/widgets.py:299
+#: forms/widgets.py:325
msgid "Currently"
-msgstr "Nå"
+msgstr "Nåværende"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Endre"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Fjern"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Ukjent"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nei"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ja,nei,kanskje"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
-msgstr[1] "%(size)d bytes"
+msgstr[1] "%(size)d byte"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "midnatt"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "12:00"
@@ -747,7 +829,7 @@ msgstr "man"
#: utils/dates.py:10
msgid "Tue"
-msgstr "tirs"
+msgstr "tir"
#: utils/dates.py:10
msgid "Wed"
@@ -755,7 +837,7 @@ msgstr "ons"
#: utils/dates.py:10
msgid "Thu"
-msgstr "tors"
+msgstr "tor"
#: utils/dates.py:10
msgid "Fri"
@@ -771,7 +853,7 @@ msgstr "søn"
#: utils/dates.py:18
msgid "January"
-msgstr "Januar"
+msgstr "januar"
#: utils/dates.py:18
msgid "February"
@@ -985,84 +1067,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Desember"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s…"
+
+#: utils/text.py:234
msgid "or"
msgstr "eller"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "år"
msgstr[1] "år"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "måned"
msgstr[1] "måneder"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "uke"
msgstr[1] "uker"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dag"
msgstr[1] "dager"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "time"
msgstr[1] "timer"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutt"
msgstr[1] "minutter"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutter"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. F Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. F Y H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Mappeinnhold er ikke tillatt her."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "«%(path)s» finnes ikke"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Innhold i %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1095,12 +1177,12 @@ msgstr "Dag ikke spesifisert"
msgid "No week specified"
msgstr "Uke ikke spesifisert"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Ingen %(verbose_name_plural)s tilgjengelig"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1109,26 +1191,26 @@ msgstr ""
"Fremtidig %(verbose_name_plural)s ikke tilgjengelig fordi %(class_name)s."
"allow_future er False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr "Ugyldig datostreng '%(datestr)s' gitt formatet '%(format)s'"
+msgstr "Ugyldig datostreng «%(datestr)s» gitt formatet «%(format)s»"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr "Fant ingen %(verbose_name)s fra spørringen"
+msgstr "Fant ingen %(verbose_name)s som passet spørringen"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr "Siden er ikke 'last', og kan heller ikke konverteres til et tall."
+msgstr "Siden er ikke «last», og kan heller ikke konverteres til et tall."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Ugyldig side (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "Tom liste og '%(class_name)s.allow_empty' er False."
+msgstr "Tom liste og «%(class_name)s.allow_empty» er False."
diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo
index 3f3d07e068..b7a97b8600 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 7764178398..f0cb6b14b5 100644
--- a/django/conf/locale/nl/LC_MESSAGES/django.po
+++ b/django/conf/locale/nl/LC_MESSAGES/django.po
@@ -1,580 +1,655 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Bas Peschier <bas.peschier@gmail.com>, 2011.
+# Blue <alexandervanratingen@gmail.com>, 2011.
+# Harro van der Klauw <hvdklauw@gmail.com>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Jeffrey Gelens <jeffrey@noppo.pro>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: hvdklauw <hvdklauw@gmail.com>\n"
-"Language-Team: Dutch <>\n"
+"POT-Creation-Date: 2012-03-14 00:09-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Harro van der Klauw <hvdklauw@gmail.com>\n"
+"Language-Team: Dutch (http://www.transifex.net/projects/p/django/language/"
+"nl/)\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabisch"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbaijani"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgaars"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengaals"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnisch"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalaans"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tjechisch"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Welsh"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Deens"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Duits"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Grieks"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Engels"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Brits-Engels"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spaans"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentijns-Spaans"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Mexicaans Spaans"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nicaraguaans Spaans"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Ests"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskisch"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Perzisch"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Fins"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Frans"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Fries"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Iers"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galicisch"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebreews"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroatisch"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Hongaars"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonesisch"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "IJslands"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiaans"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japans"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgisch"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreaans"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litouws"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Lets"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Macedonisch"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolisch"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Nederlands"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Noors"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Noorse Bokmål"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Noorse Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Pools"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugees"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Braziliaans Portugees"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Roemeens"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Russisch"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovaaks"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Sloveens"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanisch"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Servisch"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Servisch Latijn"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Zweeds"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telegu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thais"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turks"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Oekraïens"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamees"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Vereenvoudigd Chinees"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Traditioneel Chinees"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Geef een geldige waarde."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Deze URL lijkt niet te werken."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Geef een geldige URL op."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Geef een geldig e-mailadres op."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Geef een geldig IPv4-adres op."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Voer een geldig IPv6-adres in."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Voer een geldig IPv4 of IPv6-adres in."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Geef alleen cijfers op, gescheiden door komma's."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Zorg ervoor dat deze waarde gelijk is aan %(limit_value)s (het is nu %"
-"(show_value)s)."
+"Zorg ervoor dat deze waarde gelijk is aan %(limit_value)s (het is nu "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Zorg ervoor dat deze waarde hoogstens %(limit_value)s is."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Zorg ervoor dat deze waarde minstens %(limit_value)s is."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Zorg ervoor dat deze waarde minstens %(limit_value)d karakters bevat (hij "
"heeft er %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Zorg ervoor dat deze waarde hoogstens %(limit_value)d karakters bevat (hij "
"heeft er %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "en"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "en"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Waarde %r is geen geldige keuze."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Dit veld mag niet leeg zijn."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Dit veld kan niet leeg zijn"
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Geheel getal"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "De waarde moet een geheel getal zijn."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' waarde moet een geheel getal zijn."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "De waarde moet of True (Waar) of False (Onwaar) zijn."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' waarde moet True of False zijn."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (True danwel False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Karakterreeks (hooguit %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Komma-gescheiden gehele getallen"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"'%s' waarde heeft een ongeldig datum formaat. Het juiste formaat is YYYY-MM-"
+"DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"'%s' waarde heeft een correct formaat (YYYY-MM-DD), maar is echter geen "
+"geldige datum."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Datum (zonder tijd)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Geef een geldige datum in JJJJ-MM-DD formaat."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Ongeldige datum: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' waarde heeft een ongeldig formaat. Het juiste formaat is YYYY-MM-DD HH:"
+"MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Geef geldige datum/tijd in JJJJ-MM-DD UU:MM[:ss[.uuuuuu]] formaat."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"'%s' waarde heeft een geldig formaat (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), "
+"maar is een ongeldige datum/tijd."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datum (met tijd)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "De waarde moet een decimaal getal zijn."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' waarde moet een decimaal getal zijn."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Decimaal getal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "E-mailadres"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Bestandspad"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "De waarde moet een kommagetal zijn."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' waarde moet een float zijn."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Decimaal getal"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Groot (8 byte) geheel getal"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 address"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP-adres"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "De waarde moet of None (leeg), True (Waar) of False (Onwaar) zijn."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' waarde moet None, True of False zijn."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (True, False of None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Positief geheel getal"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Postitief klein geheel getal"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (max. lengte %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Klein geheel getal"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' waarde heeft een ongeldig formaat. Het juiste formaat is HH:MM[:ss[."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' waarde heeft het juiste formaat (HH:MM[:ss[.uuuuuu]]), maar is een "
+"ongeldige tijd."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Tijd"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Geef een geldige tijd in UU:MM[:ss[.uuuuuu]] formaat."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML-tekst"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Bestand"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Plaatje"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s met pk %(pk)r bestaat niet."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Refererende sleutel (type wordt bepaalde door gerelateerde veld)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Één-op-één relatie"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Veel-op-veel relatie"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Houd \"Control\", of \"Command\" op een Mac, ingedrukt om meerdere te "
"selecteren."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Dit veld is verplicht."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Geef een geheel getal op."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Geef een getal op."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Zorg dat er minder dan %s cijfers zijn."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Zorg dat er minder dan %s cijfers na de komma staan."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Zorg dat er minder dan %s cijfers voor de komma staan."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Geef een geldige datum op."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Geef een geldige tijd op."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Geef een geldige datum/tijd op."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Er was geen bestand verstuurd. Controleer het coderingstype van het "
"formulier."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Er was geen bestand verstuurd."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Het verstuurde bestand is leeg."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"De bestandsnaam mag maximaal %(max)d karakters bevatten (dit zijn er nu %"
-"(length)d)."
+"De bestandsnaam mag maximaal %(max)d karakters bevatten (dit zijn er nu "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Upload a.u.b. een bestand of vink de verwijder vink, niet allebei."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -582,34 +657,34 @@ msgstr ""
"Bestand ongeldig. Het bestand dat is gegeven is geen afbeelding of is "
"beschadigd."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Geef een lijst op met waardes."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Volgorde"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Verwijderen"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Verbeter de dubbele gegevens voor %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -618,111 +693,120 @@ msgstr ""
"Verbeter de dubbele gegevens voor %(field_name)s, welke uniek moet zijn voor "
"de %(lookup)s in %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Verbeter de dubbele waarden hieronder."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s kon niet worden geïnterpreteerd in tijdzone "
+"%(current_timezone)s. Waarschijnlijk is deze ambigu of bestaat niet."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Huidige"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Wijzigen"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Verwijder"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Onbekend"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nee"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ja,nee,misschien"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "middernacht"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "middag"
@@ -998,84 +1082,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "december"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "of"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "jaar"
msgstr[1] "jaren"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "maand"
msgstr[1] "maanden"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "week"
msgstr[1] "weken"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dag"
msgstr[1] "dagen"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "uur"
msgstr[1] "uur"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuut"
msgstr[1] "minuten"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuten"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j-n-Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j-n-Y H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Directory overzicht is hier niet toegestaan"
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" bestaat niet"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Overzicht van %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1108,12 +1192,12 @@ msgstr "Geen dag opgegeven"
msgid "No week specified"
msgstr "Geen week opgegeven"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Geen %(verbose_name_plural)s beschikbaar"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1122,7 +1206,7 @@ msgstr ""
"Geen toekomstige %(verbose_name_plural)s beschikbaar omdat %(class_name)s."
"allow_future de waarde False (Onwaar) heeft."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Ongeldige datum tekst '%(datestr)s' op basis van formaat '%(format)s'"
@@ -1132,17 +1216,17 @@ msgstr "Ongeldige datum tekst '%(datestr)s' op basis van formaat '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Geen %(verbose_name)s gevonden die voldoet aan de query"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Pagina is niet 'last' en kan ook niet geconverteerd worden naar een int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Ongeldige pagina (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 9379464825..9a5a258b2b 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 ce1168b8e5..29451ff1d6 100644
--- a/django/conf/locale/nn/LC_MESSAGES/django.po
+++ b/django/conf/locale/nn/LC_MESSAGES/django.po
@@ -1,571 +1,639 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# <havard@grimelid.com>, 2011.
+# hgrimelid <havard@grimelid.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# <sigurdga-transifex@sigurdga.no>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-07 08:22+0000\n"
-"Last-Translator: hgrimelid <havard@grimelid.com>\n"
-"Language-Team: Norwegian Nynorsk <None>\n"
+"POT-Creation-Date: 2012-03-14 00:09-0700\n"
+"PO-Revision-Date: 2012-03-13 12:24+0000\n"
+"Last-Translator: sigurdga <sigurdga-transifex@sigurdga.no>\n"
+"Language-Team: Norwegian Nynorsk (http://www.transifex.net/projects/p/django/"
+"language/nn/)\n"
+"Language: nn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: nn\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabisk"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Aserbajansk"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgarsk"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalsk"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosnisk"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalansk"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tsjekkisk"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Walisisk"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Dansk"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Tysk"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Gresk"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Engelsk"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Engelsk (britisk)"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spansk"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
-msgstr "Argentinsk spansk"
+msgstr "Spansk (argentinsk)"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Spansk (meksikansk)"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Spansk (nicaraguansk)"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estisk"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskisk"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persisk"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finsk"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisisk"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irsk"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galisisk"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebraisk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroatisk"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Ungarsk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonesisk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japansk"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgisk"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreansk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litauisk"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Latvisk"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonsk"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolsk"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Nederlandsk"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norsk"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norsk (bokmål)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norsk (nynorsk)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polsk"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugisisk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brasiliansk portugisisk"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumensk"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovensk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albansk"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbisk latin"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Tyrkisk"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamesisk"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Simplifisert kinesisk"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Tradisjonell kinesisk"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Oppgje ein gyldig verdi."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Nettadressa fører til ei side som ikkje eksisterar."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Oppgje ei gyldig nettadresse."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Oppgje ei gyldig e-postadresse."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Oppgje ei gyldig IPv4-adresse."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Skriv inn ei gyldig IPv6-adresse."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Skriv inn ei gyldig IPv4- eller IPv6-adresse."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Oppgje berre tall skild med komma."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Verdien kan maksimalt ha %(limit_value)d teikn (den er %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "og"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "og"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Verdi %r er eit ugyldig val."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Feltet kan ikkje vere tomt."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Feltet kan ikkje vere tomt."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Felt av typen: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Heiltal"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Verdien må vere eit heltall."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "«%s» må vere eit heiltal."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Verdien må vere True eller False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "«%s» må vere anten True eller False"
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolsk (True eller False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Tekst (opp til %(max_length)s teikn)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Heiltal skild med komma"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "«%s» har eit ugyldig datoformat. Det må vere på formen YYYY-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "«%s» har rett format (YYYY-MM-DD) men ein ugyldig dato."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Dato (utan tid)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Oppgje ein gyldig dato på forma ÅÅÅÅ-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Ugyldig dato: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"«%s» har eit ugyldig format. Det må vere på formen YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Oppgje dato og tid på forma ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"«%s» har rett format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) men ugyldig dato "
+"eller klokkeslett."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Dato (med tid)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Verdien må vere eit desimaltall."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "«%s» må vere eit desimaltal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Desimaltall"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "E-postadresse"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Filsti"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Verdien må vere eit flyttall."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "«%s» må vere eit flyttal."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Flyttall"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Stort (8 bitar) heiltal"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4-adresse"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP-adresse"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Verdien må vere None, True eller False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "«%s» må vere anten None, True eller False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolsk (True, False eller None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Positivt heiltal"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Positivt lite heiltal"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (opp til %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Lite heiltal"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"«%s» har eit ugyldig format. Det må vere på formen HH:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"«%s» har rett format (HH:MM[:ss[.uuuuuu]]) men er eit ugyldig klokkeslett."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Tid"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Oppgje tida på forma TT:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "Nettadresse"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML-tekst"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Fil"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Bilete"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Primærnøkkel (type bestemt av relatert felt)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Ein-til-ein-forhold"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Mange-til-mange-forhold"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Hald nede \"Control\", eller \"Command\" på ein Mac, for å velge meir enn "
"éin."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Feltet er påkravd."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Oppgje eit heiltall."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Oppgje eit tall."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Verdien kan ikkje ha meir enn %s siffer totalt."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Verdien kan ikkie ha meir enn %s desimalar."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Verdien kan ikkje ha meir enn %s siffer framfor komma."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Oppgje ein gyldig dato."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Oppgje eit gyldig tidspunkt."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Oppgje gyldig dato og tidspunkt."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Inga fil vart sendt. Sjekk \"encoding\"-typen på skjemaet."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Inga fil vart sendt."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Fila er tom."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr "Filnamnet kan maksimalt ha %(max)d teikn (det har %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Last enten opp ei fil eller huk av i avkryssingsboksen."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -573,147 +641,156 @@ msgstr ""
"Last opp eit gyldig bilete. Fila du lasta opp var ødelagt eller ikkje eit "
"bilete."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Oppgje ei liste med verdiar."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Rekkefølge"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Slett"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Korriger dupliserte data for %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, 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 ""
-"Korriger dupliserte data for %(field_name)s, som må vere unike for %(lookup)"
-"s i %(date_field)s."
+"Korriger dupliserte data for %(field_name)s, som må vere unike for "
+"%(lookup)s i %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Korriger dei dupliserte verdiane nedanfor."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s kunne ikkje bli tolka i tidssona %(current_timezone)s. Verdien "
+"er anten tvetydig eller ugyldig."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Noverande"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Endre"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Tøm"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Ukjend"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nei"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ja,nei,kanskje"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "midnatt"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "12:00"
@@ -989,84 +1066,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Desember"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s…"
+
+#: utils/text.py:234
msgid "or"
msgstr "eller"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "år"
msgstr[1] "år"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "månad"
msgstr[1] "månadar"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "veke"
msgstr[1] "veker"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dag"
msgstr[1] "dagar"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "time"
msgstr[1] "timar"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutt"
msgstr[1] "minuttar"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuttar"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. F Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. F Y H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Mappeindeksar er ikkje tillate her."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "«%(path)s» finst ikkje."
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Indeks for %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1099,12 +1176,12 @@ msgstr "Dag ikkje spesifisert"
msgid "No week specified"
msgstr "Veke ikkje spesifisert"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s tilgjengeleg"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1113,7 +1190,7 @@ msgstr ""
"Framtidig %(verbose_name_plural)s er ikkje tilgjengeleg fordi %(class_name)s."
"allow_future er sett til False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Ugyldig datostreng '%(datestr)s' gitt format '%(format)s'"
@@ -1123,16 +1200,16 @@ msgstr "Ugyldig datostreng '%(datestr)s' gitt format '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Fann ingen %(verbose_name)s som korresponderte med spørringa"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Sida er ikkje 'last' og kan heller ikkje konverterast til eit tal."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Ugyldig side (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Tom liste og '%(class_name)s.allow_empty' er False."
diff --git a/django/conf/locale/pa/LC_MESSAGES/django.mo b/django/conf/locale/pa/LC_MESSAGES/django.mo
index c690134137..c4db39e35c 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 c147a1e273..3084e16d40 100644
--- a/django/conf/locale/pa/LC_MESSAGES/django.po
+++ b/django/conf/locale/pa/LC_MESSAGES/django.po
@@ -1,708 +1,775 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# A S Alam <apreet.alam@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: aalam <apreet.alam@gmail.com>\n"
-"Language-Team: Panjabi (Punjabi) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:09-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: A S Alam <apreet.alam@gmail.com>\n"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.net/projects/p/django/"
+"language/pa/)\n"
+"Language: pa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "ਅਰਬੀ"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "ਬੁਲਗਾਰੀਆਈ"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "ਬੰਗਾਲੀ"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "ਬੋਸਨੀਆਈ"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "ਕਾਟਾਲਾਨ"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "ਚੈੱਕ"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "ਵੈਲਸ਼"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "ਡੈਨਿਸ਼"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "ਜਰਮਨ"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "ਗਰੀਕ"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "ਅੰਗਰੇਜ਼ੀ"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "ਬਰਤਾਨੀਵੀਂ ਅੰਗਰੇਜ਼ੀ"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "ਸਪੇਨੀ"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "ਅਰਜਨਟੀਨੀ ਸਪੇਨੀ"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "ਈਸਟੋਨੀਆਈ"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "ਬਸਕਿਊ"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "ਪਰਸ਼ੀਆਈ"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "ਫੈਨਿਸ਼"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ਫਰੈਂਚ"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "ਫ਼ਾਰਸੀ"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "ਆਈਰਸ਼"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "ਗਲੀਸੀਆਈ"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ਹੈਬਰਿਊ"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "ਹਿੰਦੀ"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "ਕਰੋਆਟੀਆਈ"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ਹੰਗਰੀਆਈ"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "ਇੰਡੋਨੇਸ਼ੀਆਈ"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "ਆਈਸਲੈਂਡਿਕ"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "ਇਤਾਲਵੀ"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "ਜਾਪਾਨੀ"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "ਜਾਰਜੀਆਈ"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "ਖਮੀਰ"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "ਕੰਨੜ"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "ਕੋਰੀਆਈ"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "ਲੀਥੁਨੀਆਈ"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "ਲਾਟਵੀਅਨ"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "ਮੈਕਡੋਨੀਆਈ"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "ਮਲਿਆਲਮ"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "ਮੰਗੋਲੀਆਈ"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "ਡੱਚ"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "ਨਾਰਵੇਗੀਆਈ"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "ਨਾਰਵੇਗੀਆਈ ਬੋਕਮਾਲ"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "ਨਾਰਵੇਗੀਅਨ ਨਯਨੋਰਸਕ"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "ਪੰਜਾਬੀ"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "ਪੋਲੈਂਡੀ"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "ਪੁਰਤਗਾਲੀ"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "ਬਰਾਜ਼ੀਲੀ ਪੁਰਤਗਾਲੀ"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "ਰੋਮਾਨੀਆਈ"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ਰੂਸੀ"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "ਸਲੋਵਾਕ"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "ਸਲੋਵੀਨੀਆਈ"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "ਅਲਬੀਨੀਆਈ"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "ਸਰਬੀਆਈ"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "ਸਰਬੀਆਈ ਲੈਟਿਨ"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "ਸਵੀਡਨੀ"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "ਤਾਮਿਲ"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "ਤੇਲਗੂ"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "ਥਾਈ"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "ਤੁਰਕ"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ਯੂਕਰੇਨੀ"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "ਵੀਅਤਨਾਮੀ"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "ਸਧਾਰਨ ਚੀਨੀ"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "ਮੂਲ ਚੀਨੀ"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "ਠੀਕ ਮੁੱਲ ਦਿਓ"
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "ਠੀਕ URL ਦਿਉ।"
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "ਠੀਕ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr ""
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "ਅਤੇ"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "ਅਤੇ"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr ""
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "ਅੰਕ"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "ਇਹ ਮੁੱਲ ਪੂਰਨ ਅੰਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ।"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "ਇਹ ਮੁੱਲ ਠੀਕ ਜਾਂ ਗਲਤ ਹੋ ਸਕਦਾ ਹੈ।"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr ""
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr ""
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "ਮਿਤੀ (ਬਿਨਾਂ ਸਮਾਂ)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
+#: db/models/fields/__init__.py:732
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:736
#, python-format
-msgid "Invalid date: %s"
-msgstr "ਗਲਤ ਮਿਤੀ: %s"
-
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "ਮਿਤੀ (ਸਮੇਂ ਨਾਲ)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "ਦਸ਼ਮਲਵ ਅੰਕ"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "ਈਮੇਲ ਐਡਰੈੱਸ"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "ਫਾਇਲ ਪਾਥ"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP ਐਡਰੈੱਸ"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "ਟੈਕਸਟ"
-#: db/models/fields/__init__.py:1040
-msgid "Time"
-msgstr "ਸਮਾਂ"
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
msgstr ""
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1185
+msgid "Time"
+msgstr "ਸਮਾਂ"
+
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML ਟੈਕਸਟ"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "ਇਹ ਖੇਤਰ ਲਾਜ਼ਮੀ ਹੈ।"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr ""
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "ਨੰਬਰ ਦਿਓ।"
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr ""
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr ""
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "ਠੀਕ ਮਿਤੀ ਦਿਓ।"
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "ਠੀਕ ਸਮਾਂ ਦਿਓ।"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "ਠੀਕ ਮਿਤੀ/ਸਮਾਂ ਦਿਓ।"
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "ਕੋਈ ਫਾਇਲ ਨਹੀਂ ਭੇਜੀ।"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "ਦਿੱਤੀ ਫਾਇਲ ਖਾਲੀ ਹੈ।"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "ਮੁੱਲ ਦੀ ਲਿਸਟ ਦਿਓ।"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "ਲੜੀ"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "ਹਟਾਓ"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "ਮੌਜੂਦਾ"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "ਬਦਲੋ"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "ਸਾਫ਼ ਕਰੋ"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "ਅਣਜਾਣ"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "ਹਾਂ"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "ਨਹੀਂ"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ਹਾਂ,ਨਹੀਂ,ਸ਼ਾਇਦ"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ਬਾਈਟ"
msgstr[1] "%(size)d ਬਾਈਟ"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
-msgstr ""
+msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
-msgstr ""
+msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "ਸ਼ਾਮ"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "ਸਵੇਰ"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "ਅੱਧੀ-ਰਾਤ"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "ਨੂਨ"
@@ -978,84 +1045,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "ਦਸੰਬਰ"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "ਜਾਂ"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "ਸਾਲ"
msgstr[1] "ਸਾਲ"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "ਮਹੀਨਾ"
msgstr[1] "ਮਹੀਨਾ"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "ਹਫਤਾ"
msgstr[1] "ਹਫਤਾ"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "ਦਿਨ"
msgstr[1] "ਦਿਨ"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ਘੰਟਾ"
msgstr[1] "ਘੰਟਾ"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "ਮਿੰਟ"
msgstr[1] "ਮਿੰਟ"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "ਮਿੰਟ"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1088,19 +1155,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1110,16 +1177,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 9b029b1dd4..bd542fc276 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 50898b1775..a5c72b474a 100644
--- a/django/conf/locale/pl/LC_MESSAGES/django.po
+++ b/django/conf/locale/pl/LC_MESSAGES/django.po
@@ -1,585 +1,650 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# angularcircle <angular.circle@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Karol <kfuks2@o2.pl>, 2012.
+# konryd <konryd@gmail.com>, 2011.
+# Łukasz Rekucki <lrekucki@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 21:01+0100\n"
-"PO-Revision-Date: 2011-03-15 20:36+0000\n"
-"Last-Translator: angularcircle <angular.circle@gmail.com>\n"
-"Language-Team: Polish <>\n"
+"POT-Creation-Date: 2012-03-14 00:09-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Karol <kfuks2@o2.pl>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/django/language/"
+"pl/)\n"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "arabski"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "azerski"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "bułgarski"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengalski"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bośniacki"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "kataloński"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "czeski"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "walijski"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "duński"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "niemiecki"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "grecki"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "angielski"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "angielski brytyjski"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "hiszpański"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "hiszpański argentyński"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "hiszpański meksykański"
-#: conf/global_settings.py:60
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
-msgstr "hiszpański meksykański"
+msgstr "hiszpański nikaraguański"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estoński"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "baskijski"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "perski"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "fiński"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr "francuski"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "fryzyjski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irlandzki"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galicyjski"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "hebrajski"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "chorwacki"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "węgierski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonezyjski"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandzki"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "włoski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "japoński"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "gruziński"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "khmerski"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "koreański"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "litewski"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "łotewski"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "macedoński"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "malajski"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongolski"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holenderski"
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr "norweski"
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "norweski (Bokmal)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "norweski (Nynorsk)"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "pendżabski"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "polski"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugalski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "brazylijski portugalski"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumuński"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "rosyjski"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "słowacki"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "słoweński"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albański"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "serbski"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "serbski (łaciński)"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "szwedzki"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamilski"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "tajski"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turecki"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ukraiński"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "urdu"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "wietnamski"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "chiński uproszczony"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "chiński tradycyjny"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Wpisz poprawną wartość."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Ten odnośnik jest nieprawidłowy."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Wpisz poprawny URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Wprowadź poprawny adres e-mail."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Wprowadź poprawny adres IPv4."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Wprowadź poprawny adres IPv6."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Wprowadź poprawny adres IPv4 lub IPv6."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Wpisz tylko cyfry oddzielone przecinkami."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Upewnij się, że ta wartość ma co najmniej %(limit_value)d znaków (ma długość "
"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
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:769
+#: db/models/base.py:764
#, 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"
+"Wartości w %(field_name)s muszą być unikalne dla wyszukiwań %(lookup)s w "
+"%(date_field)s"
+
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "i"
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "i"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Wartość %r nie jest poprawnym wyborem."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "To pole nie może być puste."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "To pole nie może być puste."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Pole typu: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Liczba całkowita"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Ta wartość musi być liczbą całkowitą."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' wartość musi być liczbą całkowitą."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr ""
-"Ta wartość musi być wartością logiczną (True, False - prawda lub fałsz)."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' wartość musi być True lub False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Wartość logiczna (True, False - prawda lub fałsz)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Łańcuch (do %(max_length)s znaków)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Liczby całkowite rozdzielone przecinkami"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"'%s' wartość ma nieprawidłowy format daty. Wartość musi być zapisana w "
+"formacie YYYY-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "'%s' wartość ma odpowiedni format (YYYY-MM-DD), ale jest błędną datą."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Data (bez godziny)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Proszę wpisać poprawną datę w formacie RRRR-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Niepoprawna data: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' wartość ma nieprawidłowy format. Wartość musi być w formacie YYYY-MM-DD "
+"HH:MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Wprowadź poprawną datę i godzinę w formacie YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
+"'%s' wartość ma odpowiedni format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), ale "
+"jest nieprawidłową datą / czasem."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Data (z godziną)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Ta wartość musi być liczbą dziesiętną."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' wartość musi być liczbą dziesiętną."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Liczba dziesiętna"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Ścieżka do pliku"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Ta wartość musi być liczbą rzeczywistą."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' wartość musi być liczbą zmiennoprzecinkową."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Liczba zmiennoprzecinkowa"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Duża liczba całkowita (8 bajtów)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "adres IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Adres IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr ""
-"Ta wartość musi być jedną z None (nic), True (prawda) lub False (fałsz)."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' wartość musi być None, True lub False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Wartość logiczna (True, False, None - prawda, fałsz lub nic)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' wartość ma nieprawidłowy format. Wartość musi być w formacie HH:MM[:ss[."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' wartość ma odpowiedni format (HH:MM[:ss[.uuuuuu]]), ale jest "
+"nieprawidłowym czasem."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Czas"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Proszę wpisać poprawną godzinę w formacie HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Tekst XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Klucz obcy (typ określony przez pole powiązane)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Powiązanie jeden do jednego"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Powiązanie wiele do wiele"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Przytrzymaj wciśnięty klawisz \"Ctrl\" lub \"Command\" na Mac'u aby "
"zaznaczyć więcej niż jeden wybór."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "To pole jest wymagane."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Wpisz liczbę całkowitą."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Wpisz liczbę."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Upewnij się, że jest nie więcej niż %s cyfr."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Upewnij się, że jest nie więcej niż %s miejsc po przecinku."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Upewnij się, że jest nie więcej niż %s miejsc przed przecinkiem."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Wpisz poprawną datę."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Wpisz poprawną godzinę."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Wpisz poprawną datę/godzinę."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Nie wysłano żadnego pliku. Sprawdź typ kodowania formularza."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Żaden plik nie został przesłany."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Wysłany plik jest pusty."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Upewnij się, że nazwa tego pliku ma co najwyżej %(max)d znaków (ma długość %"
-"(length)d)."
+"Upewnij się, że nazwa tego pliku ma co najwyżej %(max)d znaków (ma długość "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Prześlij plik lub zaznacz by usunąć, ale nie oba na raz."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -587,94 +652,103 @@ msgstr ""
"Wgraj poprawny plik graficzny. Ten, który został wgrany, nie jest obrazem, "
"albo jest uszkodzony."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Podaj listę wartości."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Porządek"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Usuń"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Popraw zduplikowane dane w %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, 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 ""
-"Popraw zduplikowane dane w %(field_name)s, które wymaga unikalności dla %"
-"(lookup)s w polu %(date_field)s."
+"Popraw zduplikowane dane w %(field_name)s, które wymaga unikalności dla "
+"%(lookup)s w polu %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Popraw poniższe zduplikowane wartości."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" nie jest poprawną wartością klucza głównego."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s nie może być interpretowany w strefie czasowej "
+"%(current_timezone)s; może być niejednoznaczne lub nie istnieć."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Teraz"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Zmień"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Wyczyść"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Nieznany"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Tak"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nie"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "tak,nie,może"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -682,52 +756,52 @@ msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajty"
msgstr[2] "%(size)d bajtów"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "po południu"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "rano"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "po południu"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "rano"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "północ"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "południe"
@@ -1003,90 +1077,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "grudnia"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr " %(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "lub"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "rok"
msgstr[1] "lata"
msgstr[2] "lat"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "miesiąc"
msgstr[1] "miesiące"
msgstr[2] "miesięcy"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "tydzień"
msgstr[1] "tygodnie"
msgstr[2] "tygodni"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dzień"
msgstr[1] "dni"
msgstr[2] "dni"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "godzina"
msgstr[1] "godziny"
msgstr[2] "godzin"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuta"
msgstr[1] "minuty"
msgstr[2] "minut"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuty"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "Y-m-d"
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "Y-m-d H:i:s"
-
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y-m"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "m-d"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1119,12 +1193,12 @@ msgstr "Nie określono dnia"
msgid "No week specified"
msgstr "Nie określono tygodnia"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s nie jest dostępny"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1133,7 +1207,7 @@ msgstr ""
"Wyświetlanie %(verbose_name_plural)s z datą przyszłą jest niedostępne, gdyż "
"atrybut '%(class_name)s.allow_future' ma wartość 'False'."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1144,19 +1218,19 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr "Nie znaleziono %(verbose_name)s spełniających wybrane kryteria"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Podanego numeru strony nie można przekształcić na liczbę całkowitą, nie "
"przyjął on również wartości 'last' oznaczającej ostatnią stronę z dostępnego "
"zakresu."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Strona o numerze (%(page_number)s) nie istnieje"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 fa231c66ba..c9ea3ce166 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 f7b4e8a8c1..5ae1b65fbf 100644
--- a/django/conf/locale/pt/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt/LC_MESSAGES/django.po
@@ -1,578 +1,638 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Nuno Mariz <nmariz@gmail.com>, 2011.
+# Paulo Köch <paulo.koch@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-11 11:09+0000\n"
-"Last-Translator: nmariz <nmariz@gmail.com>\n"
-"Language-Team: Portuguese <>\n"
+"POT-Creation-Date: 2012-03-14 00:09-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
+"Language-Team: Portuguese (http://www.transifex.net/projects/p/django/"
+"language/pt/)\n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Árabe"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbaijano"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Búlgaro"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalês"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bósnio"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalão"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Checo"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Galês"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Dinamarquês"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Alemão"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Grego"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Inglês"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Inglês Britânico"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Espanhol"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Espanhol Argentino"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Espanhol mexicano"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estónio"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Basco"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Filandês"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Francês"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisão"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irlandês"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galaciano"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebraico"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Croata"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonésio"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandês"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japonês"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgiano"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Canarês"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Coreano"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lituano"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Letão"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Macedónio"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malaiala"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongol"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Holandês"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norueguês"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norueguês (Bokmål)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norueguês (Nynors)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Panjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polaco"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Português"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Português Brasileiro"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Romeno"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Esloveno"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanês"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Sérvio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Sérvio Latim"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ucraniano"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamita"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Chinês Simplificado"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Chinês Tradicional"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Introduza um valor válido."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Este URL é link quebrado."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Introduza um URL válido."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Introduza um endereço de e-mail válido."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Introduza um endereço IPv4 válido."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Introduza apenas números separados por vírgulas."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Garanta que este valor tem no mínimo %(limit_value)d carateres (tem %"
-"(show_value)d)."
+"Garanta que este valor tem no mínimo %(limit_value)d carateres (tem "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Garanta que este valor tem no máximo %(limit_value)d carateres (tem %"
-"(show_value)d)."
+"Garanta que este valor tem no máximo %(limit_value)d carateres (tem "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "e"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "e"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "O valor %r não é uma opção válida."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Este campo não pode ser nulo."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Este campo não pode ser vazio."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo do tipo: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Inteiro"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Este campo deverá ser inteiro."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Este valor deverá ser True ou False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (Pode ser True ou False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (até %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Inteiros separados por virgula"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Data (sem hora)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduza uma data válida no formato AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Data inválida: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Introduza uma data/hora válida no formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Data (com hora)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Este campo deverá ser um número decimal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Número décimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Caminho do ficheiro"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Este campo deverá ser número décimal."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Número em vírgula flutuante"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Inteiro grande (8 byte)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Endereço IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Este valor deverá ser None, True ou False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (Pode ser True, False ou None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Introduza uma hora válida no formato HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Texto XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relação de um-para-um"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relação de muitos-para-muitos"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mantenha pressionado o \"Control\", or \"Command\" no Mac, para selecionar "
"mais do que um."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Este campo é obrigatório."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Introduza um número inteiro."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Introduza um número."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Garanta que não contém no total mais do que %s dígitos."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Garanta que não contém mais do que %s casas decimais."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Garanta que não contém mais do que %s dígitos antes do ponto decimal."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Introduza uma data válida."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Introduza uma hora válida."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Introduza uma data/hora válida."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Nenhum ficheiro foi submetido. Verifique o tipo de codificação do formulário."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Nenhum ficheiro submetido."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "O ficheiro submetido encontra-se vazio."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Garanta que este nome do ficheiro tem no máximo %(max)d carateres (tem %"
-"(length)d)."
+"Garanta que este nome do ficheiro tem no máximo %(max)d carateres (tem "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Por favor, submeta um ficheiro ou remova a seleção da caixa, não ambos."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -580,36 +640,36 @@ msgstr ""
"Introduza uma imagem válida. O ficheiro que introduziu ou não é uma imagem "
"ou está corrompido."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Selecione 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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Introduza uma lista de valores."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ordem"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Remover"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor corrija os dados duplicados em %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -618,112 +678,119 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Por favor corrija os valores duplicados abaixo."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Selecione uma opção válida. Esse valor não se encontra opções disponíveis."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Selecione uma opção válida. %s não se encontra nas opções disponíveis."
-#: forms/models.py:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Atualmente"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Limpar"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Desconhecido"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Sim"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Não"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "sim,não,talvez"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "meia-noite"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "meio-dia"
@@ -987,7 +1054,7 @@ msgstr "Setembro"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr "De outubro"
+msgstr "Outubro"
#: utils/dates.py:55
msgctxt "alt. month"
@@ -999,84 +1066,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Dezembro"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "ou"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "ano"
msgstr[1] "anos"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mês"
msgstr[1] "meses"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "semana"
msgstr[1] "semanas"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dia"
msgstr[1] "dias"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "hora"
msgstr[1] "horas"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutos"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1109,12 +1176,12 @@ msgstr "Nenhum dia especificado"
msgid "No week specified"
msgstr "Nenhuma semana especificado"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Nenhum %(verbose_name_plural)s disponível"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1123,7 +1190,7 @@ msgstr ""
"%(verbose_name_plural)s futuros indisponíveis porque %(class_name)s."
"allow_future é False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Data inválida '%(datestr)s' formato '%(format)s'"
@@ -1133,16 +1200,16 @@ msgstr "Data inválida '%(datestr)s' formato '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Nenhum %(verbose_name)s de acordo com a procura."
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Página não é 'última' ou não é possível converter para um inteiro."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Página inválida (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Lista vazia e '%(class_name)s.allow_empty' é False."
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index bbaf444404..2cae21306e 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 3b36b12f35..cd2092e5a1 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,567 +1,627 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Eduardo Carvalho <eduardocereto@gmail.com>, 2011.
+# Guilherme Gondim <semente+transifex@taurinus.org>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Sandro <sandrossv@hotmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: semente <semente+transifex@taurinus.org>\n"
-"Language-Team: Portuguese (Brazilian) <django-l10n-portuguese@googlegroups."
+"POT-Creation-Date: 2012-03-14 00:09-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Eduardo Carvalho <eduardocereto@gmail.com>\n"
+"Language-Team: Portuguese (Brazil) <django-l10n-portuguese@googlegroups."
"com>\n"
+"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Árabe"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbaijão"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Búlgaro"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengali"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bósnia"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalão"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tcheco"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Galês"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Dinamarquês"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Alemão"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Grego"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Inglês"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Inglês Britânico"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Espanhol"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Espanhol Argentino"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Espanhol Mexicano"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Espanhol Nicaraguense"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estoniano"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Basco"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finlandês"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Francês"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frísia"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irlandês"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galiciano"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebraico"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Croata"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonésio"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandês"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japonês"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgiano"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Canarês"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Coreano"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lituano"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Letão"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Macedônio"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malaiala"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongol"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Neerlandês"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norueguês"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Dano-norueguês"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Novo Norueguês"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polonês"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Português"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Português Brasileiro"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Romeno"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Esloveno"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanesa"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Sérvio"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Sérvio Latino"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tâmil"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tailandês"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ucraniano"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamita"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Chinês Simplificado"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Chinês Tradicional"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Informe um valor válido."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
-msgstr "A URL %s aparenta ser um link quebrado."
+msgstr "Esta URL parece ser um link quebrado."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Informe uma URL válida."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Informe um endereço de email válido."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Informe um endereço IPv4 válido."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Informe apenas dígitos separados por vírgulas."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Certifique-se de que o valor tenha no mínimo %(limit_value)d caracteres (ele "
"possui %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Certifique-se de que o valor tenha no máximo %(limit_value)d caracteres (ele "
"possui %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "e"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "e"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "O valor %r não é uma escolha válida."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Este campo não pode ser nulo."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Este campo não pode estar em branco."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Campo do tipo: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Inteiro"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Este valor deve ser um inteiro."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Este valor deve ser True ou False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadeiro ou Falso)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (até %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Inteiros separados por vírgula"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Data (sem hora)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Informe uma data válida no formato AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Data inválida: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Informe uma data/hora válida no formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Data e hora"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Este valor deve ser um número decimal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Número decimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Caminho de arquivo"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Este valor deve ser um ponto flutuante."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Número de ponto flutuante"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Inteiro grande (8 byte)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Endereço IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Este valor deve ser None, True ou False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadeiro, Falso ou Nada)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Texto"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Hora"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Informe uma hora válida no formato HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Texto XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relacionamento um-para-um"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relacionamento muitos-para-muitos"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mantenha pressionado \"Control\" (ou \"Command\" no Mac) para selecionar "
"mais de uma opção."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Este campo é obrigatório."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Informe um número inteiro."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Informe um número."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Certifique-se de que não tenha mais de %s dígitos no total."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Certifique-se de que não tenha mais de %s casa decimais."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
"Certifique-se de que não tenha mais de %s dígitos antes do ponto decimal."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Informe uma data válida."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Informe uma hora válida."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Informe uma data/hora válida."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Nenhum arquivo enviado. Verifique o tipo de codificação do formulário."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Não foi enviado nenhum arquivo."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "O arquivo enviado está vazio."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -569,11 +629,11 @@ msgstr ""
"Certifique-se de que o arquivo tenha no máximo %(max)d caracteres (ele "
"possui %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Por favor, envie um arquivo ou marque o checkbox, mas não ambos."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -581,35 +641,35 @@ msgstr ""
"Envie uma imagem válida. O arquivo enviado não é uma imagem ou está "
"corrompido."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Informe uma lista de valores."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ordem"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Apagar"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija o valor duplicado para %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -618,111 +678,118 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija os valores duplicados abaixo."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Atualmente"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Modificar"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Limpar"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Desconhecido"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Sim"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Não"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "sim,não,talvez"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "meia noite"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "meio dia"
@@ -998,84 +1065,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Dezembro"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "ou"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "ano"
msgstr[1] "anos"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mês"
msgstr[1] "meses"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "semana"
msgstr[1] "semanas"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dia"
msgstr[1] "dias"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "hora"
msgstr[1] "horas"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuto"
msgstr[1] "minutos"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minutos"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j \\d\\e N \\d\\e Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j \\d\\e N \\d\\e Y à\\s H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F \\d\\e Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j \\d\\e F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1108,12 +1175,12 @@ msgstr "Dia não especificado"
msgid "No week specified"
msgstr "Semana não especificada"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s não disponíveis"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1122,7 +1189,7 @@ msgstr ""
"%(verbose_name_plural)s futuros não disponíveis pois %(class_name)s."
"allow_future é False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "' %(datestr)s ' string de data inválida dado o formato ' %(format)s '"
@@ -1132,16 +1199,16 @@ msgstr "' %(datestr)s ' string de data inválida dado o formato ' %(format)s '"
msgid "No %(verbose_name)s found matching the query"
msgstr "%(verbose_name)s não encontrado de acordo com a consulta"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "A página não é a 'última', nem pode ser convertido para um int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Página inválida ( %(page_number)s )"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Lista vazia e '%(class_name)s.allow_empty' é False."
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index f404e0b3fe..8794f1905e 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 7ab44dc7db..09f76a7530 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/django/conf/locale/ro/LC_MESSAGES/django.po
@@ -1,569 +1,640 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# <contact@mesimian.com>, 2011.
+# Daniel Ursache-Dogariu <contact@danniel.net>, 2011.
+# Denis Darii <sinednx@gmail.com>, 2011.
+# <ionel.mc@gmail.com>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:10-0400\n"
-"PO-Revision-Date: 2011-03-07 10:12+0000\n"
-"Last-Translator: danniel <contact@danniel.net>\n"
-"Language-Team: Romanian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:09-0700\n"
+"PO-Revision-Date: 2012-03-10 14:47+0000\n"
+"Last-Translator: Ionel Cristian Mărieș <ionel.mc@gmail.com>\n"
+"Language-Team: Romanian (http://www.transifex.net/projects/p/django/language/"
+"ro/)\n"
+"Language: ro\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
"2:1))\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabă"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azeră"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgară"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengaleză"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosniacă"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalană"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Cehă"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Galeză"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Daneză"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Germană"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Greacă"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Engleză"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Engleză britanică"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spaniolă"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Spaniolă Argentiniană"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Spaniolă Mexicană"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Spaniolă Nicaragua"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estonă"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Bască"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persană"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finlandeză"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Franceză"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frizian"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irlandeză"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galiciană"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Ebraică"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Croată"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Ungară"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indoneză"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandeză"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiană"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japoneză"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgiană"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmeră"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Limba kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreană"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lituaniană"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Letonă"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Macedoneană"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolă"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Olandeză"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norvegiană"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norvegiană Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norvegiană Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Poloneză"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugheză"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Portugheză braziliană"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Română"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Rusă"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovacă"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovenă"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albaneză"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Sârbă"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
-msgstr "Serba latină"
+msgstr "Sârbă latină"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Suedeză"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Limba tamila"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Limba telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tailandeză"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turcă"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ucraineană"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnameză"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Chineză simplificată"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Chineză tradițională"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Introduceți o valoare validă."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL-ul e invalid."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Introduceți un URL valid."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Introduceţi o adresă de email validă."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Introduceți un 'slug' valabil, compus numai din litere, numere, underscor "
-"sau liniuțe."
+"Introduceți un 'slug' valabil, compus numai din litere, numere, underscore "
+"sau cratime."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Introduceţi o adresă IPv4 validă."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Intoduceți o adresă IPv6 validă."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Introduceți o adresă IPv4 sau IPv6 validă."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Introduceţi numai numere separate de virgule."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Asiguraţi-vă că această valoare este %(limit_value)s (este %(show_value)s )."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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 %(limit_value)s ."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Asiguraţi-vă că această valoare este mai mare sau egală cu %(limit_value)s ."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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%(limit_value)d caractere "
"(aceasta are %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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 %(limit_value)d caractere "
"(aceasta are %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s trebuie să fie unic pentru %(date_field)s %(lookup)s."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "și"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s cu %(field_label)s deja există."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "și"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Valoarea %r nu este o alegere valabilă."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
-msgstr "Câmpul nu poate fi gol"
+msgstr "Câmpul nu poate fi gol."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Acest câmp nu poate fi gol."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Câmp de tip: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
-msgstr "Intreg"
+msgstr "Întreg"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Această valoare trebuie să fie un număr intreg."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Valoarea '%s' trebuie să fie un număr întreg."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Această valoare trebuie să fie ori falsă ori adevarată."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Valoarea '%s' trebuie sa fie doar True sau False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
-msgstr "Boolean (ori adevarat ori fals)"
+msgstr "Boolean (adevărat sau fals)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "Sir de caractere (pana la %(max_length)s caractere)"
+msgstr "Şir de caractere (cel mult %(max_length)s caractere)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Numere întregi separate de virgule"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"Valoarea '%s' este o dată invalidă. Trebuie sa fie in forma YYYY-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "Valoarea '%s' are forma corectă (YYYY-MM-DD) dar este o dată invalidă."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Dată (fară oră)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduceţi o dată validă în format: AAAA-LL-ZZ."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Dată invalidă: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Valoarea '%s' este invalidă. Trebuie sa fie in forma YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Introduceți timpul/data valabile în formatul YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
+"Valoarea '%s' are forma corectă (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) dar "
+"sunt dată/timp invalide."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Dată (cu oră)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Această valoare trebuie să fie un număr zecimal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Valoarea \"%s\" trebuie să fie un număr zecimal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Număr zecimal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Adresă email"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Calea fisierului"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Această valoare trebuie să fie un număr cu virgulă."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' value must be a float."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Număr cu virgulă"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Întreg mare (8 octeți)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "Adresă IPv4"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Adresă IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Această valoare trebuie să fie falsă, adevarată sau nici una."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Valoarea '%s' trebuie să fie doar None, True sau False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
-msgstr "Boolean (adevarat, fals sau nici una)"
+msgstr "Boolean (adevărat, fals sau niciuna)"
+
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Întreg pozitiv"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Întreg pozitiv mic"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (până la %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Întreg mic"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Valoarea '%s' are o formă invalida. Ea trebuie să fie in forma HH:MM[:ss[."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Valoarea '%s' are forma corectă (HH:MM[:ss[.uuuuuu]]) dar este un timp "
+"invalid."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Timp"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Introduceţi timpul valabil în formatul HH: MM [:. [Ss uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Text XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Fișier"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Imagine"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modelul %(model)s cu pk %(pk)r nu există."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
-msgstr "Foreign Key (tipul determinat de către cîmpul relativ)"
+msgstr "Foreign Key (tipul determinat de către câmpul relativ)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relaţie unul-la-unul"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relație multe-la-multe"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
" Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru selecție "
"multiplă."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Acest câmp este obligatoriu."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Introduceţi un număr întreg."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Introduceţi un număr."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asigurați-vă că nu exista mai mult de %s cifre în total."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asigurați-vă că nu exista mai mult de %s spații zecimale."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Asigurați-vă că nu exista mai mult de %s cifre înainte de virgulă."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Introduceți o dată validă."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Introduceți o oră validă."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Introduceți o dată/oră validă."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Nici un fișier nu a fost trimis. Verificați tipul fișierului."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Nici un fișier nu a fost trimis."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Fișierul încărcat este gol."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -571,11 +642,11 @@ msgstr ""
"Asiguraţi-vă că acest nume de fişier are cel mult %(max)d caractere (acesta "
"are %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Fie indicați un fişier, fie bifaţi caseta de selectare, nu ambele."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -583,36 +654,36 @@ msgstr ""
"Încărcaţi o imagine validă. Fişierul încărcat nu era o imagine sau era o "
"imagine coruptă."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Introduceți o listă de valori."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Ordine"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Șterge"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Corectaţi datele duplicate pentru %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Corectaţi datele duplicate pentru %(field)s , ce trebuie să fie unic."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -621,61 +692,70 @@ msgstr ""
"Corectaţi datele duplicate pentru %(field_name)s , care trebuie să fie unice "
"pentru %(lookup)s în %(date_field)s ."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Corectaţi valorile duplicate de mai jos."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Foreign key-ul inline nu se potrivește cu cheia primară a istanței mamă."
-#: forms/models.py:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" nu este o valoare valabilă pentru o cheie primară."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s nu poate fi interpetat in fusul orar %(current_timezone)s; este "
+"ambiguu sau nu există."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "În prezent"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Schimbă"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Șterge"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Necunoscut"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nu"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "da,nu,poate"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -683,52 +763,52 @@ msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
msgstr[2] "%(size)d bytes"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KO"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MO"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GO"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TO"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PO"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "miezul nopții"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "amiază"
@@ -1004,90 +1084,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "Decembrie"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "sau"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "an"
msgstr[1] "ani"
msgstr[2] "de ani"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "lună"
msgstr[1] "luni"
msgstr[2] "de luni"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "săptămână"
msgstr[1] "săptămâni"
msgstr[2] "de săptămâni"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "zi"
msgstr[1] "zile"
msgstr[2] "de zile"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "oră"
msgstr[1] "ore"
msgstr[2] "de ore"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minut"
msgstr[1] "minute"
msgstr[2] "de minute"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minute"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j N Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j N Y, H:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Aici nu sunt permise indexuri la directoare"
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" nu există"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Index pentru %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1120,12 +1200,12 @@ msgstr "Nicio zi specificată"
msgid "No week specified"
msgstr "Nicio săptămîna specificată"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s nu e disponibil"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1134,7 +1214,7 @@ msgstr ""
"Viitorul %(verbose_name_plural)s nu e disponibil deoarece %(class_name)s ."
"allow_future este Fals."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Dată incorectă '%(datestr)s' considerând formatul '%(format)s'"
@@ -1144,17 +1224,17 @@ msgstr "Dată incorectă '%(datestr)s' considerând formatul '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Niciun rezultat pentru %(verbose_name)s care se potrivesc interogării"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Pagina nu este \"ultima\" și nici nu poate fi convertită într-un întreg."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Pagină invalidă (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Listă goală și '%(class_name)s.allow_empty' este Fals."
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 45e836fbd9..ebd1afb391 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 002d50ab54..e3f431247d 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -1,583 +1,655 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Denis Darii <sinednx@gmail.com>, 2011.
+# Dimmus <dmitri.chudinov@gmail.com>, 2011.
+# Eugene MechanisM <contact@mechanism.name>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Алексей Борискин <sun.void@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: dnx <sinednx@gmail.com>\n"
-"Language-Team: Russian <>\n"
+"POT-Creation-Date: 2012-03-14 00:10-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Алексей Борискин <sun.void@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.net/projects/p/django/language/"
+"ru/)\n"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\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"
+"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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Арабский"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Азербайджанский"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Болгарский"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Бенгальский"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Боснийский"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Каталанский"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Чешский"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Уэльский"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Датский"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Немецкий"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Греческий"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Английский"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Британский английский"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Испанский"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Аргентинский испанский"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Мексиканский испанский"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Никарагуанский испанский"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Эстонский"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Баскский"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Персидский"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Финский"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Французский"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Фризский"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Ирландский"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Галисийский"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Иврит"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Хинди"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Хорватский"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Венгерский"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Индонезийский"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Исландский"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Итальянский"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Японский"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Грузинский"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Кхмерский"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Каннада"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Корейский"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Литовский"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Латвийский"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Македонский"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Малаялам"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Монгольский"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Голландский"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Норвежский"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Норвежский (Букмол)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Норвежский (Нюнорск)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Панджаби"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Польский"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Португальский"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Бразильский португальский"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Румынский"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Русский"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Словацкий"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Словенский"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Албанский"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Сербский"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Сербский (латиница)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Шведский"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Тамильский"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Телугу"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Тайский"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Турецкий"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Украинский"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Урду"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Вьетнамский"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Упрощенный китайский"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Традиционный китайский"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Введите правильное значение."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Эта ссылка не работает."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Введите правильный URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Введите правильный адрес электронной почты."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Значение должно состоять только из букв, цифр, знаков подчеркивания или "
"дефиса."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Введите правильный IPv4 адрес."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Введите действительный IPv6 адрес."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Введите действительный IPv4 или IPv6 адрес."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Введите цифры, разделенные запятыми."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Убедитесь, что это значение меньше либо равно %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Убедитесь, что это значение больше либо равно %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Убедитесь, что это значение содержит не менее %(limit_value)d символов "
"(сейчас %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Убедитесь, что это значение содержит не более %(limit_value)d символов "
"(сейчас %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-"Значение в поле %(field_name)s должно быть уникальным для %(lookup)s в поле %"
-"(date_field)s."
+"Значение в поле %(field_name)s должно быть уникальным для %(lookup)s в поле "
+"%(date_field)s."
+
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "и"
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s с таким %(field_label)s уже существует."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "и"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Значения %r нет среди допустимых вариантов."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Это поле не может иметь значение NULL."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Это поле не может быть пустым."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Целое"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Это значение должно быть целым числом."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' значение должно быть целым числом."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Значение должно быть либо True, либо False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' значение должно быть True или False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Логическое (True или False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Строка (до %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Целые, разделенные запятыми"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "'%s' значение задано неверно. Дата должна быть в формате ГГГГ-ММ-ДД."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Значение '%s' имеет корректный формат (YYYY-MM-DD), но это недействительная "
+"дата."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Дата (без указания времени)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Введите правильную дату в формате YYYY-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Неправильная дата: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Значение '%s' имеет неверный формат. Оно должно быть в формате YYYY-MM-DD HH:"
+"MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Введите правильные дату и время в формате YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
+"Значение '%s' имеет корректный формат (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
+"но это недействительные дата/время."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Дата (с указанием времени)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Это значение должно быть целым числом."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Значение '%s' должно быть десятичным числом."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Число с фиксированной запятой"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Адрес электронной почты"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Путь к файлу"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Это значение должно быть числом с плавающей запятой."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Значение '%s' должно быть числом с плавающей запятой."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Число с плавающей запятой"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Длинное целое (8 байт)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 адрес"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP-адрес"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Значение должно быть None, True или False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Значение '%s' должно быть None, True или False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Логическое (True, False или None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Положительное целое число"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Положительное малое целое число"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Слаг (до %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Малое целое число"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Текст"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Значение '%s' имеет неверный формат. Оно должно быть в формате ЧЧ:ММ[:сс[."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Значение '%s' имеет корректный формат (HH:MM[:ss[.uuuuuu]]), но это "
+"недействительное время."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Время"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Введите правильное время в формате HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML текст"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Файл"
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Изображение"
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Объект модели %(model)s с первичным ключом %(pk)r не существует."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Внешний ключ (тип определен по связанному полю)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Связь \"один к одному\""
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Связь \"многие ко многим\""
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-"Удерживайте \"Control\" (или \"Command\" на Mac) для выбора нескольких "
+"Удерживайте \"Control\" (или \"Command\" на Mac), чтобы выбрать несколько "
"значений."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Обязательное поле."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Введите целое число."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Введите число."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
-msgstr "Убедитесь, что ввели не больше %s цифр."
+msgstr "Убедитесь, что вы ввели не больше %s цифр."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
-msgstr "Убедитесь, что ввели не больше %s цифр после запятой."
+msgstr "Убедитесь, что вы ввели не больше %s цифр после запятой."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Убедитесь, что ввели не больше %s цифр до запятой."
+msgstr "Убедитесь, что вы ввели не больше %s цифр до запятой."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Введите правильную дату."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Введите правильное время."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Введите правильную дату и время."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ни одного файла не было отправлено. Проверьте тип кодировки формы."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Ни одного файла не было отправлено."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Отправленный файл пуст."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-"Пожалуйста, либо предоставьте файл или поставьте флажок на пункте очистить, "
-"но не оба."
+"Пожалуйста, загрузите файл или поставьте флажок \"Очистить\", но не "
+"совершайте оба действия одновременно."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -585,35 +657,35 @@ msgstr ""
"Загрузите правильное изображение. Файл, который вы загрузили, поврежден или "
"не является изображением."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Введите список значений."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Порядок"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Удалить"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Пожалуйста, измените повторяющееся значение в поле %(field)s."
+msgstr "Пожалуйста, измените повторяющееся значение в поле \"%(field)s\"."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Пожалуйста, измените значение в поле %(field)s, оно должно быть уникальным."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -622,112 +694,121 @@ msgstr ""
"Пожалуйста, измените значение в поле %(field_name)s, оно должно быть "
"уникальным для %(lookup)s в поле %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Пожалуйста, измените повторяющиеся значения ниже."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Внешний ключ не совпадает с первичным ключом родителя."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Выберите корректный вариант. Вашего варианта нет среди допустимых значений."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Выберите корректный вариант. %s нет среди допустимых значений."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" не является верным значением для первичного ключа."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s не может быть интерпретирована в часовом поясе "
+"%(current_timezone)s; дата может быть неоднозначной или оказаться "
+"несуществующей."
+
+#: forms/widgets.py:325
msgid "Currently"
-msgstr "В настоящее время"
+msgstr "На данный момент"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Изменить"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Очистить"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Неизвестно"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Да"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Нет"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "да,нет,может быть"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, 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 байт(а)"
+msgstr[1] "%(size)d байта"
+msgstr[2] "%(size)d байт"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KБ"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MБ"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GБ"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TБ"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
-msgstr "%s PБ"
+msgstr "%s ПБ"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "п.п."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "д.п."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "ПП"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "ДП"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "полночь"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "полдень"
@@ -1003,96 +1084,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "декабря"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "или"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "год"
-msgstr[1] "лет"
+msgstr[1] "года"
msgstr[2] "лет"
-msgstr[3] "лет"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "месяц"
-msgstr[1] "месяцев"
+msgstr[1] "месяца"
msgstr[2] "месяцев"
-msgstr[3] "месяцев"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "неделя"
-msgstr[1] "недель"
+msgstr[1] "недели"
msgstr[2] "недель"
-msgstr[3] "недель"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "день"
-msgstr[1] "дней"
+msgstr[1] "дня"
msgstr[2] "дней"
-msgstr[3] "дней"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "час"
-msgstr[1] "часов"
+msgstr[1] "часа"
msgstr[2] "часов"
-msgstr[3] "часов"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "минута"
-msgstr[1] "минут"
+msgstr[1] "минуты"
msgstr[2] "минут"
-msgstr[3] "минут"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "минут"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "d.m.Y"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Просмотр списка файлов директории здесь не разрешен."
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "d.m.Y H:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" не существует"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Список файлов директории %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1125,42 +1200,46 @@ msgstr "Не указан день"
msgid "No week specified"
msgstr "Не указана неделя"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s не доступен"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"Будущий %(verbose_name_plural)s не доступный, потому что %(class_name)s."
-"allow_future Ложен."
+"Будущие %(verbose_name_plural)s недоступны, потому что %(class_name)s."
+"allow_future выставлен в значение \"Ложь\"."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr "Недействительная дата '%(datestr)s' данный формат '%(format)s'"
+msgstr ""
+"Не удалось распознать строку с датой '%(datestr)s', используя формат "
+"'%(format)s'"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr "Не наиден никакой %(verbose_name)s соответствующим запросу"
+msgstr "Не найден ни один %(verbose_name)s, соответствующий запросу"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-"Страница не является 'последней', и/или она не может быть преобразована в "
-"int."
+"Номер страницы не содержит особое значение 'last', и его не удалось "
+"преобразовать к целому числу."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr "Недействительная страница (%(page_number)s)"
+msgstr "Неверная страница (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr "Пустой список и '%(class_name)s.allow_empty' Ложны."
+msgstr ""
+"Список пуст, но '%(class_name)s.allow_empty' выставлено в значение \"Ложь\", "
+"что запрещает показывать пустые списки."
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 18f8839be1..ee733212ae 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 0beef32a32..63f52f5659 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -1,577 +1,645 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Marian Andre <marian@andre.sk>, 2011, 2012.
+# Martin Kosír <martin@martinkosir.net>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-06 09:41+0000\n"
-"Last-Translator: martinkosir <martin@martinkosir.net>\n"
-"Language-Team: Slovak <None>\n"
+"POT-Creation-Date: 2012-03-14 00:10-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Marian Andre <marian@andre.sk>\n"
+"Language-Team: Slovak (http://www.transifex.net/projects/p/django/language/"
+"sk/)\n"
+"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "arabský"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "azerbajdžanský"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "bulharský"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengálsky"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosniansky"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "katalánsky"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "český"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "waleský"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "dánsky"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "nemecký"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "grécky"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "anglický"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "britský"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "španielsky"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "argentínska španielčina"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "mexická španielčina"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "nikaragujská španielčina"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estónsky"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "baskický"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "perzský"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "fínsky"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "francúzsky"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frízsky"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "írsky"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galícijský"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "hebrejský"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindský"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "chorvátsky"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "maďarský"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonézsky"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandský"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "taliansky"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "japonský"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "gruzínsky"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "kmérsky"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kanadský"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "kórejský"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "litovský"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "lotyšský"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "macedónsky"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "malajalámsky"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongolský"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holandský"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "nórsky"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "nórsky (Bokmal)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "nórsky (Nynorsk)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "pandžábsky"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "poľský"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugalský"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "portugalský (Brazília)"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumunský"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ruský"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "slovenský"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "slovinský"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albánsky"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "srbský"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "srbský (Latin)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "švédsky"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamilský"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telúgsky"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "thajský"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turecký"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ukrajinský"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "urdský"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vietnamský"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "čínsky (zjednodušene)"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "čínsky (tradične)"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Zadajte platnú hodnotu."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Toto URL je chybný odkaz."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Zadajte platnú URL adresu."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Zadajte platnú e-mailovú adresu."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Zadajte platnú IPv4 adresu."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Zadajte platnú IPv6 adresu."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Zadajte platnú IPv4 alebo IPv6 adresu."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Zadajte len číslice oddelené čiarkami."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Uistite sa, že zadaná hodnota má najmenej %(limit_value)d znakov (má %"
-"(show_value)d)."
+"Uistite sa, že zadaná hodnota má najmenej %(limit_value)d znakov (má "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Uistite sa, že táto hodnota má najviac %(limit_value)d znakov (má %"
-"(show_value)d)."
+"Uistite sa, že táto hodnota má najviac %(limit_value)d znakov (má "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "a"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "a"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Hodnota %r nie je platná možnosť."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Toto pole nemôže byť prázdne."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Toto pole nemôže byť prázdne."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Pole typu: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Celé číslo"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Táto hodnota musí byť celé číslo."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Hodnota '%s' musí byť celé číslo."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Táto hodnota musí byť True alebo False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Hodnota '%s' value musí byť True alebo False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Logická hodnota (buď True alebo False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Reťazec (až do %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Celé čísla oddelené čiarkou"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "Hodnota '%s' má neplatný tvar dátumu. Musí byť v tvare YYYY-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Hodnota '%s' je v správnom tvare (YYYY-MM-DD), ale je to neplatný dátum."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Dátum (bez času)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Zadajte platný dátum vo formáte RRRR-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Neplatný dátum: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Hodnota '%s' má neplatný tvar. Musí byť v tvare YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Zadajte platný dátum a čas vo formáte RRRR-MM-DD HH:MM[:ss[.uuuuuu]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"Hodnota '%s' je v správnom tvare (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), ale "
+"je to neplatný dátum/čas."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Dátum (a čas)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Táto hodnota musí byť desatinné číslo."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Hodnota '%s' musí byť desatinné číslo."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Desatinné číslo"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Cesta k súboru"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Táto hodnota musí byť číslo s plávajúcou desatinnou čiarkou."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Hodnota '%s' musí byť desatinné čislo s plávajúcou desatinnou čiarkou."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Číslo s plávajúcou desatinnou čiarkou"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Veľké celé číslo (8 bajtov)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 adresa"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP adresa"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Táto hodnota musí byť buď None, True alebo False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Hodnota '%s' musí byť buď None, True alebo False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Logická hodnota (buď True, False alebo None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr "Hodnota '%s' má neplatný tvar. Musí byť v tvare HH:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Hodnota '%s' je v správnom tvare (HH:MM[:ss[.uuuuuu]]), ale je to neplaný "
+"čas."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Čas"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Zadajte platný čas vo formáte HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML text"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Cudzí kľúč (typ určuje pole v relácii)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Typ relácie: jedna k jednej"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Typ relácie: M ku N"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Ak chcete vybrať viac ako jednu položku, podržte \"Control\", alebo \"Command"
"\" na počítači Mac."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Toto pole je povinné."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Zadajte celé číslo."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Zadajte číslo."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Uistite sa, že nie je zadaných celkovo viac ako %s číslic."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Uistite sa, že nie je zadaných viac ako %s desatinných miest."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
"Uistite sa, že nie je zadaných viac ako %s číslic pred desatinnou čiarkou."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Zadajte platný dátum."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Zadajte platný čas."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Zadajte platný dátum a čas."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Súbor nebol odoslaný. Skontrolujte typ kódovania vo formulári."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Žiaden súbor nebol odoslaný."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Odoslaný súbor je prázdny."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr "Uistite sa, že názov súboru má najviac %(max)d znakov (má %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
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
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -579,34 +647,34 @@ msgstr ""
"Nahrajte platný obrázok. Súbor, ktorý ste odoslali nebol obrázok alebo bol "
"poškodený."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Vložte zoznam hodnôt."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Poradie"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Odstrániť"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Prosím, opravte duplicitné dáta pre %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -615,59 +683,68 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Prosím, opravte nižšie uvedené duplicitné hodnoty. "
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"Hodnota %(datetime)s v časovej zóne %(current_timezone)s sa nedá "
+"interpretovať; môže byť nejednoznačná alebo nemusí existovať."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Súčasne"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Zmeniť"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Vymazať"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Neznámy"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Áno"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nie"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "áno,nie,možno"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -675,52 +752,52 @@ msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajty"
msgstr[2] "%(size)d bajtov"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "popoludní"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "dopoludnia"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "popoludní"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "dopoludnia"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "polnoc"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "poludnie"
@@ -996,90 +1073,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "december"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "alebo"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "rok"
msgstr[1] "roky"
msgstr[2] "rokov"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mesiac"
msgstr[1] "mesiace"
msgstr[2] "mesiacov"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "týždeň"
msgstr[1] "týždne"
msgstr[2] "týždnov"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "deň"
msgstr[1] "dni"
msgstr[2] "dní"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "hodina"
msgstr[1] "hodiny"
msgstr[2] "hodín"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minúta"
msgstr[1] "minúty"
msgstr[2] "minút"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minúty"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. F Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. F Y G:i"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "G:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1112,12 +1189,12 @@ msgstr "Nešpecifikovaný deň"
msgid "No week specified"
msgstr "Nešpecifikovaný týždeň"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s nie sú dostupné"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1126,7 +1203,7 @@ msgstr ""
"Budúce %(verbose_name_plural)s nie sú dostupné pretože %(class_name)s."
"allow_future má hodnotu False. "
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Neplatný dátumový reťazec '%(datestr)s' pre formát '%(format)s'"
@@ -1137,18 +1214,18 @@ msgid "No %(verbose_name)s found matching the query"
msgstr ""
"Nebol nájdený žiadny %(verbose_name)s zodpovedajúci databázovému dopytu"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Stránka nemá hodnotu 'last' a taktiež nie je možné prekonvertovať hodnotu na "
"celé číslo."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Neplatná stránka (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 22d85360dc..d070d81c9a 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 a8b18e6675..913caeed4f 100644
--- a/django/conf/locale/sl/LC_MESSAGES/django.po
+++ b/django/conf/locale/sl/LC_MESSAGES/django.po
@@ -1,581 +1,641 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# iElectric <domen@dev.si>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# <zejn@kiberpipa.org>, 2012.
+# zejn <zejn@kiberpipa.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-05 13:57+0000\n"
+"POT-Creation-Date: 2012-03-14 00:10-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
"Last-Translator: zejn <zejn@kiberpipa.org>\n"
-"Language-Team: Slovenian <None>\n"
+"Language-Team: Slovenian (http://www.transifex.net/projects/p/django/"
+"language/sl/)\n"
+"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabščina"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbajdžanščina"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bolgarščina"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengalščina"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosanščina"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalonščina"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Češčina"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Valežanski jezik"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danščina"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Nemščina"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Grščina"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Angleščina"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Britanska Angleščina"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Španščina"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentinska španščina"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Mehiška španščina"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nikaragvijska španščina"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estonščina"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskovščina"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Perzijščina"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finščina"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Francoščina"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frizijščina"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irščina"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galičanski jezik"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebrejski jezik"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindujščina"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Hrvaščina"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Madžarščina"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonezijski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandski jezik"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italijanščina"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japonščina"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Gruzijščina"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Kmerščina"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kanareščina"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Korejščina"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litvanščina"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Latvijščina"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonščina"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malajalščina"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongolščina"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Nizozemščina"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norveščina"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norveščina Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norveščina Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Pandžabščina"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Poljščina"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugalščina"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brazilska portugalščina"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Romunščina"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Ruščina"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovaščina"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovenščina"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanščina"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Srbščina"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Srbščina v latinici"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Švedščina"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamilščina"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Teluščina"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tajski jezik"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turščina"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrajinščina"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Jezik Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamščina"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Poenostavljena kitajščina"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Tradicionalna kitajščina"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Vnesite veljavno vrednost."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Izgleda, da povezava na ta URL ne deluje."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Vnesite veljaven URL naslov."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Vnesite veljaven e-mail."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Vnesite veljaven IPv4 naslov."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Vnesite veljaven IPv6 naslov."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Vnesite veljaven IPv4 ali IPv6 naslov."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Vnesite samo števila, ločena z vejicami."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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."
+msgstr "Poskrbite, da bo ta vrednost manj kot ali natanko %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Poskrbite, da bo ta vrednost vsaj %(limit_value)d znakov. Trenutno jih ima %"
-"(show_value)d."
+"Poskrbite, da bo ta vrednost vsaj %(limit_value)d znakov. Trenutno jih ima "
+"%(show_value)d."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Poskrbite, da bo imela ta vrednost največ %(limit_value)d znakov. Trenutno "
"jih ima %(show_value)d."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "in"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "in"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Vrednost %r ni veljavna izbira."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "To polje ne more biti prazno."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "To polje ne more biti prazno."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Polje tipa: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Celo število (integer)"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Ta vrednost mora biti celo število."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Vrednost '%s' mora biti celoštevilska."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Ta vrednost mora biti \"True\" ali \"False\"."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Vrednost '%s' mora biti bodisi \"res\" bodisi \"ni res\"."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolova vrednost (True ali False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Niz znakov (vse do %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Z vejico ločena cela števila (integer)"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "Vrednost '%s' je v napačnem zapisu. Biti mora v obliki LLLL-MM-DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "Vrednost '%s' je v pravilnem zapisu (LLLL-MM-DD), a ta dan ne obstaja."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Datum (brez ure)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Vnesite veljaven datum v zapisu YYYY-MM-DD (leto-mesec-dan)."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Nepravilen datum: %s"
-
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
msgstr ""
-"Vnesite veljaven datum/čas v zapisu YYYY-MM-DD HH:MM[:ss[.uuuuuu]] (leto-"
-"mesec-dan ura:minuta:sekunde.mikrosekunde)."
+"Vrednost '%s' ima je v neveljavnem zapisu. Biti mora v obliki LLLL-MM-DD UU:"
+"MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr "Vrednost '%s' je v pravilnem zapisu, a ta čas ne obstaja."
+
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datum (z uro)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Ta vrednost mora biti decimalno število."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Vrednost '%s' mora biti decimalno število."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Decimalno število"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Pot do datoteke"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Ta vrednost mora biti decimalno število."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Vrednost '%s' mora biti decimalno število v plavajoči vejici."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Število s plavajočo vejico"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Velika (8 bajtna) cela števila "
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 naslov"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP naslov"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Ta vrednost mora biti None, True ali False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Vrednost '%s' mora biti ali brez vrednosti ali \"res\" ali \"ni res\"."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolova vrednost (True, False ali None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Pozitivno celo število"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Pozitivno celo število (do 64 tisoč)"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Okrajšava naslova (do največ %(max_length)s znakov)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Celo število"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Besedilo"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Vrednost '%s' je v napačnem zapisu. Biti mora v obliki UU:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr "Vrednost '%s' je v pravilni obliki, a ta čas ne obstaja."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Čas"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr ""
-"Vnesite veljavni čas v zapisu HH:MM[:ss[.uuuuuu]] (ura:minuta:sekunde."
-"mikrosekunde)."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL (spletni naslov)"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML besedilo"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Datoteka"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Slika"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Tuji ključ (tip odvisen od povezanega polja)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relacija ena-na-ena"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relacija več-na-več"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
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."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "To polje je obvezno."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Vnesite celo število."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Vnesite število."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Poskrbite, da skupno ne bo več kot %s števil."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Poskrbite, da skupno ne bo več kot %s decimalnih mest."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Poskrbite, da ne bo več kot %s števil pred decimalno piko."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Vnesite veljaven datum."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Vnesite veljaven čas."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Vnesite veljaven datum/čas."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Datoteka ni bila poslana. Preverite nabor znakov v formi."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Poslali niste nobene datoteke."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Poslana datoteka je prazna."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Poskrbite, da bo imela ta datoteka največ %(max)d znakov (trenutno jih ima %"
-"(length)d)."
+"Poskrbite, da bo imela ta datoteka največ %(max)d znakov (trenutno jih ima "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Prosim oddaj datoteko ali izberi počisti okvir, ampak ne oboje hkrati."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -583,35 +643,35 @@ msgstr ""
"Naložite veljavno sliko. Naložena datoteka ni bila slika ali pa je bila le-"
"ta okvarjena."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Vnesite seznam vrednosti."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Razvrsti"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Izbriši"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Prosimo, odpravite podvojene vrednosti za %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -620,57 +680,66 @@ msgstr ""
"Prosimo popravite podvojene vrednosti za polje %(field_name)s, ki mora biti "
"edinstveno za %(lookup)s po %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Prosimo odpravite podvojene vrednosti spodaj."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"Vrednosti %(datetime)s ni bilo možno razumeti v časovnem pasu "
+"%(current_timezone)s; ali je izraz dvoumen ali pa ne obstaja."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Trenutno"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Spremeni"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Počisti"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Neznano"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "da,ne,morda"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -679,52 +748,52 @@ msgstr[1] "%(size)d bajta"
msgstr[2] "%(size)d bajti"
msgstr[3] "%(size)d bajtov"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "polnoč"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "poldne"
@@ -1000,16 +1069,22 @@ msgctxt "alt. month"
msgid "December"
msgstr "December"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "ali"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "leto"
@@ -1017,7 +1092,7 @@ msgstr[1] "leti"
msgstr[2] "leta"
msgstr[3] "let"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mesec"
@@ -1025,7 +1100,7 @@ msgstr[1] "meseca"
msgstr[2] "meseci"
msgstr[3] "mesecev"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "teden"
@@ -1033,7 +1108,7 @@ msgstr[1] "tedna"
msgstr[2] "tedni"
msgstr[3] "tednov"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dan"
@@ -1041,7 +1116,7 @@ msgstr[1] "dneva"
msgstr[2] "dnevi"
msgstr[3] "dni"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ura"
@@ -1049,7 +1124,7 @@ msgstr[1] "uri"
msgstr[2] "ure"
msgstr[3] "ur"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minuta"
@@ -1057,39 +1132,33 @@ msgstr[1] "minuti"
msgstr[2] "minute"
msgstr[3] "minut"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minute"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j.n.Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. F Y, H:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Prikaz vsebine mape ni dovoljen."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ne obstaja."
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Vsebina mape %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1122,42 +1191,42 @@ msgstr "Dan ni vnešen"
msgid "No week specified"
msgstr "Teden ni vnešen"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Na voljo ni noben %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"Prihodnje %(verbose_name_plural)s niso na voljo, ker je vrednost %"
-"(class_name)s.allow_future False."
+"Prihodnje %(verbose_name_plural)s niso na voljo, ker je vrednost "
+"%(class_name)s.allow_future False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
-"Neveljavna oblika datuma '%(datestr)s' glede na pričakovano obliko '%(format)"
-"s'"
+"Neveljavna oblika datuma '%(datestr)s' glede na pričakovano obliko "
+"'%(format)s'"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
msgstr "Noben %(verbose_name)s ne ustreza poizvedbi"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Strani niti ni 'last' niti ni celo število."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Neveljavna stran (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Prazen seznam ob nastavitvi '%(class_name)s.allow_empty = False'."
diff --git a/django/conf/locale/sq/LC_MESSAGES/django.mo b/django/conf/locale/sq/LC_MESSAGES/django.mo
index 9c7de0d43a..4454e514a4 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 d7a1c51aa6..b61b9ab17d 100644
--- a/django/conf/locale/sq/LC_MESSAGES/django.po
+++ b/django/conf/locale/sq/LC_MESSAGES/django.po
@@ -1,581 +1,640 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Besnik <besnik@programeshqip.org>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
+"POT-Creation-Date: 2012-03-14 00:10-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
"Last-Translator: Besnik <besnik@programeshqip.org>\n"
-"Language-Team: Albanian <None>\n"
+"Language-Team: Albanian (http://www.transifex.net/projects/p/django/language/"
+"sq/)\n"
+"Language: sq\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabe"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgare"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengali"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Boshnjake"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalane"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Çeke"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Uellsiane"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Daneze"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Gjermane"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Greke"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Angleze"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Anglishte Britanike"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spanjolle"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Spanjishte Argjentinase"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estoneze"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baske"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persiane"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finlandeze"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Frënge"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisiane"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irlandeze"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galike"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebraishte"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Indiane"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroate"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Hungareze"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indoneziane"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Islandeze"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italiane"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japoneze"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Gjeorgjiane"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmere"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreane"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lituaneze"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Latviane"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Maqedone"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malajalame"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongoliane"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Holandeze"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norvegjeze"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norvegjeze Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norvegjeze Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Panxhabe"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polake"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugeze"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Portugeze Braziliane"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumune"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Ruse"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovake"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovene"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Shqipe"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbe"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbe Latine"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Suedeze"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamileze"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tailandeze"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turke"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainase"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnameze"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Kineze e Thjeshtuar"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Kineze Tradicionale"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Jepni vlerë të vlefshme."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Kjo URL duket se është lidhje e dëmtuar."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Jepni një URL të vlefshme."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Jepni një adresë e-mail të vlefshme."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Jepni një vendndodhje të vlefshme IPv4."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Jepni vetëm shifra të ndara nga presje."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Sigurohuni që kjo vlerë është më e madhe ose baraz me %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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)."
+"Sigurohuni që kjo vlerë të ketë të paktën %(limit_value)d shenja (ka "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"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)."
+"Sigurohuni që kjo vlerë të ketë e shumta %(limit_value)d shenja (ka "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s duhet të jetë unike për %(date_field)s %(lookup)s."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr " dhe "
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr " dhe "
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Vlera %r nuk është zgjedhje e vlefshme."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Kjo fushë nuk mund të jetë bosh."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Kjo fushë nuk mund të jetë e zbrazët."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Numër i plotë"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Kjo vlerë duhet të jetë numër i plotë."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Kjo vlerë duhet të jetë True ose False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Buleane (Ose True, ose False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Varg (deri në %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Numra të plotë të ndarë me presje"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Datë (pa kohë)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Jepni një datë të vlefshme në formatin YYYY-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Datë e pavlefshme: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Jepni një datë/kohë të vlefshme, në formatin YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datë (me kohë)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Kjo vlerë duhet të jetë një numër dhjetor."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Numër dhjetor"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Shteg kartele"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Numër i plotë i madh (8 bajte)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Adresë IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Kjo vlerë duhet të jetë None, True ose False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Buleane (Ose True, ose False, ose None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Kohë"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Jepni një kohë të vlefshme, në formatin HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "Tekst XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modeli %(model)s me pk %(pk)r nuk ekziston."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Kyç i Jashtëm (lloj i përcaktuar nga fusha përkatëse)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Marrëdhënie një-për-një"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Marrëdhënie shumë-për-shumë"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mbani të shtypur \"Control\", ose \"Command\" në Mac, për të përzgjedhur më "
"shumë se një."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Kjo fushë është e domosdoshme."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Jepni një numër të tërë."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Jepni një numër."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Sigurohuni që nuk ka më tepër se %s shifra gjithsej."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Sigurohuni që nuk ka më shumë se %s vende dhjetore."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Sigurohuni që nuk ka më tepër se %s shifra para presjes dhjetore."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Jepni një datë të vlefshme."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Jepni një kohë të vlefshme."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Jepni një datë/kohë të vlefshme."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"Nuk u parashtrua ndonjë kartelë. Kontrolloni llojin e kodimit te forma."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Nuk u parashtrua kartelë."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Kartela e parashtruar është bosh."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
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
+#: forms/fields.py:489
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
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -583,38 +642,38 @@ msgstr ""
"Ngarkoni një figurë të vlefshme. Kartela që ngarkuat ose nuk qe figurë, ose "
"qe figurë e dëmtuar."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Jepni një listë vlerash."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Rend"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Fshije"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ju lutem, ndreqni të dhënat dyfishe për %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -623,114 +682,121 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Ju lutem, ndreqni vlerat dyfishe më poshtë."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" nuk është vlerë e vlefshme për kyç primar."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Tani"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Ndryshoje"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Pastroje"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "E panjohur"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Po"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Jo"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "po,jo,ndoshta"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajte"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "mesnatë"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "meditë"
@@ -1006,84 +1072,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "Dhjetor"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "ose"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "vit"
msgstr[1] "vite"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "muaj"
msgstr[1] "muaj"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "javë"
msgstr[1] "javë"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "ditë"
msgstr[1] "ditë"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "orë"
msgstr[1] "orë"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minutë"
msgstr[1] "minuta"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuta"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
msgstr ""
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1116,19 +1182,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1138,16 +1204,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 b36e07c5b7..e0c0f53038 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 6de5364848..66b6646dcf 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -1,577 +1,643 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Janos Guljas <janos@resenje.org>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-06 21:32+0000\n"
-"Last-Translator: janos <janos@resenje.org>\n"
-"Language-Team: Serbian <None>\n"
+"POT-Creation-Date: 2012-03-14 00:10-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Janos Guljas <janos@resenje.org>\n"
+"Language-Team: Serbian (http://www.transifex.net/projects/p/django/language/"
+"sr/)\n"
+"Language: sr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sr\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"
+"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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "арапски"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "азербејџански"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "бугарски"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "бенгалски"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "босански"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "каталонски"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "чешки"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "велшки"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "дански"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "немачки"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "грчки"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "енглески"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "британски енглески"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "шпански"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "аргентински шпански"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "мексички шпански"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "никарагвански шпански"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "естонски"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "баскијски"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "персијски"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "фински"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "француски"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "фризијски"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "ирски"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "галски"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "хебрејски"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "хинду"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "хрватски"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "мађарски"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "индонежански"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "исландски"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "италијански"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "јапански"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "грузијски"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "камбодијски"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "канада"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "корејски"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "литвански"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "латвијски"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "македонски"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "малајаламски"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "монголски"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "холандски"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "норвешки"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "норвешки кнјжевни"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "норвешки нови"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Панџаби"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "пољски"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "португалски"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "бразилски португалски"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "румунски"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "руски"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "словачки"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "словеначки"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "албански"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "српски"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "српски (латиница)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "шведски"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "тамилски"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "телугу"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "тајландски"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "турски"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "украјински"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Урду"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "вијетнамски"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "новокинески"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "старокинески"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Унесите исправну вредност."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Овај URL изгледа не води никуда."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Унесите исправан URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Унесите важећу имејл адресу."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Унесите исрпаван „слаг“, који се састоји од слова, бројки, доњих црта или "
"циртица."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Унесите исправну IPv4 адресу."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Унесите исправну IPv6 адресу."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Унесите исправну IPv4 или IPv6 адресу."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Унесите само бројке раздвојене запетама."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Ова вредност мора да буде мања од %(limit_value)s. или тачно толико."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Ова вредност мора бити већа од %(limit_value)s или тачно толико."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Ово поље мора да садржи најмање %(limit_value)d словних места (тренутно има %"
-"(show_value)d)."
+"Ово поље мора да садржи најмање %(limit_value)d словних места (тренутно има "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Ово поље мора да садржи највише %(limit_value)d словних места (тренутно има %"
-"(show_value)d)."
+"Ово поље мора да садржи највише %(limit_value)d словних места (тренутно има "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "и"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s са овом вредношћу %(field_label)s већ постоји."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "и"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Вредност %r није дозвољена."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Ово поље не може да остане празно."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Ово поље не може да остане празно."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Цео број"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Ова вредност мора бити целобројна."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Вредност поља '%s' мора бити цео број."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Ова вредност мора бити True или False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Вредност поља '%s' мора бити True или False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Булова вредност (True или False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Стринг (највише %(max_length)s знакова)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Цели бројеви раздвојени запетама"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"Формат датума поља '%s' није исправан. Датум треба бити облика ГГГГ-ММ-ДД."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Формат датума поља '%s' је исправан (ГГГГ-ММ-ДД), али је датум непостојећи."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Датум (без времена)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Унесите исправан датум у формату ГГГГ-ММ-ДД."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Неисправан датум: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr "Вредност поља '%s' није у формату ГГГГ-ММ-ДД СС:ММ[:сс[.мммммм]][ВЗ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Унесите исправан датум/време у формату ГГГГ-ММ-ДД ЧЧ:ММ[:сс[.уууууу]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"Вредност поља '%s' има добар формат (ГГГГ-ММ-ДД СС:ММ[:сс[.мммммм]][ВЗ]), "
+"али су датум и време непостојећи."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Датум (са временом)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Ова вредност мора бити децимални број"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Вредност поља '%s' мора бити децимални број."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Децимални број"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Имејл адреса"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Путања фајла"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Ова вредност мора бити број са клизећом запетом"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Вредност поља '%s' мора бити број pokretnom zapetom."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Број са покреном запетом"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Велики цео број"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 adresa"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP адреса"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Ова вредност мора бити или None, или True, или False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Вредност поља '%s' мора бити None, True или False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Булова вредност (True, False или None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Позитиван цео број"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Позитиван мали цео број"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Слаг (не дужи од %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Мали цео број"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Текст"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr "Време у пољу '%s' нема добар формат СС:ММ[:сс[.мммммм]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Вредност поља '%s' има добар формат (СС:ММ[:сс[.мммммм]]), али је време "
+"непостојеће."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Време"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Унесите исправно време у формату ЧЧ:ММ[:сс[.уууууу]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML текст"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Фајл"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Слика"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Објекат класе %(model)s са примарним кључем %(pk)r не постоји."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Страни кључ (тип одређује референтно поље)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Релација један на један"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Релација више на више"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Држите „Control“, или „Command“ на Mac-у да бисте обележили више од једне "
"ставке."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Ово поље се мора попунити."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Унесите цео број."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Унесите број."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Не сме бити укупно више од %s цифара. Проверите."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Не сме бити укупно више од %s децималних места. Проверите."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Не сме бити укупно више од %s цифара пре запете. Проверите."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Унесите исправан датум."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Унесите исправно време"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Унесите исправан датум/време."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Фајл није пребачен. Проверите тип енкодирања формулара."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Фајл није пребачен."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Пребачен фајл је празан."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Може се само послати фајл или избрисати, не оба."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -579,36 +645,36 @@ msgstr ""
"Пребаците исправан фајл. Фајл који је пребачен или није слика, или је "
"оштећен."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Унесите листу вредности."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Редослед"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Обриши"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Исправите дуплиран садржај за поља: %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Исправите дуплиран садржај за поља: %(field)s, који мора да буде јединствен."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -617,57 +683,66 @@ msgstr ""
"Исправите дуплиран садржај за поља: %(field_name)s, који мора да буде "
"јединствен за %(lookup)s у %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Исправите дуплиране вредности доле."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Страни кључ се није поклопио са инстанцом родитељског кључа."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Одабрана вредност није међу понуђенима. Одаберите једну од понуђених."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "%s није међу понуђеним вредностима. Одаберите једну од понуђених."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "„%s“ није исправна вредност за примарни кључ."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"Време %(datetime)s не може се представити у временској зони "
+"%(current_timezone)s."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Тренутно"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Измени"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Очисти"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Непознато"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Да"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Не"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "да,не,можда"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -675,52 +750,52 @@ msgstr[0] "%(size)d бајт"
msgstr[1] "%(size)d бајта"
msgstr[2] "%(size)d бајтова"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "по п."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "пре п."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "поноћ"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "подне"
@@ -996,90 +1071,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "Децембар"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "или"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "година"
msgstr[1] "године"
msgstr[2] "година"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "месец"
msgstr[1] "месеца"
msgstr[2] "месеци"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "недеља"
msgstr[1] "недеље"
msgstr[2] "недеља"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "дан"
msgstr[1] "дана"
msgstr[2] "дана"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "сат"
msgstr[1] "сата"
msgstr[2] "сати"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "минут"
msgstr[1] "минута"
msgstr[2] "минута"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "минута"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. F Y."
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. F Y. H:i Т"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Индекси директоријума нису дозвољени овде."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "G:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y."
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "„%(path)s“ не постоји"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Индекс директоријума %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1112,21 +1187,21 @@ msgstr "Дан није назначен"
msgid "No week specified"
msgstr "Недеља није назначена"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Недоступни објекти %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"Опција „future“ није доступна за „%(verbose_name_plural)s“ јер %(class_name)"
-"s.allow_future има вредност False."
+"Опција „future“ није доступна за „%(verbose_name_plural)s“ јер "
+"%(class_name)s.allow_future има вредност False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Неисправан датум „%(datestr)s“ дат формату „%(format)s“"
@@ -1136,16 +1211,16 @@ msgstr "Неисправан датум „%(datestr)s“ дат формату
msgid "No %(verbose_name)s found matching the query"
msgstr "Ниједан објекат класе %(verbose_name)s није нађен датим упитом."
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Страница није последња, нити може бити конвертована у тип int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Неиспаравна страница (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Празна листа и „%(class_name)s.allow_empty“ има вредност False."
diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo b/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
index 56031eddab..3304633b99 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 24c0b0f624..0c6f9f6ca6 100644
--- a/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
@@ -4,574 +4,637 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
+"POT-Creation-Date: 2012-03-14 00:10-0700\n"
"PO-Revision-Date: 2011-03-06 21:36+0000\n"
"Last-Translator: janos <janos@resenje.org>\n"
"Language-Team: Serbian (Latin) <None>\n"
+"Language: sr@latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sr@latin\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"
+"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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "arapski"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "azerbejdžanski"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "bugarski"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "bengalski"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "bosanski"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "katalonski"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "češki"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "velški"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "danski"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "nemački"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "grčki"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "engleski"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "britanski engleski"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "španski"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "argentinski španski"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "meksički španski"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+#, fuzzy
+msgid "Nicaraguan Spanish"
+msgstr "meksički španski"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "estonski"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "baskijski"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "persijski"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "finski"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "francuski"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "frizijski"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "irski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "galski"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "hebrejski"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "hindu"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "hrvatski"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "mađarski"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "indonežanski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "islandski"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "italijanski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "japanski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "gruzijski"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "kambodijski"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "kanada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "korejski"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "litvanski"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "latvijski"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "makedonski"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "malajalamski"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "mongolski"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "holandski"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "norveški"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "norveški knjževni"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "norveški novi"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Pandžabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "poljski"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "portugalski"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "brazilski portugalski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "rumunski"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ruski"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "slovački"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "slovenački"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "albanski"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "srpski"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "srpski (latinica)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "švedski"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "tamilski"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "tajlandski"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "turski"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ukrajinski"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "vijetnamski"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "novokineski"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "starokineski"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Unesite ispravnu vrednost."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Ovaj URL izgleda ne vodi nikuda."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Unesite ispravan URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Unesite važeću imejl adresu."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Unesite ispravnu IPv4 adresu."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+#, fuzzy
+msgid "Enter a valid IPv6 address."
+msgstr "Unesite ispravnu IPv4 adresu."
+
+#: core/validators.py:184 core/validators.py:187
+#, fuzzy
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Unesite ispravnu IPv4 adresu."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Unesite samo brojke razdvojene zapetama."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Ovo polje mora da sadrži najmanje %(limit_value)d slovnih mesta (trenutno "
"ima %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Ovo polje mora da sadrži najviše %(limit_value)d slovnih mesta (trenutno ima "
"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "i"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "i"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Vrednost %r nije dozvoljena."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Ovo polje ne može da ostane prazno."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Ovo polje ne može da ostane prazno."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Ponje tipa: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Ceo broj"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, fuzzy, python-format
+msgid "'%s' value must be an integer."
msgstr "Ova vrednost mora biti celobrojna."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
+#: db/models/fields/__init__.py:552
+#, fuzzy, python-format
+msgid "'%s' value must be either True or False."
msgstr "Ova vrednost mora biti True ili False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Bulova vrednost (True ili False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "String (najviše %(max_length)s znakova)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Celi brojevi razdvojeni zapetama"
-#: db/models/fields/__init__.py:584
-msgid "Date (without time)"
-msgstr "Datum (bez vremena)"
-
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
+#: db/models/fields/__init__.py:647
+#, fuzzy, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
msgstr "Unesite ispravan datum u formatu GGGG-MM-DD."
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
#, python-format
-msgid "Invalid date: %s"
-msgstr "Neispravan datum: %s"
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
+msgid "Date (without time)"
+msgstr "Datum (bez vremena)"
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:732
+#, fuzzy, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
msgstr "Unesite ispravan datum/vreme u formatu GGGG-MM-DD ČČ:MM[:ss[.uuuuuu]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datum (sa vremenom)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
+#: db/models/fields/__init__.py:831
+#, fuzzy, python-format
+msgid "'%s' value must be a decimal number."
msgstr "Ova vrednost mora biti decimalni broj"
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Decimalni broj"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "Imejl adresa"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Putanja fajla"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, fuzzy, python-format
+msgid "'%s' value must be a float."
msgstr "Ova vrednost mora biti broj sa klizećom zapetom"
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Broj sa pokrenom zapetom"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Veliki ceo broj"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+#, fuzzy
+msgid "IPv4 address"
+msgstr "IP adresa"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP adresa"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1065
+#, fuzzy, python-format
+msgid "'%s' value must be either None, True or False."
msgstr "Ova vrednost mora biti ili None, ili True, ili False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Bulova vrednost (True, False ili None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+#, fuzzy
+msgid "Positive integer"
+msgstr "Veliki ceo broj"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, fuzzy, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "String (najviše %(max_length)s znakova)"
+
+#: db/models/fields/__init__.py:1156
+#, fuzzy
+msgid "Small integer"
+msgstr "Ceo broj"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Tekst"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, fuzzy, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr "Unesite ispravno vreme u formatu ČČ:MM[:ss[.uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Vreme"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Unesite ispravno vreme u formatu ČČ:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML tekst"
+#: db/models/fields/files.py:214
+#, fuzzy
+msgid "File"
+msgstr "Putanja fajla"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Strani ključ (tip određuje referentno polje)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Relacija jedan na jedan"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Relacija više na više"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Držite „Control“, ili „Command“ na Mac-u da biste obeležili više od jedne "
"stavke."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Ovo polje se mora popuniti."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Unesite ceo broj."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Unesite broj."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Ne sme biti ukupno više od %s cifara. Proverite."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Ne sme biti ukupno više od %s decimalnih mesta. Proverite."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Ne sme biti ukupno više od %s cifara pre zapete. Proverite."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Unesite ispravan datum."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Unesite ispravno vreme"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Unesite ispravan datum/vreme."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Fajl nije prebačen. Proverite tip enkodiranja formulara."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Fajl nije prebačen."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Prebačen fajl je prazan."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Naziv fajla mora da sadrži bar %(max)d slovnih mesta (trenutno ima %(length)"
-"d)."
+"Naziv fajla mora da sadrži bar %(max)d slovnih mesta (trenutno ima "
+"%(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Može se samo poslati fajl ili izbrisati, ne oba."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -579,36 +642,36 @@ msgstr ""
"Prebacite ispravan fajl. Fajl koji je prebačen ili nije slika, ili je "
"oštećen."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Unesite listu vrednosti."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Redosled"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Obriši"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ispravite dupliran sadržaj za polja: %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -617,57 +680,64 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Ispravite duplirane vrednosti dole."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Trenutno"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Izmeni"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Očisti"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Nepoznato"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "da,ne,možda"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -675,52 +745,52 @@ msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajta"
msgstr[2] "%(size)d bajtova"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "po p."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "pre p."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "ponoć"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "podne"
@@ -996,90 +1066,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "Decembar"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "ili"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "godina"
msgstr[1] "godine"
msgstr[2] "godina"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "mesec"
msgstr[1] "meseca"
msgstr[2] "meseci"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "nedelja"
msgstr[1] "nedelje"
msgstr[2] "nedelja"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dan"
msgstr[1] "dana"
msgstr[2] "dana"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "sat"
msgstr[1] "sata"
msgstr[2] "sati"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minut"
msgstr[1] "minuta"
msgstr[2] "minuta"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuta"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j. F Y."
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j. F Y. H:i T"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "G:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y."
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j. F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1112,21 +1182,21 @@ msgstr "Dan nije naznačen"
msgid "No week specified"
msgstr "Nedelja nije naznačena"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Nedostupni objekti %(verbose_name_plural)s"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"Opcija „future“ nije dostupna za „%(verbose_name_plural)s“ jer %(class_name)"
-"s.allow_future ima vrednost False."
+"Opcija „future“ nije dostupna za „%(verbose_name_plural)s“ jer "
+"%(class_name)s.allow_future ima vrednost False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Neispravan datum „%(datestr)s“ dat formatu „%(format)s“"
@@ -1136,16 +1206,16 @@ msgstr "Neispravan datum „%(datestr)s“ dat formatu „%(format)s“"
msgid "No %(verbose_name)s found matching the query"
msgstr "Nijedan objekat klase %(verbose_name)s nije nađen datim upitom."
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Stranica nije poslednja, niti može biti konvertovana u tip int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Neisparavna stranica (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Prazna lista i „%(class_name)s.allow_empty“ ima vrednost False."
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index 40a4fd79f6..bc28f81f98 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 62f6176375..2497343735 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@@ -1,579 +1,653 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Andreas Pelme <andreas@pelme.se>, 2011, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Mattias Jansson <mattias@colourandcode.se>, 2011.
+# Samuel Linde <samuel@linde.im>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: dobcey <mattias@colourandcode.se>\n"
-"Language-Team: Swedish <>\n"
+"POT-Creation-Date: 2012-03-14 00:10-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Andreas Pelme <andreas@pelme.se>\n"
+"Language-Team: Swedish (http://www.transifex.net/projects/p/django/language/"
+"sv/)\n"
+"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arabiska"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbajdzjanska"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgariska"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengaliska"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Bosniska"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalanska"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Tjeckiska"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Walesiska"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danska"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Tyska"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Grekiska"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Engelska"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Brittisk engelska"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Spanska"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentinsk spanska"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Mexikansk Spanska"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nicaraguansk spanska"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estländska"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskiska"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Persiska"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Finska"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Franska"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisiska"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Irländska"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galisiska"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Hebreiska"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Kroatiska"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Ungerska"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Indonesiska"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Isländska"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Italienska"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japanska"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgiska"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Koreanska"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Lettiska"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Lettiska"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonska"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Mongoliska"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Holländska"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norska"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norska (bokmål)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norska (nynorsk)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Polska"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portugisiska"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brasiliensk portugisiska"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Rumänska"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Ryska"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovakiska"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovenska"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Albanska"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Serbiska"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbiska (latin)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Svenska"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamilska"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Thailändska"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Turkiska"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukrainska"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamesiska"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Förenklad Kinesiska"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Traditionell Kinesiska"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Fyll i ett giltigt värde."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Denna URL verkar vara en trasig länk."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Fyll i en giltig URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Fyll i en giltig e-postadress."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Fyll i en giltig IPv4 adress."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Ange en giltig IPv6-adress."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Ange en giltig IPv4 eller IPv6-adress."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Fyll enbart i siffror separerade med kommatecken."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Kontrollera att detta värde är %(limit_value)s (det är %(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Kontrollera att detta värde är mindre än eller lika med %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Kontrollera att detta värde är större än eller lika med %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Kontrollera att detta värde har minst %(limit_value)d tecken (det har %"
-"(show_value)d)."
+"Kontrollera att detta värde har minst %(limit_value)d tecken (det har "
+"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Kontrollera att detta värde som mest har %(limit_value)d tecken (det har %"
-"(show_value)d)."
+"Kontrollera att detta värde som mest har %(limit_value)d tecken (det har "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "och"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "och"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Värdet %r är inget giltigt alternativ."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Detta fält får inte vara null."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Detta fält får inte vara tomt."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Heltal"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Detta värde måste vara ett heltal."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "Värdet '%s' måste vara ett heltal."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Detta värde måste vara antingen True eller False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "Värdet '%s' måste vara antingen True eller False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolesk (antingen True eller False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Sträng (upp till %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Komma-separerade heltal"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"Värdet '%s' har ett ogiltigt datumformat. Det måste vara i formatet YYYY-MM-"
+"DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"Värdet '%s' har det giltiga formatet (YYYY-MM-DD) men det är ett ogiltigt "
+"datum."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Datum (utan tid)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Fyll i ett giltigt datum med formatet ÅÅÅÅ-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Ogiltigt datum: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"Värdet '%s' har ett ogiltigt datumformat. Det måste vara i formatet YYYY-MM-"
+"DD HH:MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Fyll i en giltig tidpunkt med formatet ÅÅÅÅ-MM-DD TT:MM[:ss[.uuuuuu]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"Värdet '%s' har det giltiga formatet (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) "
+"men det är ett ogiltigt datum/tid."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Datum (med tid)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Detta värde måste vara ett decimaltal."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "Värdet '%s' måste vara ett decimaltal."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Decimaltal"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "E-postadress"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Sökväg till fil"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Detta värde måste vara ett flyttal."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "Värdet '%s' must vara ett flyttal."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Flyttal"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Stort (8 byte) heltal"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4-adress"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP-adress"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Detta värde måste vara antingen None, True eller False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "Värdet '%s' måste vara antingen \"None\", True or False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Boolesk (antingen True, False eller None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Positivt heltal"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Positivt litet heltal"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (upp till %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Litet heltal"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Text"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"Värdet '%s' har ett ogiltigt format. Det måste vara på formatet HH:MM[:ss[."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"Värdet '%s' har det korrekta formatet (HH:MM[:ss[.uuuuuu]]) men är en "
+"ogiltig tid."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Tid"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Fyll i ett giltigt klockslag med formatet TT:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML-text"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Fil"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Bild"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modell %(model)s med primärnyckel %(pk)r finns inte."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Främmande nyckel (typ bestäms av relaterat fält)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Ett-till-ett-samband"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Många-till-många-samband"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Håll ner \"Control\" eller \"Command\" på en Mac för att välja fler än en."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Detta fält måste fyllas i."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Fyll i ett heltal."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Fyll i ett tal."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Kontrollera att det inte finns mer än totalt %s siffror."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Kontrollera att det inte finns mer än %s decimaler."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Kontrollera att det inte finns mer än %s siffror före decimaltecknet."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Fyll i ett giltigt datum."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Fyll i en giltig tid."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Fyll i ett giltigt datum/tid."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Ingen fil skickades. Kontrollera kodningstypen i formuläret."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Ingen fil skickades."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Den skickade filen är tom."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Kontrollera att detta värde har högst %(max)d tecken (det har %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
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
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -581,36 +655,36 @@ msgstr ""
"Ladda upp en giltig bild. Filen du laddade upp var antingen ingen bild eller "
"en korrupt bild."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Fyll i en lista med värden."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Sortering"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Radera"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Var vänlig korrigera duplikatdata för %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Var vänlig korrigera duplikatdata för %(field)s, som måste vara unik."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -619,114 +693,123 @@ 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Vänligen korrigera duplikatvärdena nedan."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s kunde inte tolkas i tidszonen %(current_timezone)s; det kan "
+"vara en ogiltig eller tvetydigt tidpunkt"
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Nuvarande"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Ändra"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Rensa"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Okänt"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Nej"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ja,nej,kanske"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d byte"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s kB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "e.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "f.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "FM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "EM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "midnatt"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "middag"
@@ -1002,84 +1085,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "december"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "eller"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "år"
msgstr[1] "år"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "månad"
msgstr[1] "månader"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "vecka"
msgstr[1] "veckor"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "dag"
msgstr[1] "dagar"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "timme"
msgstr[1] "timmar"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "minut"
msgstr[1] "minuter"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "minuter"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "Y-m-d"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "Y-m-d H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Kataloglistningar är inte tillåtna här."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" finns inte"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Innehåll i %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1112,21 +1195,21 @@ msgstr "Ingen dag angiven"
msgid "No week specified"
msgstr "Ingen vecka angiven"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Inga %(verbose_name_plural)s är tillgängliga"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"Framtida %(verbose_name_plural)s är inte tillgängliga eftersom %(class_name)"
-"s.allow_future är False."
+"Framtida %(verbose_name_plural)s är inte tillgängliga eftersom "
+"%(class_name)s.allow_future är False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Ogiltig datumsträng '%(datestr)s' med givet format '%(format)s'"
@@ -1136,16 +1219,16 @@ msgstr "Ogiltig datumsträng '%(datestr)s' med givet format '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "Hittade inga %(verbose_name)s som matchar frågan"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Sidan är inte 'last', och kan inte heller omvandlas till en int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Ogiltig sida (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Tom lista och '%(class_name)s.allow_empty' är False."
diff --git a/django/conf/locale/ta/LC_MESSAGES/django.mo b/django/conf/locale/ta/LC_MESSAGES/django.mo
index 335c432865..0d123afc86 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 9befe3c5f0..153bff1348 100644
--- a/django/conf/locale/ta/LC_MESSAGES/django.po
+++ b/django/conf/locale/ta/LC_MESSAGES/django.po
@@ -1,568 +1,627 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: Jannis <jannis@leidel.info>\n"
-"Language-Team: Tamil <None>\n"
+"POT-Creation-Date: 2012-03-14 00:10-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
+"Language-Team: Tamil (http://www.transifex.net/projects/p/django/language/"
+"ta/)\n"
+"Language: ta\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ta\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "அரபிக்"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "பெங்காலி"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "செக்"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "வெல்ஸ்"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "டேனிஷ்"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "ஜெர்மன்"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "கிரேக்கம்"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "ஆங்கிலம்"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr ""
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "ஸ்பானிஷ்"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr ""
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr ""
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr ""
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr ""
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "பீனீஷ்"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ப்ரென்சு"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr ""
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr ""
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "கலீஷீயன்"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ஹீப்ரு"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ஹங்கேரியன்"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "ஐஸ்லான்டிக்"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "இத்தாலியன்"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "ஜப்பானிய"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "டச்சு"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "நார்வீசியன்"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "ரோமானியன்"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "ரஷ்யன்"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "சுலோவாக்"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "ஸ்லோவேனியன்"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "செர்பியன்"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "சுவிடிஷ்"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "தமிழ்"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "துருக்கிஷ்"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "உக்ரேனியன்"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr ""
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "எளிய சீன மொழி"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "மரபு சீன மொழி"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr ""
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr ""
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "முறையான e முகவரிகள் மட்டும் எழுதவும்"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "இங்கு எண்களை மட்டுமே எழுதவும் காமவாள் தனிமைபடுத்தவும் "
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "மற்றும்"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "மற்றும்"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "இந்த புலம் காலியாக இருக்கக் கூடாது"
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: 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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "முழு எண்"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "இந்த மதிப்பு முழுவெண்ணாக இருக்க வேண்டும"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "இந்த மதிப்பு சரி அல்லது தவறாக இருக்க வேண்டும்"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "பூலியன் (சரி அல்லது தவறு)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "கமாவாள் பிரிக்கப்பட்ட முழு எண்"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "தேதி (நேரமில்லாமல்)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "வவவவ-மாமா-நாநா என்ற அமைப்பில் உள்ள முறையான தேதி மட்டுமே எழுதவும்"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "தேதி (நேரமுடன்)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "தசம எண்கள்"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "மின் அஞ்சல்"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "கோப்புப் பாதை"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP விலாசம்"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "இலக்கு முறை (சரி, தவறு அல்லது ஒன்றும் இல்லை)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "உரை"
-#: db/models/fields/__init__.py:1040
-msgid "Time"
-msgstr "நேரம்"
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
msgstr ""
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1185
+msgid "Time"
+msgstr "நேரம்"
+
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML உரை"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mac இல், ஒன்றுக்கு மேற்பட்டவற்றை தேர்வு செய்ய \"Control\" அல்லது \"Command\" ஐ "
"அழுத்தவும்"
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "இந்த புலத்தில் மதிப்பு தேவை"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "முழு எண் மட்டுமே எழுதவும்"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr ""
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr ""
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr ""
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr ""
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr ""
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr ""
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "அந்த பக்கத்தின் encoding வகையைப் பரிசோதிக்க.கோப்பு சமர்பிக்கப் பட்டவில்லை "
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr ""
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "சமர்பிக்கப் பட்ட கோப்புக் காலியாக உள்ளது"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -570,143 +629,150 @@ msgstr ""
"முறையான படம் மட்டுமே பதிவேற்றம் செய்யவும். நீங்கள் பதிவேற்றம் செய்த கோப்பு படம் அள்ளாத "
"அல்லது கெட்டுப்போன கோப்பாகும்"
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr ""
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr ""
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "நீக்குக"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr ""
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "மாற்றுக"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "தெரியாத"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "ஆம்"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "இல்லை"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ஆம், இல்லை, இருக்கலாம்"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr ""
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr ""
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr ""
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr ""
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr ""
@@ -875,27 +941,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"
@@ -925,141 +991,141 @@ msgstr ""
#: utils/dates.py:45
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "ஜனவரி"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "பிப்ரவரி"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "மார்ச்"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "ஏப்ரல்"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "மே"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "ஜூன்"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "ஜூலை"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "ஆகஸ்டு"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "செப்டம்பர்"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "அக்டோபர்"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "நவம்பர்"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
+msgstr "டிசம்பர்"
+
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:136
+#: utils/text.py:234
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ""
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "வருடம்"
msgstr[1] "வருடங்கள்"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "மாதம்"
msgstr[1] "மாதங்கள்"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "வாரம்"
msgstr[1] "வாரங்கள்"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "நாள்"
msgstr[1] "நாட்கள்"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "மணி"
msgstr[1] "மணி"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "நிமிடம்"
msgstr[1] "நிமிடங்கள்"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
-msgstr ""
+msgstr "நிமிடங்கள்"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr ""
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "தேதி_முறை"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "தேதிநேரம்_முறை"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "நேரம்_முறை"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "வருடம்_மாதம்_முறை"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "மாதம்_நாள்_முறை"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1092,19 +1158,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1114,16 +1180,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 64cadea33c..393f0a959d 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 16eab63558..0dfb6db75d 100644
--- a/django/conf/locale/te/LC_MESSAGES/django.po
+++ b/django/conf/locale/te/LC_MESSAGES/django.po
@@ -1,708 +1,782 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# <prudhviy@gmail.com>, 2011.
+# Veeven <veeven@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-14 14:52+0000\n"
-"Last-Translator: veeven <veeven@gmail.com>\n"
-"Language-Team: Telugu <>\n"
+"POT-Creation-Date: 2012-03-14 00:11-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: bhaskar teja yerneni <prudhviy@gmail.com>\n"
+"Language-Team: Telugu (http://www.transifex.net/projects/p/django/language/"
+"te/)\n"
+"Language: te\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "ఆరబిక్"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "అజేర్బైజని "
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "బల్గేరియన్"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "బెంగాలీ"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "బోస్నియన్"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "కాటలాన్"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "ఛెక్"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "వెల్ష్"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "డానిష్"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "జెర్మన్"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "గ్రీక్"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "ఆంగ్లం"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "బ్రిటీష్ ఆంగ్లం"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "స్పానిష్"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "అర్జెంటీనా స్పానిష్"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
+msgstr "మెక్షికన్ స్పానిష్ "
+
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "ఎస్టొనియన్"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "బాస్క్"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "పారసీ"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "ఫీన్నిష్"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ఫ్రెంచ్"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "ఫ్రిసియన్"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "ఐరిష్"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "గలిసియన్"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "హీబ్రూ"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "హిందీ"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "క్రొయేషియన్"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "హంగేరియన్"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "ఇండోనేషియన్"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "ఐస్లాండిక్"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "ఇటాలియవ్"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "జపనీ"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "జార్జియన్"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "ఖ్మెర్"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "కన్నడ"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "కొరియన్"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "లిథుయేనియన్"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "లాత్వియన్"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "మెసిడోనియన్"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "మలయాళం"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "మంగోలియన్"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "డచ్"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "నార్వీజియన్"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "నోర్వేగియన్ బొక్మల్ "
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "నోర్వేగియన్ న్య్నోర్స్క్ "
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "పంజాబీ"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "పొలిష్"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "పోర్చుగీస్"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "బ్రజీలియన్ పోర్చుగీస్"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "రొమానియన్"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "రష్యన్"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "స్లొవాక్"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "స్లొవానియన్"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "అల్బేనియన్"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "సెర్బియన్"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "సెర్బియన్ లాటిన్"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "స్వీడిష్"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "తమిళం"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "తెలుగు"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "థాయి"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "టర్కిష్"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ఉక్రేనియన్"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "ఉర్దూ"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "వియెత్నామీ"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "సరళ చైనీ"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "సాంప్రదాయ చైనీ"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "సరైన విలువని ఇవ్వండి."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "సరైన URL ఇవ్వండి."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "సరైన ఈమెయిలు చిరునామాను ఇవ్వండి."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "దయచేసి సరైన IPv4 అడ్రస్ ఇవ్వండి"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "కామాల తో అంకెలు విడడీసి ఇవ్వండి "
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
+msgstr "దయచేసి దీని విలువ %(limit_value)s కు సమానముగా లేక తక్కువగా ఉండేట్లు చూసుకొనుము."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
+msgstr "దయచేసి దీని విలువ %(limit_value)s కు సమానముగా లేక ఎక్కువగా ఉండేట్లు చూసుకొనుము."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
+"దయచేసి ఈ విలువ యొక్క పొడువు కనీసం %(limit_value)d అక్షరములు ఉండేట్లు చూసుకొనుము. ( మీరు "
+"సమర్పించిన విలువ లో %(show_value)d అక్షరములు వున్నవి )"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
+"దయచేసి ఈ విలువ యొక్క పొడువు %(limit_value)d అక్షరములు మాత్రమే ఉండేట్లు చూసుకొనుము. (మీరు "
+"సమర్పించిన విలువ లో %(show_value)d అక్షరములు వున్నవి )"
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "మరియు"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "మరియు"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "ఈ ఫీల్డ్ కాళీగా ఉందకూడడు "
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "ఈ ఖాళీని తప్పనిసరిగా పూరించాలి"
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: 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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "పూర్ణసంఖ్య"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "ఈ విలువ తప్పనిసరిగా పూర్ణసంఖ్య అయివుండాలి."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "ఈ విలువ తప్పనిసరిగా సత్యము లేదా అసత్యము అయివుండాలి."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "బూలియన్ (అవునా లేక కాదా)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "పదబంధం (గరిష్ఠం %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "కామా తో విడడీసిన సంఖ్య"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "తేదీ (సమయం లేకుండా)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "సరైన తేదీని (YYYY-MM-DD రూపంలో) ఇవ్వండి."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "చెల్లని తేదీ: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]] రూపంలో) ఇవ్వండి."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "తేది (సమయం తో)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "దశగణసంఖ్య"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "ఇటపా"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "ఫైల్ పాత్"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "ఐపీ చిరునామా"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "పాఠ్యం"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "సమయం"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "దయచేసి సరైన సమయం (HH:MM[:ss[.uuuuuu]] రూపలావన్యం) ఇవ్వండి"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "ఎక్స్ ఎమ్ ఎల్"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "\"Control\" కాని \"Command\" మాక్ లో నొక్కి ఉంచండి , ఒకటి కన్న ఎక్కువ ఎన్నుకోవటానికి"
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "ఈ ఫీల్డ్ అవసరము"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "పూర్ణ సంఖ్య ఇవ్వండి"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "దయచేసి పూర్ణ సంఖ్య ఇవ్వండి"
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr ""
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr ""
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "దయచేసి సరైన తేది ఇవ్వండి."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "దయచేసి సరైన సమయం ఇవ్వండి."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "దయచేసి సరైన తెది/సమయం ఇవ్వండి."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
-msgstr ""
+msgstr "ఫైలు సమర్పించబడలేదు."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "మీరు సమర్పించిన ఫైల్ కాళీగా ఉంది "
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
-msgstr ""
+msgstr "సరైన విలువల జాబితాను ఇవ్వండి."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "అంతరము"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "తొలగించు"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
+msgstr "దయచేసి %(field)s యొక్క నకలు విలువను సరిదిద్దుకోండి."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
+msgstr "దయచేసి %(field)s యొక్క నకలు విలువను సరిదిద్దుకోండి. దీని విలువ అద్వితీయమయినది "
-#: forms/models.py:566
+#: forms/models.py:581
#, 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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
-msgstr ""
+msgstr "దయచేసి క్రింద ఉన్న నకలు విలువను సరిదిద్దుకోండి."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/widgets.py:299
-msgid "Currently"
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:300
+#: forms/widgets.py:325
+msgid "Currently"
+msgstr "ప్రస్తుతము "
+
+#: forms/widgets.py:326
msgid "Change"
msgstr "మార్చు"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "తెలియనది"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "అవును"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "కాదు"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "అవును, కాదు , ఏమొ"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d బైటు"
msgstr[1] "%(size)d బైట్లు"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s కిబై"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s మెబై"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s గిబై"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "అర్ధరాత్రి"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "మధ్యాహ్నం"
@@ -978,84 +1052,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "డిసెంబర్"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "లేదా"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "సంవత్సరం"
msgstr[1] "సంవత్సరాలు"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "నెల"
msgstr[1] "నెలలు"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "వారం"
msgstr[1] "వారాలు"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "రోజు"
msgstr[1] "రోజులు"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "గంట"
msgstr[1] "గంటలు"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "నిమిషం"
msgstr[1] "నిమిషాలు"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "నిమిషాలు"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1088,19 +1162,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1110,16 +1184,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 7200bef037..0882c2c168 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 c020ff7524..e38886b667 100644
--- a/django/conf/locale/th/LC_MESSAGES/django.po
+++ b/django/conf/locale/th/LC_MESSAGES/django.po
@@ -1,711 +1,784 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Kowit Charoenratchatabhan <kowito@gmail.com>, 2012.
+# Suteepat Damrongyingsupab <monkeycrew_topza@hotmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: jonathanz <monkeycrew_topza@hotmail.com>\n"
-"Language-Team: Thai <>\n"
+"POT-Creation-Date: 2012-03-14 00:11-0700\n"
+"PO-Revision-Date: 2012-03-09 03:28+0000\n"
+"Last-Translator: Kowit Charoenratchatabhan <kowito@gmail.com>\n"
+"Language-Team: Thai (http://www.transifex.net/projects/p/django/language/"
+"th/)\n"
+"Language: th\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: th\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "อารบิก"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
-msgstr ""
+msgstr "อาเซอร์ไบจาน"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "บัลแกเรีย"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "เบ็งกาลี"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "บอสเนีย"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "คาตะลาน"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "เช็ก"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "เวลส์"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "เดนมาร์ก"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "เยอรมัน"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "กรีก"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "อังกฤษ"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "อังกฤษ - สหราชอาณาจักร"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "สเปน"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "สเปน - อาร์เจนติน่า"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
-msgstr ""
+msgstr "เม็กซิกันสเปน"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "นิการากัวสเปน"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "เอสโตเนีย"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "แบ็ซค์"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "เปอร์เชีย"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "ฟินแลนด์"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "ฝรั่งเศส"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "ฟริเซียน"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "ไอริช"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "กาลิเซีย"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "ฮีบรู"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "ฮินดี"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "โครเอเชีย"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ฮังการี"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "อินโดนิเซีย"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "ไอซ์แลนด์"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "อิตาลี"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "ญี่ปุ่น"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "จอร์เจีย"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "เขมร"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "กัณณาท"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "เกาหลี"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "ลิทัวเนีย"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "ลัตเวีย"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "มาซิโดเนีย"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "มลายู"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "มองโกเลีย"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "ดัตช์"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "นอร์เวย์"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "นอร์เวย์ - Bokmal"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "นอร์เวย์ - Nynorsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "ปัญจาบี"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "โปแลนด์"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "โปรตุเกส"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "โปรตุเกส (บราซิล)"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "โรมาเนีย"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "รัสเซีย"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "สโลวัก"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "สโลวีเนีย"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "อัลแบเนีย"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "เซอร์เบีย"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "เซอร์เบียละติน"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "สวีเดน"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "ทมิฬ"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "เตลุคู"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "ไทย"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "ตุรกี"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "ยูเครน"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
-msgstr ""
+msgstr "เออร์ดู"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "เวียดนาม"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "จีนตัวย่อ"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "จีนตัวเต็ม"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "กรุณาใส่ค่าที่ถูกต้อง"
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL อาจจะเป็นลิ้งค์ที่เสียหาย."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "ใส่ URL ที่ถูกต้อง"
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "กรุณาใส่อีเมลที่ถูกต้อง"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "ใส่ 'slug' ประกอปด้วย ตัวหนังสือ ตัวเลข เครื่องหมายขีดล่าง หรือ เครื่องหมายขีด"
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "กรุณาใส่หมายเลขไอพีที่ถูกต้อง"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "กรอก IPv6 address ให้ถูกต้อง"
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "กรอก IPv4 หรือ IPv6 address ให้ถูกต้อง"
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "ใส่ตัวเลขที่คั่นด้วยจุลภาคเท่านั้น"
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "ค่านี้ต้องน้อยกว่าหรือเท่ากับ %(limit_value)s"
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "ค่านี้ต้องมากกว่าหรือเท่ากับ %(limit_value)s"
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"ค่านี้ต้องมีอย่างน้อย %(limit_value)d ตัวอักษร (ปัจจุบันมีจำนวน %(show_value)d ตัวอักษร)"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr "ค่านี้มีได้ไม่เกิน %(limit_value)d ตัวอักษร (ปัจจุบันมีจำนวน %(show_value)d ตัวอักษร)"
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "และ"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s และ %(field_label)s มีอยู่แล้ว"
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "และ"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "ค่า %r ไม่ถูกต้อง"
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "ฟิลด์นี้ไม่สารถปล่อยว่างได้"
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "ฟิลด์นี้เว้นว่างไม่ได้"
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "จำนวนเต็ม"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "ค่านี้ต้องเป็นจำนวนเต็ม"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "ค่าของ '%s' ต้องเป็น integer"
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "ค่านี้ต้องเป็นถูกหรือผิด"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "ค่าของ '%s' ต้องเป็น True หรือ False อย่างใดอย่างหนึ่ง"
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "ตรรกะแบบบูลหมายถึง ค่า\"จริง\" (True) หรือ \"ไม่จริง \" (False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "สตริง(ได้ถึง %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "จำนวนเต็มแบบมีจุลภาค"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "ค่าของ '%s' มีรูปแบบไม่ถูกต้อง แต่ควรจะอยู่ในรูปแบบ YYYY-MM-DD"
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr "ค่าของ '%s' อยู่ในรูปแบบที่ถูกต้อง (YYYY-MM-DD) แต่เลขวันที่ผิด"
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "วันที่ (ไม่มีเวลา)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "ใส่วันที่ในรูปแบบ YYYY-MM-DD"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "วันที่ไม่ถูกต้อง: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"ค่าของ '%s' มีรูปแบบไม่ถูกต้อง แต่ควรจะอยู่ในรูปแบบ YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]"
-#: 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]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"ค่าของ '%s' อยู่ในรูปแบบที่ถูกต้อง (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) แต่ วันที่/เวลา "
+"ผิด"
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "วันที่ (พร้อมด้วยเวลา)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "ค่านี้ต้องเป็นเลขฐานสิบหรือเลขทศนิยม"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "ค่าของ '%s' ต้องเป็นตัวเลขฐานสิบ"
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "เลขฐานสิบหรือเลขทศนิยม"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "ที่อยู่อีเมล"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "ตำแหน่งไฟล์"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "ค่านี้ต้องเป็นชนิด float หรือตัวเลขจุดทศนิยม"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "ค่าของ '%s' ต้องเป็นตัวเลขที่มีจุดทศนิยม"
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "เลขทศนิยม"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "จำนวนเต็ม (8 byte)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 address"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "หมายเลขไอพี"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "ค่านี้ต้องเป็นอย่างใดอย่างหนึ่ง None, True หรือ False"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "ค่าของ '%s' ต้องเป็น None หรือ True หรือ False อย่างใดอย่างหนึ่ง"
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr ""
"ตรรกะแบบบูลหมายถึง ค่า\"จริง\" (True) หรือ \"ไม่จริง \" (False) หรือ \"ไม่มี\" (None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "จํานวนเต็มบวก"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "จํานวนเต็มบวกขนาดเล็ก"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (ถึง %(max_length)s )"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "จำนวนเต็มขนาดเล็ก"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "ข้อความ"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr "ค่าของ '%s' มีรูปแบบไม่ถูกต้อง แต่ควรจะอยู่ในรูปแบบ HH:MM[:ss[.uuuuuu]]"
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr "ค่าของ '%s' อยู่ในรูปแบบที่ถูกต้อง (HH:MM[:ss[.uuuuuu]]) แต่เวลาผิด"
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "เวลา"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "ใส่เวลาในรูปแบบ HH:MM[:ss[.uuuuuu]]"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "ข้อความ XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "ไฟล์"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "รูปภาพ"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (ชนิดของข้อมูลจะถูกกำหนดจากฟิลด์ที่เกี่ยวข้อง)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "ความสัมพันธ์แบบหนึ่งต่อหนึ่ง"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "ความสัมพันธ์แบบ many-to-many"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "กดปุ่ม \"Control\", หรือ \"Command\" บน Mac ค้างไว้, เพื่อเลือกหลายๆตัวเลือก"
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "ฟิลด์นี้จำเป็น"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "กรอกหมายเลข"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "กรอกหมายเลข"
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s หลัก."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "แน่ใจว่ารวมแล้วเป็นทศนิยมไม่เกิน %s หลัก."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s หลัก ก่อนจุดทศนิยม."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "กรุณาใส่วัน"
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "กรุณาใส่เวลา"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "กรุณาใส่วันเวลา"
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "ไม่มีไฟล์ใดถูกส่ง. ตรวจสอบ encoding type ในฟอร์ม."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "ไม่มีไฟล์ใดถูกส่ง"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "ไฟล์ที่ส่งว่างเปล่า"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "โปรดเลือกไฟล์หรือติ๊ก clear checkbox อย่างใดอย่างหนึ่ง"
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "ใส่รายการ"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "เรียงลำดับ"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "ลบ"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "โปรดแก้ไขข้อมูลที่ซ้ำซ้อนใน %(field)s"
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "โปรดแก้ไขข้อมูลที่ซ้ำซ้อนใน %(field)s ซึ่งจะต้องไม่ซ้ำกัน"
-#: forms/models.py:566
+#: forms/models.py:581
#, 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"
+"โปรดแก้ไขข้อมูลซ้ำซ้อนใน %(field_name)s ซึ่งจะต้องไม่ซ้ำกันสำหรับ %(lookup)s ใน "
+"%(date_field)s"
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "โปรดแก้ไขค่าที่ซ้ำซ้อนด้านล่าง"
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Foreign key ไม่สัมพันธ์กับ parent primary key"
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "เลือกตัวเลือกที่ถูกต้อง. ตัวเลือกนั้นไม่สามารถเลือกได้."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "เลือกตัวเลือกที่ถูกต้อง. %s ไม่สามารถเลือกได้"
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" ใช้เป็น primary key ไม่ได้"
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s ไม่สามารถแปลงให้อยู่ใน %(current_timezone)s time zone ได้ เนื่องจาก "
+"time zone ไม่ชัดเจน หรือไม่มีอยู่จริง"
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "ปัจจุบัน"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "เปลี่ยนแปลง"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "ล้าง"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "ไม่รู้"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "ใช่"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "ไม่ใช่"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ใช่,ไม่ใช่,อาจจะ"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ไบต์"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "เที่ยงคืน"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "เที่ยงวัน"
@@ -981,78 +1054,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "ธันวาคม"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "หรือ"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "ปี"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "เดือน"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "สัปดาห์"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "วัน"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "ชั่วโมง"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "นาที"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "นาที"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j N Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "G:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "ไม่ได้รับอนุญาตให้ใช้ Directory indexes ที่นี่"
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" ไม่มีอยู่"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "ดัชนีของ %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1071,52 +1144,54 @@ msgstr "%(verbose_name)s ได้ถูกลบเรียบร้อยแ
#: views/generic/dates.py:33
msgid "No year specified"
-msgstr ""
+msgstr "ไม่ระบุปี"
#: views/generic/dates.py:58
msgid "No month specified"
-msgstr ""
+msgstr "ไม่ระบุเดือน"
#: views/generic/dates.py:99
msgid "No day specified"
-msgstr ""
+msgstr "ไม่ระบุวัน"
#: views/generic/dates.py:138
msgid "No week specified"
-msgstr ""
+msgstr "ไม่ระบุสัปดาห์"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
-msgstr ""
+msgstr "ไม่มี %(verbose_name_plural)s ที่ใช้ได้"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
+"%(verbose_name_plural)s ในอนาคตไม่สามารถใช้ได้ เนื่องจาก %(class_name)s."
+"allow_future มีค่าเป็น False"
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-msgstr ""
+msgstr "สตริงค์ '%(datestr)s' ของวันไม่ถูกต้องกับฟอร์แมต '%(format)s'"
#: views/generic/detail.py:51
#, python-format
msgid "No %(verbose_name)s found matching the query"
-msgstr ""
+msgstr "ไม่พบ %(verbose_name)s จาก query"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
-msgstr ""
+msgstr "ไม่ใช่หน้าสุดท้าย และไม่สามารถค่าแปลงเป็น int ได้"
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
-msgstr ""
+msgstr "เลขหน้าผิด (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
-msgstr ""
+msgstr "list ว่างเปล่า และ '%(class_name)s.allow_empty' มีค่าเป็น False"
diff --git a/django/conf/locale/tr/LC_MESSAGES/django.mo b/django/conf/locale/tr/LC_MESSAGES/django.mo
index 51e9c21e03..6c042da5fc 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 2f32fd5dfe..b836f54e08 100644
--- a/django/conf/locale/tr/LC_MESSAGES/django.po
+++ b/django/conf/locale/tr/LC_MESSAGES/django.po
@@ -1,569 +1,640 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# <cihadgundogdu@gmail.com>, 2012.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Metin Amiroff <amiroff@gmail.com>, 2011.
+# Murat Çorlu <muratcorlu@gmail.com>, 2012.
+# Murat Sahin <martinamca@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:11-0400\n"
-"PO-Revision-Date: 2011-03-04 21:16+0000\n"
-"Last-Translator: martinamca <martinamca@gmail.com>\n"
-"Language-Team: Turkish <None>\n"
+"POT-Creation-Date: 2012-03-14 00:11-0700\n"
+"PO-Revision-Date: 2012-03-08 19:45+0000\n"
+"Last-Translator: Murat Çorlu <muratcorlu@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.net/projects/p/django/language/"
+"tr/)\n"
+"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Arapça"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerice"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Bulgarca"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengali Dili"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Boşnakça"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Katalanca"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Çekçe"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Galce"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Danca"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Almanca"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Yunanca"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "İngilizce"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "İngiltere İngilizce"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "İspanyolca"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Arjantin İspanyolcası"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Meksika İspanyolcası"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Nikaragua İspanyolcası"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Estonca"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Baskça"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Farsça"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Fince"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Fransızca"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Frisce"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "İrlandaca"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Galler Dili"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "İbranice"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Hinduca"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Hırvatça"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Macarca"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Endonezce"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "İzlanda dili"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "İtalyanca"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Japonca"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Gürcüce"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Kamboçyaca"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Kannada Dili"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Korece"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Litovca"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Leton Dili"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Makedonca"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Malayamca"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Moğolca"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Flamanca"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Norveç Dili"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Norveçce (Bokmal)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Norveçce (Nynorsk)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabice"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Lehçe"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Portekizce"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brezilya Portekizcesi"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Romence"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Rusça"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Slovakça"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Slovence"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Arnavutça"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Sırpça"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Sırp Latini"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "İsveççe"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tamilce"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu Dili"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tayca"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Türkçe"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Ukraynaca"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urduca"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Vietnamca"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Basiteştirilmiş Çince"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Geleneksel Çince"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Geçerli bir değer girin."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "Bu URL geçersiz bir link gibi duruyor."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Geçerli bir URL girin."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Geçerli bir e-posta adresi girin."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Geçerli bir IPv4 adresi girin."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Geçerli bir IPv6 adresi girin."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Geçerli bir IPv4 veya IPv6 adresi girin"
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Sadece virgülle ayrılmış sayılar girin."
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, 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:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, 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:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
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:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
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:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "ve"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "ve"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "%r değeri geçerli bir seçim değil."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Bu alan boş bırakılamaz."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Bu alan boş bırakılamaz. "
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Alan türü: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Tamsayı"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Bu değer tamsayı olmalı."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' değeri bir tamsayı olmalıdır."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Bu değer True ya da False olabilir."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' değeri Doğru ya da Yanlış olması gerekir."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Mantıksal (True ya da False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Karakter disizi (en fazla %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Virgülle ayrılmış tamsayılar"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr "'%s' geçersiz tarih formatı. YYYY-AA-GG biçiminde olmalıdır."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"'%s' değeri doğru bir biçime sahip (YYYY-MM-DD) ancak bu geçersiz bir tarih."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Tarih (saat yok)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "YYYY-AA-GG formatında tarih girin."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Geçersiz tarih: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' değeri geçersiz bir biçime sahip. YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] "
+"biçiminde olması gerekiyor."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"YYYY-MM-DD HH:MM[:ss[.uuuuuu]] formatında geçerli bir tarih ve saat girin."
+"'%s' biçimsel olarak doğru (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) ancak bu "
+"geçersiz bir tarih/zaman."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Tarih (saat var)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Bu değer ondalık sayı olmalıdır."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' değeri bir ondalık sayı olmalıdır."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Ondalık sayı"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Dosya yolu"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Bu değer ondalık sayı olmalı."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' değeri float olmalı"
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Floating point rakamı"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Büyük (8 bayt) integer"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 adresi"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP adresi"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Bu değer None, True ya da False olabilir."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' değeri None, True veya False olmak zorundadır."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Mantıksal (True, False, ya da None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Positif sayı"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Pozitif küçük sayı"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Slug (%(max_length)s karaktere kadar)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Küçük sayı"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Metin"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' değerinin geçersiz bir biçimi var. Bunun HH:MM[:ss[.uuuuuu]] biçiminde "
+"olması gerekiyor."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' değeri doğru biçime sahip (HH:MM[:ss[.uuuuuu]]) ancak bu geçersiz bir "
+"zaman."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Saat"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "HH:MM[:ss[.uuuuuu]] formatında geçerli bir saat girin."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML metni"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Dosya"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Resim"
+
+#: db/models/fields/related.py:903
#, 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:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Yabancı Anahtar (türü ilişkili alana göre belirlenir)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Bire-bir ilişki"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Çoğa-çok ilişki"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"\"Ctrl\" (Mac'de \"Command\") tuşunu basılı tutularak birden fazla seçim "
"yapılabilir."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Bu alan zorunludur."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Tam sayı girin."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Bir sayı girin."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Toplamda en fazla %s sayının olduğundan emin olun."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "En fazla %s onluk yerin olduğundan emin olun."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Onluk kısımdan önce en fazla %s sayı olduğundan emin olun."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Geçerli bir tarih girin."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Geçerli bir zaman girin."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Geçerli bir tarih/zaman girin."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Dosya gönderilmedi. Formdaki kodlama türünü kontrol edin."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Hiçbir dosya gönderilmedi."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Gönderilen dosya boş."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -571,13 +642,13 @@ msgstr ""
"Bu dosya adının en fazla %(max)d karakterden oluştuğundan emin olun (şu anki "
"karakter sayısı: %(length)d)."
-#: forms/fields.py:464
+#: forms/fields.py:489
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
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -585,149 +656,158 @@ msgstr ""
"Geçerli bir resim girin. Gönderdiğiniz dosya resim değil, ya da bozuk bir "
"dosya."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Değer listesi giriniz."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Sıralama"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Sil"
-#: forms/models.py:556
+#: forms/models.py:571
#, 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:560
+#: forms/models.py:575
#, 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:566
+#: forms/models.py:581
#, 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 ""
-"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."
+"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:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Lütfen aşağıdaki mükerrer kayıtları düzeltin."
-#: forms/models.py:835
+#: forms/models.py:849
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:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, 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:988
+#: forms/models.py:1002
#, 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
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+" %(datetime)s %(current_timezone)s saat dilimine yorumlanamadı; bu belirsiz "
+"olabilir ya da olmayabilir."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Geçerli"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Düzenle"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Sıfırla"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Bilinmiyor"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Evet"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Hayır"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "evet,hayır,olabilir"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bayt"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "ö.s."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "ö.ö."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "ÖS"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "ÖÖ"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "gece yarısı"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "öğlen"
@@ -1003,78 +1083,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "Aralık"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "ya da"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "yıl"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "ay"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "hafta"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "gün"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "saat"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "dakika"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "dakika"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "j F Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "j F Y, H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Klasör indeksi görünümü kapalı."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" yok"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "j F"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "%(directory)s indeksi"
#: views/generic/create_update.py:121
#, python-format
@@ -1107,12 +1187,12 @@ msgstr "Gün bilgisi belirtilmedi"
msgid "No week specified"
msgstr "Hafta bilgisi belirtilmedi"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Mevcut %(verbose_name_plural)s kaydı bulunamadı"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1121,7 +1201,7 @@ msgstr ""
"Gelecek %(verbose_name_plural)s mevcut değil, çünkü %(class_name)s."
"allow_future değeri False olarak tanımlıdır."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Geçersiz tarih dizisi: '%(datestr)s', format: '%(format)s' "
@@ -1131,16 +1211,16 @@ msgstr "Geçersiz tarih dizisi: '%(datestr)s', format: '%(format)s' "
msgid "No %(verbose_name)s found matching the query"
msgstr "Sorguya uygun herhangi bir %(verbose_name)s bulunamadı"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "Sayfa 'sonuncu' değil, veya int'e çevirilemez."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Geçersiz sayfa (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Liste boş ve '%(class_name)s.allow_empty' değeri False olarak tanımlı."
diff --git a/django/conf/locale/uk/LC_MESSAGES/django.mo b/django/conf/locale/uk/LC_MESSAGES/django.mo
index c789b409a4..e0ad1584ae 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 0e7d5da3c0..5cca771d49 100644
--- a/django/conf/locale/uk/LC_MESSAGES/django.po
+++ b/django/conf/locale/uk/LC_MESSAGES/django.po
@@ -1,581 +1,653 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Boryslav Larin <brabadu@gmail.com>, 2011.
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Sergey Lysach <sergikoff88@gmail.com>, 2011, 2012.
+# Sergiy Kuzmenko <s.kuzmenko@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:12-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: shelldweller <s.kuzmenko@gmail.com>\n"
-"Language-Team: Ukrainian <>\n"
+"POT-Creation-Date: 2012-03-14 00:11-0700\n"
+"PO-Revision-Date: 2012-03-11 16:00+0000\n"
+"Last-Translator: Sergey Lysach <sergikoff88@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.net/projects/p/django/"
+"language/uk/)\n"
+"Language: uk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: uk\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"
+"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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Арабська"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Азербайджанська"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Болгарська"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Бенгальська"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Боснійська"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Каталонська"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Чеська"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Валлійська"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Датська"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Німецька"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Грецька"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Англійська"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "Англійська (Великобританія)"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Іспанська"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Іспанська (Аргентина)"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Мексиканьска (іспанська)"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "Нікарагуанська іспанська"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Румунська"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Баскська"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Перська"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Фінська"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "Французька"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Фризька"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Ірландська"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Галіційська"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Іврит"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Хінді"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Хорватська"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Угорська"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Індонезійська"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Ісландська"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Італійська"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Японська"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Грузинська"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Кхмерська"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Канадська"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Корейська"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Литовська"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Латвійська"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Македонська"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Малаялам"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Монгольська"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Голландська"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "Норвезька"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Норвезька (Букмол)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Норвезька (Нюнорськ)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Панджабі"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Польська"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Португальська"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Бразильска"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Румунська"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Російська"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Словацька"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Словенська"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Албанська"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Сербська"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Сербська (латинська)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Шведська"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Тамільська"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Телугу"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Тайська"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Турецька"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Українська"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Урду"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "В'єтнамська"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Китайська спрощена"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Китайська традиційна"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Уведіть коректне значення."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL %s є пошкодженим посиланням."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Уведіть коректний URL."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Уведіть коректну e-mail адресу."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Введіть коректне значення 'slug' (короткого заголовку), що може містити "
"тільки літери, числа, символи підкреслювання та дефіси."
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Введіть коректну IPv4 адресу."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "Введіть дійсну IPv6 адресу."
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr "Введіть дійсну IPv4 чи IPv6 адресу."
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "Введіть тільки цифри, що розділені комами."
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Переконайтеся, що це значення дорівнює %(limit_value)s (зараз %(show_value)"
-"s)."
+"Переконайтеся, що це значення дорівнює %(limit_value)s (зараз "
+"%(show_value)s)."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Переконайтеся, що це значення менше чи дорівнює %(limit_value)s."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Переконайтеся, що це значення більше чи дорівнює %(limit_value)s."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Переконайтеся, що це значення має щонайменше %(limit_value)d символів (зараз "
"%(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Переконайтеся, що це значення має щонайбільше %(limit_value)d символів "
"(зараз %(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "та"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s з таким %(field_label)s вже існує."
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "та"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Значення %r не є дозволеним вибором."
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Це поле не може бути пустим."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Це поле не може бути порожнім."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Ціле число"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Це значення має бути цілим числом."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' значення повинне бути цілим числом."
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Це значення повинно бути True або False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr "'%s' значення повинне бути True або False."
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Булеве значення (True або False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Рядок (до %(max_length)s)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Цілі, розділені комою"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+"'%s' значення має невірний формат дати. Вона повинна бути у форматі YYYY-MM-"
+"DD."
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+"'%s' значення має правильний формат (YYYY-MM-DD), але це недійсна дата."
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Дата (без часу)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Уведіть правильну дату у форматі РРРР-ММ-ДД."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Неправильна дата: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+"'%s' значення має невірний формат. Воно повинне бути у форматі YYYY-MM-DD HH:"
+"MM[:ss[.uuuuuu]][TZ]."
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Введіть коректну дату у форматі РРРР-ММ-ДД[:сс[.мммммм]]."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
+"'%s' значення має вірний формат (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) але це "
+"невірна дата/час."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Дата (з часом)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Це значення повинно бути десятковим числом."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr "'%s' значення повинне бути десятковим числом."
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Десяткове число"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "E-mail адреса"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Шлях до файла"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Це значення має бути дійсним числом."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr "'%s' значення повинне бути числом з плаваючою крапкою."
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Число з плаваючою комою"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Велике (8 байтів) ціле число"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr "IPv4 адреса"
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP адреса"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Це значення повинно бути None, True або False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr "'%s' значення повинне бути None, True або False."
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Булеве значення (включаючи True, False або None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr "Додатнє ціле число"
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr "Додатнє мале ціле число"
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr "Слаг (до %(max_length)s)"
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr "Мале ціле число"
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Текст"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+"'%s' значення має невірний формат. Воно повинне бути у форматі HH:MM[:ss[."
+"uuuuuu]]."
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+"'%s' значення має вірний формат (HH:MM[:ss[.uuuuuu]]) але це недійсний час."
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Час"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Уведіть коректний час у форматі ГГ:ХХ[:сс[.мммммм]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "текст XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr "Файл"
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr "Зображення"
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Моделі %(model)s з ключем %(pk)r не існує."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Зовнішній ключ (тип визначається відповідно поля)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Один-до-одного"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Багато-до-багатьох"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Затисніть клавішу \"Control\", або \"Command\" на Маку, щоб обрати більше "
"однієї опції."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Це поле обов'язкове."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Введіть ціле число."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Введіть число."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Переконайтеся, що тут не більше ніж %s цифр загалом."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Переконайтеся, що тут не більше ніж %s цифр після десяткової коми."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Переконайтеся, що тут не більше ніж %s цифр до десяткової коми."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Введіть коректну дату."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Введіть коректний час."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Уведіть коректну дату/час адресу."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Файл не надіслано. Перевірте тип кодування форми."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Файл не було надіслано."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Переданий файл порожній."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
"Будь ласка, або завантажте файл, або відмітьте прапорець очищення, а не "
"обидва варіанти одразу"
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -583,36 +655,36 @@ msgstr ""
"Завантажте правильний малюнок. Файл, який ви завантажили, не є малюнком, або "
"є зіпсованим малюнком."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Введіть список значень."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Послідовність"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Видалити"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Будь ласка, виправте повторювані дані для поля %(field)s."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Будь ласка, виправте повторювані дані для поля %(field)s, яке має бути "
"унікальним."
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -621,59 +693,68 @@ msgstr ""
"Будь ласка, виправте повторювані дані для поля %(field_name)s, яке має бути "
"унікальним для вибірки %(lookup)s на %(date_field)s."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Будь ласка, виправте повторювані значення нижче."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Зв'язаний зовнішній ключ не відповідає первісному ключу батьківського "
"екземпляру."
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Зробить коректний вибір. Такого варіанту нема серед доступних."
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Зробить коректний вибір. Такого варіанту %s нема серед доступних."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" не є допустимим значенням для первинного ключа."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+"%(datetime)s не може бути інтерпретована в часовому поясі "
+"%(current_timezone)s; дата може бути неодзначною або виявитись неіснуючою."
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Наразі"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Змінити"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Очистити"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Невідомо"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Так"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Ні"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "так,ні,можливо"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -681,52 +762,52 @@ msgstr[0] "%(size)d байт"
msgstr[1] "%(size)d байти"
msgstr[2] "%(size)d байтів"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s Кб"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s Мб"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s Гб"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s Тб"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s Пб"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "після полудня"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "до полудня"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "після полудня"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "до полудня"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "північ"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "полудень"
@@ -1002,90 +1083,90 @@ msgctxt "alt. month"
msgid "December"
msgstr "грудня"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr "%(truncated_text)s..."
+
+#: utils/text.py:234
msgid "or"
msgstr "або"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "рік"
msgstr[1] "роки"
msgstr[2] "років"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "місяць"
msgstr[1] "місяці"
msgstr[2] "місяців"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "тиждень"
msgstr[1] "тижні"
msgstr[2] "тижнів"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "день"
msgstr[1] "дні"
msgstr[2] "днів"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "година"
msgstr[1] "години"
msgstr[2] "годин"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "хвилина"
msgstr[1] "хвилини"
msgstr[2] "хвилин"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "хвилин(а)"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "d.m.Y"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "d.m.Y H:i"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr "Перегляд списку файлів у цій директорії не дозволений."
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i"
-
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "d.m.Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr "\"%(path)s\" не існує"
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "d.m.Y"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr "Вміст директорії %(directory)s"
#: views/generic/create_update.py:121
#, python-format
@@ -1118,12 +1199,12 @@ msgstr "День не вказано"
msgid "No week specified"
msgstr "Тиждень не вказано"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s недоступні"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1132,7 +1213,7 @@ msgstr ""
"Майбутні %(verbose_name_plural)s недоступні, тому що %(class_name)s."
"allow_future має нульове значення."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Недійсна дата '%(datestr)s' для формату '%(format)s'"
@@ -1142,18 +1223,18 @@ msgstr "Недійсна дата '%(datestr)s' для формату '%(format)
msgid "No %(verbose_name)s found matching the query"
msgstr "Жодні %(verbose_name)s не були знайдені по запиту"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Неправильна величина параметра сторінки: вона повинна бути задана цілим "
"числом або значенням 'last'."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Недійсний номер сторінки (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Порожній список і величина '%(class_name)s.allow_empty' є нульовою."
diff --git a/django/conf/locale/ur/LC_MESSAGES/django.mo b/django/conf/locale/ur/LC_MESSAGES/django.mo
index e590f67fa5..fb8bd5eecf 100644
--- a/django/conf/locale/ur/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ur/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ur/LC_MESSAGES/django.po b/django/conf/locale/ur/LC_MESSAGES/django.po
index db2b87e524..5aa6627c10 100644
--- a/django/conf/locale/ur/LC_MESSAGES/django.po
+++ b/django/conf/locale/ur/LC_MESSAGES/django.po
@@ -1,569 +1,628 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:12-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
-"Last-Translator: Mansoorulhaq <mansoorulhaq1986@gmail.com>\n"
-"Language-Team: Urdu <None>\n"
+"POT-Creation-Date: 2012-03-14 00:11-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Mansoorulhaq Mansoor <mansoorulhaq1986@gmail.com>\n"
+"Language-Team: Urdu (http://www.transifex.net/projects/p/django/language/"
+"ur/)\n"
+"Language: ur\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "عربی"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "بلغاری"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "بنگالی"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "بوسنیائی"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "کیٹالانی"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "زیچ"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "ویلش"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "ڈینش"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "جرمن"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "گریک"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "انگلش"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "برطانوی انگلش"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "ھسپانوی"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "ارجنٹائنی سپینش"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "اسٹانین"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "باسک"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "فارسی"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "فنش"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "فرانسیسی"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "فریسی"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "آئرش"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "گیلیشین"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "عبرانی"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "ھندی"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "کروشن"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "ھونگارین"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "انڈونیشین"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "آئس لینڈک"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "اطالوی"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "جاپانی"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "جارجیائی"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "خمر"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "کناڈا"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "کوریائی"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "لیتھونیائی"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "لتوینی"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "میسیڈونین"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "ملایالم"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "منگولین"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "ڈچ"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "نارویائی"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "نارویائی بوکمال"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "نارویائی نینورسک"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "پنجابی"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "پولش"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "پورتگیز"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "برازیلی پورتگیز"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "رومانی"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "روسی"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "سلووک"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "سلووینین"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "البانوی"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "سربین"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "سربین لاطینی"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "سویڈش"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "تاملی"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "تیلگو"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "تھائی"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "ترکش"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "یوکرائنی"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "ویتنامی"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "سادی چینی"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "روایتی چینی"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "درست قیمت (ویلیو) درج کریں۔"
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "یہ یو آر ایل (URL) ٹوٹا ہوا رابطہ (لنک) معلوم ھوتا ھے۔"
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "درست یو آر ایل (URL) درج کریں۔"
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "برقی خط کا درست پتہ درج کریں۔"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "درست 'slug' درج کریں جو حروف، نمبروں، انڈرسکور یا ھائفنز پر مشتمل ھو۔"
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "IPv4 کا درست پتہ درج کریں۔"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "صرف اعداد درج کریں جو کوموں سے الگ کئے ھوئے ھوں۔"
-#: core/validators.py:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"اس بات کا یقین کر لیں کہ یہ قیمت (ویلیو) %(limit_value)s ھے۔ (یہ %"
-"(show_value)s ھے)%(show_value)s"
+"اس بات کا یقین کر لیں کہ یہ قیمت (ویلیو) %(limit_value)s ھے۔ (یہ "
+"%(show_value)s ھے)%(show_value)s"
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"اس بات کا یقین کر لیں کہ یہ قیمت (ویلیو) %(limit_value)s سے کم یا اس کے "
"برابر ھے۔"
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"اس بات کا یقین کر لیں کہ یہ قیمت (ویلیو) %(limit_value)s سے زیادہ یا اس کے "
"برابر ھے۔"
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"اس بات کا یقین کر لیں کہ اس قیمت (ویلیو) میں کم از کم %(limit_value)d حروف "
"ہیں۔ (اس میں %(show_value)d ہیں۔"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"اس بات کا یقین کر لیں کہ اس قیمت (ویلیو) میں زیادہ سے زیادہ %(limit_value)d "
"حروف ہیں۔ (اس میں %(show_value)d ھیں۔"
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "اور"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s اس %(field_label)s کے ساتھ پہلے ہی موجود ھے۔"
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "اور"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "قیمت (ویلیو) %r درست انتخاب نھیں ھے۔"
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "یہ خانہ نامعلوم (null( نھیں رہ سکتا۔"
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "یہ خانہ خالی نھیں چھوڑا جا سکتا۔"
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "صحیح عدد"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "اس قیمت (ویلیو) کا صحیح عدد ھونا ضروری ھے۔"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "اس قیمت (ویلیو) کا True یا False ھونا ضروری ھے۔"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "بولین (True یا False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "سلسلۂ حروف (String) (%(max_length)s تک)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr " کومے سے الگ کئے ھوئے صحیح اعداد"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "تاریخ (وقت کے بغیر)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "YYYY-MM-DD کی شکل میں درست تاریخ درج کریں۔"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "غلط تاریخ: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]] کی شکل میں درست تاریخ/وقت درج کریں۔"
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "تاریخ (بمع وقت)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "اس قیمت (ویلیو) کا اعشاری نمبر ھونا ضروری ھے۔"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "اعشاری نمبر"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "برقی خط کا پتہ"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "فائل کا راستہ(path("
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "اس قیمت (ویلیو) کا نقطۂ اعشاریہ والا ھونا ضروری ھے۔"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "نقطہ اعشاریہ والا نمبر"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "بڑا (8 بائٹ) صحیح عدد"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP ایڈریس"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "اس قیمت (ویلیو) کا None، True یا False ھونا ضروری ھے۔"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "بولین (True، False یا None("
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "متن"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "وقت"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "HH:MM[:ss[.uuuuuu]] کی شکل میں درست وقت درج کریں۔"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "یو آر ایل"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML متن"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "ماڈل %(model)s پرائمری کلید (PK) %(pk)r کے ساتھ موجود نھیں۔"
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "بیرونی کلید (FK( (قسم متعلقہ خانے سے متعین ھو گی)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "ون-ٹو-ون ریلیشن شپ"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "مینی-ٹو-مینی ریلیشن شپ"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"ایک سے زیادہ منتخب کرنے کے لئے \"Control\" دبا کر رکھیں۔ یا Mac OS پر "
"\"Command\""
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "یہ خانہ درکار ھے۔"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "مکمل نمبر درج کریں۔"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "نمبر درج کریں۔"
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "اس بات کا یقین کر لیں کہ کل %s سے زیادہ اعداد ھیں۔"
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "اس بات کا یقین کر لیں کہ %s سے زیادہ اعشاری مقامات نہیں۔"
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "اس بات کا یقین کر لیں کہ نقطۂ اعشاریہ سے پہلے %s سے زیادہ اعداد نہیں۔"
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "درست تاریخ درج کریں۔"
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "درست وقت درج کریں۔"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "درست تاریخ/وقت درج کریں۔"
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "کوئی فائل پیش نہیں کی گئی۔ فارم پر اینکوڈنگ کی قسم چیک کریں۔"
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "کوئی فائل پیش نہیں کی گئی تھی۔"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "پیش کی گئی فائل خالی ھے۔"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@@ -571,11 +630,11 @@ msgstr ""
"اس بات کا یقین کر لیں کہ اس فائل کے نام میں زیادہ سے زیادہ %(max)d حروف ہیں۔ "
"(اس میں %(length)d ہیں)"
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "براہ مھربانی فائل پیش کریں یا Clear checkbox منتخب کریں۔ نہ کہ دونوں۔"
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -583,146 +642,153 @@ msgstr ""
"درست تصویر اپ لوڈ کریں۔ جو فائل آپ نے اپ لوڈ کی تھی وہ تصویر نہیں تھی یا "
"خراب تصویر تھی۔"
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "قیمتوں (ویلیوز) کی لسٹ درج کریں۔"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "ترتیب"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "مٹائیں"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "براہ کرم %(field)s کے لئے دوہرا مواد درست کریں۔"
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"براہ کرم %(field)s کے لئے دوہرا مواد درست کریں جوکہ منفرد ھونا ضروری ھے۔"
-#: forms/models.py:566
+#: forms/models.py:581
#, 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 کے لئے منفرد ھونا ضروری ھے۔"
+"براہ کرم %(field_name)s میں دوہرا مواد درست کریں جو کہ %(date_field)s میں "
+"%(lookup)s کے لئے منفرد ھونا ضروری ھے۔"
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "براہ کرم نیچے دوہری قیمتیں (ویلیوز) درست کریں۔"
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "ان لائن بیرونی کلید (FK) آبائی پرائمری کلید (PK) سے نھیں ملتی۔"
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "درست انتخاب منتخب کریں۔ یہ انتخاب دستیاب انتخابات میں سے کوئی نہیں ھے۔"
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "درست انتخاب منتخب کریں۔ %s دستیاب انتخابات میں سے کوئی نہیں ھے۔"
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" پرائمری کلید (PK) کے لئے درست قیمت (ویلیو) نھیں ھے۔"
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "فی الحال"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "تبدیل کریں"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "صاف کریں"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "نامعلوم"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "ھاں"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "نھیں"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "ھاں،نہیں،ھوسکتاہے"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d بائٹ"
msgstr[1] "%(size)d بائٹس"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s ک ۔ ب"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s م ۔ ب"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s ج ۔ ب"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s ٹ ۔ ب"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s پ ۔ پ"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "شام"
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "صبح"
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "شام"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "صبح"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "نصف رات"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "دوپہر"
@@ -998,84 +1064,84 @@ msgctxt "alt. month"
msgid "December"
msgstr "دسمبر"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "یا"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr "،"
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "سال"
msgstr[1] "سال"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "مھینہ"
msgstr[1] "مھینے"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "ھفتہ"
msgstr[1] "ھفتے"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "دن"
msgstr[1] "دن"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "گھنٹہ"
msgstr[1] "گھنٹے"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "منٹ"
msgstr[1] "منٹ"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "منٹ"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr "، %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "'N j, Y'"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "'N j, Y, P'"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "'P'"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "'F Y'"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "'F j'"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1108,19 +1174,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1130,16 +1196,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, 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 d76102a0da..40dbf73997 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 456c04184b..586497d57a 100644
--- a/django/conf/locale/vi/LC_MESSAGES/django.po
+++ b/django/conf/locale/vi/LC_MESSAGES/django.po
@@ -1,577 +1,633 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Tran <hongdiepkien@gmail.com>, 2011.
+# Tran Van <vantxm@yahoo.co.uk>, 2011.
+# Vuong Nguyen <autalpha@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 21:02+0100\n"
-"PO-Revision-Date: 2011-03-19 09:08+0000\n"
-"Last-Translator: vant <vantxm@yahoo.co.uk>\n"
-"Language-Team: Vietnamese <None>\n"
+"POT-Creation-Date: 2012-03-14 00:11-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
+"Last-Translator: Tran Van <vantxm@yahoo.co.uk>\n"
+"Language-Team: Vietnamese (http://www.transifex.net/projects/p/django/"
+"language/vi/)\n"
+"Language: vi\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "Tiếng Ả Rập"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "Azerbaijan"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "Tiếng Bun-ga-ri"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "Bengali"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "Tiếng Bosnia"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "Catalan"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "Séc"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "Xứ Wales"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "Tiếng Đan Mạch"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "Tiếng Đức"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "Tiếng Hy Lạp"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "Tiếng Anh"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "British English"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "Tiếng Tây Ban Nha"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "Argentinian Spanish"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "Mexican Spanish"
-#: conf/global_settings.py:60
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
-msgstr "Mexican Spanish"
+msgstr "Tiếng Tây Ban Nha-Nicaragua"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "Tiếng Estonia"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "Tiếng Baxcơ"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "Tiếng Ba Tư"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "Tiếng Phần Lan"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr "Tiếng Pháp"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "Tiếng Frisco"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "Tiếng Ai-len"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "Tiếng Pháp cổ"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "Tiếng Do Thái cổ"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "Tiếng Hindi"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "Tiếng Croatia"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "Tiếng Hung-ga-ri"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "Tiếng In-đô-nê-xi-a"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "Tiếng Aixơlen"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "Tiếng Ý"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "Tiếng Nhật Bản"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "Georgian"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "Tiếng Khơ-me"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "Tiếng Kannada"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "Tiếng Hàn Quốc"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "Tiếng Lat-vi"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "Ngôn ngữ vùng Bantic"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "Tiếng Maxêđôni"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "Tiếng Malayalam"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "Tiếng Mông Cổ"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "Tiếng Hà Lan"
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr "Tiếng Na Uy"
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "Tiếng Na Uy Bokmål"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "Tiếng Na Uy Nynorsk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "Tiếng Ba lan"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "Tiếng Bồ Đào Nha"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "Brazilian Portuguese"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "Tiếng Ru-ma-ni"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "Tiếng Nga"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "Ngôn ngữ Slô-vac"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "Tiếng Slôven"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "Tiếng Albania"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "Tiếng Xéc-bi"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "Serbian Latin"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "Tiếng Thụy Điển"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "Tiếng Ta-min"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "Tiếng Thái"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "Tiếng Thổ Nhĩ Kỳ"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "Tiếng Ukraina"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "Urdu"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "Tiếng Việt Nam"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "Tiếng Trung Hoa giản thể"
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "Tiếng Trung Hoa truyền thống"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "Nhập một giá trị hợp lệ."
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL này dường như là một liên kết hỏng."
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "Nhập một URL hợp lệ."
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "Hãy nhập địa chỉ email hợp lệ."
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
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:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "Nhập một địa chỉ IPv4 hợp lệ."
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
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:153
+#: core/validators.py:215
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Đảm bảo giá trị này là %(limit_value)s (nó là %(show_value)s )."
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Đảm bảo giá trị này là nhỏ hơn hoặc bằng với %(limit_value)s ."
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Đảm bảo giá trị này lớn hơn hoặc bằng với %(limit_value)s ."
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"Đảm bảo giá trị này có ít nhất %(limit_value)d ký tự (nó có %(show_value)d)."
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-"Đảm bảo giá trị này có nhiều nhất %(limit_value)d ký tự (nó có %(show_value)"
-"d)."
+"Đảm bảo giá trị này có nhiều nhất %(limit_value)d ký tự (nó có "
+"%(show_value)d)."
-#: db/models/base.py:769
+#: db/models/base.py:764
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr " %(field_name)s phải là duy nhất cho %(date_field)s %(lookup)s ."
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "và"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, 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:791 forms/models.py:562
-msgid "and"
-msgstr "và"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "Lựa chọn giá trị %r là không hợp lệ"
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "Trường này không thể để trống."
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "Trường này không được để trắng."
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr "Trường thuộc dạng: %(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
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "Số nguyên"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "Giá trị này phải là số nguyên."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "Giá trị này phải là True hoặc False."
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "Boolean (hoặc là Đúng hoặc là Sai)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Chuỗi (dài đến %(max_length)s ký tự )"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "Các số nguyên được phân cách bằng dấu phẩy"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "Ngày (không có giờ)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Nhập một ngày hợp lệ theo dạng YYYY-MM-DD."
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "Ngày không hợp lệ: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: db/models/fields/__init__.py:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
msgstr ""
-"Nhập một ngày/thời gian hợp lệ theo dạng YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "Ngày (có giờ)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "Giá trị này phải là một số thập phân."
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "Số thập phân"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
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:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "Đường dẫn tắt tới file"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "Giá trị này phải được là số thực."
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "Giá trị dấu chấm động"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "Big (8 byte) integer"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "Địa chỉ IP"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "Giá trị này phải là None, True hoặc False."
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "Luận lý (Có thể Đúng, Sai hoặc Không cái nào đúng)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "Đoạn văn"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "Giờ"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Nhập một thời gian hợp lệ theo dạng HH:MM[:ss[.uuuuuu]]."
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "Đường dẫn URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "văn bản XML"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s với %(pk)r không tồn tại."
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "Khóa ngoại (kiểu được xác định bởi trường liên hệ)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "Mối quan hệ một-một"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "Mối quan hệ nhiều-nhiều"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
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."
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "Trường này là bắt buộc."
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "Nhập một số tổng thể."
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "Nhập một số."
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Hãy chắc chắn rằng tổng cộng không nhiều hơn %s chữ số."
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Hãy chắc chắn rằng không có nhiều hơn %s chữ số thập phân."
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
"Hãy chắc chắn rằng không có nhiều hơn %s chữ số trước dấu phẩy thập phân."
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "Nhập một ngày hợp lệ."
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "Nhập một thời gian hợp lệ."
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "Nhập một ngày/thời gian hợp lệ."
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Không có tập tin nào được gửi. Hãy kiểm tra kiểu mã hóa của biểu mẫu."
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "Không có tập tin nào được gửi."
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "Tập tin được gửi là rỗng."
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Đảm bảo tên tập tin này có nhiều nhất %(max)d ký tự (nó có %(length)d ký tự)."
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Vui lòng gửi một tập tin hoặc để ô chọn trắng, không chọn cả hai."
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -579,148 +635,155 @@ msgstr ""
"Hãy tải lên một hình ảnh hợp lệ. Tập tin mà bạn đã tải không phải là hình "
"ảnh hoặc đã bị hư hỏng."
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "Nhập một danh sách giá trị."
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "Thứ tự"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "Xóa"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Hãy sửa các dữ liệu trùng lặp cho %(field)s ."
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Hãy sửa các dữ liệu trùng lặp cho %(field)s, mà phải là duy nhất."
-#: forms/models.py:566
+#: forms/models.py:581
#, 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 ""
-"Hãy sửa các dữ liệu trùng lặp cho %(field_name)s mà phải là duy nhất cho %"
-"(lookup)s tại %(date_field)s ."
+"Hãy sửa các dữ liệu trùng lặp cho %(field_name)s mà phải là duy nhất cho "
+"%(lookup)s tại %(date_field)s ."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "Hãy sửa các giá trị trùng lặp dưới đây."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Khóa ngoại không tương ứng với khóa chính của đối tượng cha."
-#: forms/models.py:896
+#: forms/models.py:910
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:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Hãy chọn một giá trị hợp lệ. %s không phải là lựa chọn phù hợp."
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" không phải là giá trị hợp lệ cho một khóa chính."
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "Hiện nay"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "Thay đổi"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "Xóa"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "Chưa xác định"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "Có"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "Không"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "Có, Không, Có thể"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "chiều"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "sáng"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "Nửa đêm"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "Buổi trưa"
@@ -996,78 +1059,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "Tháng mười hai"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "hoặc"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "năm"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "tháng"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "tuần"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "ngày"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "giờ"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "phút"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "phút"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
-
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "P"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1100,12 +1163,12 @@ msgstr "Không có ngày xác định"
msgid "No week specified"
msgstr "Không có tuần xác định"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "Không có %(verbose_name_plural)s phù hợp"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
@@ -1114,7 +1177,7 @@ msgstr ""
"%(verbose_name_plural)s trong tương lai không có sẵn vì %(class_name)s."
"allow_future là False."
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "Chuỗi ngày không hợp lệ ' %(datestr)s' định dạng bởi '%(format)s'"
@@ -1124,17 +1187,17 @@ msgstr "Chuỗi ngày không hợp lệ ' %(datestr)s' định dạng bởi '%(f
msgid "No %(verbose_name)s found matching the query"
msgstr "Không có %(verbose_name)s tìm thấy phù hợp với truy vấn"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
"Trang không phải là 'nhất', và cũng không nó có thể được chuyển đổi sang int."
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "Trang không hợp lệ (%(page_number)s)"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "Danh sách rỗng và '%(class_name)s.allow_empty' là sai."
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 0b289c990c..385e29e04d 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 951352d6af..98f36ecd58 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -1,599 +1,661 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# Lele Long <schemacs@gmail.com>, 2011.
+# slene <vslene@gmail.com>, 2011.
+# Ziang Song <songziang@gmail.com>, 2011, 2012.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:12-0400\n"
-"PO-Revision-Date: 2011-03-05 08:49+0000\n"
-"Last-Translator: slene <vslene@gmail.com>\n"
-"Language-Team: Chinese (China) <None>\n"
+"POT-Creation-Date: 2012-03-14 00:11-0700\n"
+"PO-Revision-Date: 2012-03-08 16:49+0000\n"
+"Last-Translator: Ziang Song <songziang@gmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/django/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "阿拉伯语"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr "阿塞拜疆"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "保加利亚语"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "孟加拉语"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "波斯尼亚语"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "加泰罗尼亚语"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "捷克语"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "威尔士语"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "丹麦语"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "德语"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "希腊语"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "英语"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "英国英语"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "西班牙语"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "阿根廷西班牙语"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr "墨西哥西班牙语"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr "尼加拉瓜西班牙语"
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "爱沙尼亚语"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "巴斯克语"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "波斯语"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "芬兰语"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "法语"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "夫里斯兰语"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "爱尔兰语"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "加利西亚语"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "希伯来语"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "北印度语"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "克罗地亚语"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "匈牙利语"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "印尼语"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "冰岛语"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "意大利语"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "日语"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "格鲁吉亚语"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "高棉语"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "埃纳德语"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "韩语"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "立陶宛语"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "拉脱维亚语"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "马其顿语"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "马来亚拉姆语"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "蒙古语"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "荷兰语"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "挪威语"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "挪威博克马尔"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "新挪威语"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "旁遮普语 "
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "波兰语"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "葡萄牙语"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "巴西葡萄牙语"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "罗马尼亚语"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "俄语"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "斯洛伐克语"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "斯洛文尼亚语"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "阿尔巴尼亚语"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "塞尔维亚语"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "塞尔维亚拉丁语"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "瑞典语"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "泰米尔语"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "泰卢固语"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "泰语"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "土耳其语"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "乌克兰语"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr "乌尔都语"
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "越南语"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "简体中文"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "繁体中文"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "输入一个有效的值。"
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL %s 似乎是一个已损坏的链接。"
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "输入一个有效的 URL。"
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "输入一个有效的 e-mail 地址。"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "输入一个有效的 'slug',由字母、数字、下划线或横线组成。"
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "输入一个有效的 IPv4 地址。"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr "填写合法的IPv6地址。"
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "只能输入用逗号分隔的数字。"
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "确保该值小于或等于%(limit_value)s。"
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "确保该值大于或等于%(limit_value)s。"
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr "确保该值不少于 %(limit_value)d 个字符 (现在有 %(show_value)d 个)。"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr "确保该值不多于 %(limit_value)d 个字符 (现在有 %(show_value)d 个)。"
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "和"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "具有 %(field_label)s 的 %(model_name)s 已存在。"
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "和"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "值 %r 不是有效选项。"
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "这个值不能为 null。"
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "此字段不能为空。"
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "整数"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "这个值必须是一个整数。"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr "'%s' 值必须为一个整数(integer)类型。"
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "这个值必须是 True 或 False。"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "布尔值(真或假)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "字符串(最长 %(max_length)s 位)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "逗号分隔的整数"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "日期(无时间)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "输入一个 YYYY-MM-DD 格式的有效日期。"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "无效日期: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]] 格式的有效日期/时间。"
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "日期(带时间)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "这个值必须是一个小数。"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "小数"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "E-mail 地址"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "文件路径"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "该值必须为浮点数。"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "浮点数"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "大整数(8字节)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP 地址"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "这个值必须是 None, True 或 False。"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "布尔值(真、假或无)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "文本"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "时间"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "输入一个 HH:MM[:ss[.uuuuuu]] 格式的有效时间。"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML 文本"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "模型 %(model)s 的外键 %(pk)r 不存在。"
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "外键(由相关字段确定)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "一对一关系"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "多对多关系"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "按下 \"Control\",或者在Mac上按 \"Command\" 来选择多个值。"
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "这个字段是必填项。"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "输入整数。"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "输入一个数字。"
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "确认数字全长不超过 %s 位。"
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "确认小数不超过 %s 位。"
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "确认小数点前不超过 %s 位。"
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "输入一个有效的日期。"
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "输入一个有效的时间。"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "输入一个有效的日期/时间。"
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "未提交文件。请检查表单的编码类型。"
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "没有提交文件。"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "所提交的是空文件。"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "请提交文件或勾选清除复选框,两者其一即可。"
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "输入一系列值。"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "排序"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "删除"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "请修改%(field)s的重复数据"
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "请修改%(field)s的重复数据.这个字段必须唯一"
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -602,108 +664,115 @@ msgstr ""
"请修正%(field_name)s的重复数据。%(date_field)s %(lookup)s 在 %(field_name)s "
"必须保证唯一."
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "请修正重复的数据."
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "内联外键与父实例的主键不匹配。"
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "选择一个有效的选项: 该选择不在可用的选项中。"
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "选择一个有效的选项: '%s' 不在可用的选项中。"
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" 不是"
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "目前"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "修改"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "清除"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "未知"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "是"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "否"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "是、否、也许"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d 字节"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "午夜"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "中午"
@@ -979,78 +1048,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "十二月"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "或"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ","
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "年"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "月"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "周"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "天"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "小时"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "分钟"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "分钟"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "Y-m-d"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "Y-m-d H:i:s"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y-m"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "m-d"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1083,21 +1152,21 @@ msgstr "没有指定天"
msgid "No week specified"
msgstr "没有指定周"
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr "%(verbose_name_plural)s 不存在"
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-"因为 %(class_name)s.allow_future 设置为 False,所以特性 %"
-"(verbose_name_plural)s 不可用。"
+"因为 %(class_name)s.allow_future 设置为 False,所以特性 "
+"%(verbose_name_plural)s 不可用。"
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr "日期文字 '%(datestr)s' 不匹配格式 '%(format)s'"
@@ -1107,16 +1176,16 @@ msgstr "日期文字 '%(datestr)s' 不匹配格式 '%(format)s'"
msgid "No %(verbose_name)s found matching the query"
msgstr "没有找到符合查询的 %(verbose_name)s"
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr "page 不等于 'last',或者它不能被转为数字。"
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr "没有第 (%(page_number)s) 页了"
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr "列表是空的并且'%(class_name)s.allow_empty 设置为 False'"
diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo
index 1ac7d584fc..d57489ac5f 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 fd82b559f3..d5e74d23c3 100644
--- a/django/conf/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,602 +1,663 @@
# This file is distributed under the same license as the Django package.
#
+# Translators:
+# Jannis Leidel <jannis@leidel.info>, 2011.
+# ming hsien tzang <tzangms@gmail.com>, 2011.
+# tcc <tcchou@tcchou.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:12-0400\n"
-"PO-Revision-Date: 2011-03-04 18:40+0000\n"
+"POT-Creation-Date: 2012-03-14 00:11-0700\n"
+"PO-Revision-Date: 2012-03-08 12:00+0000\n"
"Last-Translator: tcc <tcchou@tcchou.org>\n"
-"Language-Team: Chinese (Taiwan) <None>\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/django/"
+"language/zh_TW/)\n"
+"Language: zh_TW\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr "阿拉伯語"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr "保加利亞語"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr "孟加拉語"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr "波士尼亞語"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr "嘉泰羅尼亞語"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr "捷克語"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr "威爾斯語"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr "丹麥語"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr "德語"
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr "希臘語"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr "英語"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr "英國英語"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr "西班牙語"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr "阿根廷西班牙語"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
+msgid "Nicaraguan Spanish"
+msgstr ""
+
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr "愛沙尼亞語"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Basque"
msgstr "巴斯克語"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
msgid "Persian"
msgstr "波斯語"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr "芬蘭語"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:69
msgid "French"
msgstr "法語"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr "弗里斯蘭語"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:71
msgid "Irish"
msgstr "愛爾蘭語"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:72
msgid "Galician"
msgstr "加里西亞語"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr "希伯來語"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr "印度語"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr "克羅埃西亞語"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr "匈牙利語"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr "印尼語"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr "冰島語"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:79
msgid "Italian"
msgstr "義大利語"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr "日語"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr "喬治亞語"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr "高棉語"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr "坎那達語"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:84
msgid "Korean"
msgstr "韓語"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr "立陶宛語"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr "拉脫維亞語"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr "馬其頓語"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr "馬來亞拉姆語"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr "蒙古語"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr "荷蘭語"
-#: conf/global_settings.py:86
-msgid "Norwegian"
-msgstr "挪威語"
-
-#: conf/global_settings.py:87
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr "挪威語(波克默爾)"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr "挪威語(尼諾斯克)"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr "旁遮普語"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
msgid "Polish"
msgstr "波蘭嶼"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr "葡萄牙語"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr "巴西葡萄牙語"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr "羅馬尼亞語"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
msgid "Russian"
msgstr "俄語"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr "斯洛伐克語"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr "斯洛維尼亞語"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr "阿爾巴尼亞語"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr "塞爾維亞語"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr "塞爾維亞拉丁語"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr "瑞典語"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr "坦米爾語"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr "泰盧固語"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:107
msgid "Thai"
msgstr "泰語"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr "土耳其語"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr "烏克蘭語"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr "越南語"
-#: conf/global_settings.py:108
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr "簡體中文"
-#: conf/global_settings.py:109
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr "繁體中文"
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr "輸入有效的值"
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr "URL %s 似乎是是斷掉的連結。"
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr "輸入有效的URL"
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr "輸入有效的電子郵件地址。"
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:168 forms/fields.py:1023
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "輸入一個有效的 'slug',由字母、數字、底線與連字號組成。"
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
msgid "Enter a valid IPv4 address."
msgstr "輸入有效的 IPv4 位址。"
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:175 core/validators.py:189
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:184 core/validators.py:187
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:209 db/models/fields/__init__.py:638
msgid "Enter only digits separated by commas."
msgstr "輸入以逗號分隔的數字。"
-#: core/validators.py:153
+#: core/validators.py:215
#, 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:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "確認這個數值是否小於或等於 %(limit_value)s。"
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "確認這個數值是否大於或等於 %(limit_value)s。"
-#: core/validators.py:182
+#: core/validators.py:244
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"請確認這個內容至少要 %(limit_value)d 個字元 (目前有 %(show_value)d 個字)。"
-#: core/validators.py:188
+#: core/validators.py:250
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
"請確認這個內容最多只能有 %(limit_value)d 個字元 (目前有 %(show_value)d 個"
"字)。"
-#: db/models/base.py:769
+#: db/models/base.py:764
#, 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:784 db/models/base.py:792
+#: db/models/base.py:787 forms/models.py:577
+msgid "and"
+msgstr "和"
+
+#: db/models/base.py:788 db/models/fields/__init__.py:65
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "這個 %(field_label)s 在 %(model_name)s 已經存在。"
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr "和"
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr "數值 %r 並非是一個有效的選擇"
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr "這個值不能是 null。"
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr "這個欄位不能留白"
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
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
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
msgid "Integer"
msgstr "整數"
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
-msgstr "這個值必須是整數。"
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#, python-format
+msgid "'%s' value must be an integer."
+msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
-msgstr "這個值必須是 True 或 False。"
+#: db/models/fields/__init__.py:552
+#, python-format
+msgid "'%s' value must be either True or False."
+msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)"
msgstr "布林值 (True 或 False)"
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:605
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "字串 (最長到 %(max_length)s 個字)"
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:633
msgid "Comma-separated integers"
msgstr "逗號分隔的整數"
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:647
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:652
msgid "Date (without time)"
msgstr "日期 (不包括時間)"
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "輸入一個 YYYY-MM-DD 格式的有效日期。"
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:732
#, python-format
-msgid "Invalid date: %s"
-msgstr "無效的日期: %s"
+msgid ""
+"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
-#: 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]] 格式的有效日期/時間。"
+#: db/models/fields/__init__.py:736
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
+"it is an invalid date/time."
+msgstr ""
-#: db/models/fields/__init__.py:672
+#: db/models/fields/__init__.py:740
msgid "Date (with time)"
msgstr "日期 (包括時間)"
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
-msgstr "這資料必須是十進位數。"
+#: db/models/fields/__init__.py:831
+#, python-format
+msgid "'%s' value must be a decimal number."
+msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:833
msgid "Decimal number"
msgstr "十進位數(小數可)"
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:890
msgid "E-mail address"
msgstr "電子郵件地址"
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:906
msgid "File path"
msgstr "檔案路徑"
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
-msgstr "這個值必須是一個浮點數。"
+#: db/models/fields/__init__.py:930
+#, python-format
+msgid "'%s' value must be a float."
+msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:932
msgid "Floating point number"
msgstr "浮點數"
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer"
msgstr "大整數(8位元組)"
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:1007
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1023
msgid "IP address"
msgstr "IP 位址"
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
-msgstr "這個值必須是 None, True 或 False。"
+#: db/models/fields/__init__.py:1065
+#, python-format
+msgid "'%s' value must be either None, True or False."
+msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)"
msgstr "布林值 (True, False 或 None)"
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1116
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1127
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1138
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1156
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1162
msgid "Text"
msgstr "文字"
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1180
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1182
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1185
msgid "Time"
msgstr "時間"
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "輸入一個 HH:MM[:ss[.uuuuuu]] 格式的有效時間。"
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1249
msgid "URL"
msgstr "URL"
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr "XML 文件"
+#: db/models/fields/files.py:214
+msgid "File"
+msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/files.py:321
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:903
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "PK 為 %(pk)r 的 Model %(model)s 不存在。"
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)"
msgstr "外鍵 (型態由關連欄位決定)"
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1033
msgid "One-to-one relationship"
msgstr "一對一關連"
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1096
msgid "Many-to-many relationship"
msgstr "多對多關連"
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1120
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "按住 \"Control\", 或者在 Mac 上按 \"Command\", 以選取更多值"
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr "這個欄位是必須的。"
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr "輸入整數"
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr "輸入一個數字"
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "確認數字全長不超過 %s 位。"
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "確認想小數不超過 %s 位。"
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "確認想小數點前不超過 %s 位。"
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date."
msgstr "輸入有效的日期"
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time."
msgstr "輸入有效的時間"
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr "輸入有效的日期/時間"
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr "沒有檔案被送出。請檢查表單的編碼類型。"
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr "沒有檔案送出"
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr "送出的檔案是空的。"
-#: forms/fields.py:463
+#: forms/fields.py:488
#, 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
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "請提交一個檔案或確認清除核可項, 不能兩者都做。"
-#: forms/fields.py:518
+#: forms/fields.py:544
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
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
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:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
msgid "Enter a list of values."
msgstr "輸入一個列表的值"
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr "排序"
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr "刪除"
-#: forms/models.py:556
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "請修正 %(field)s 的重覆資料"
-#: forms/models.py:560
+#: forms/models.py:575
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "請修正 %(field)s 的重覆資料, 必須為唯一值"
-#: forms/models.py:566
+#: forms/models.py:581
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -604,108 +665,115 @@ msgid ""
msgstr ""
"請修正 %(field_name)s 重複資料, %(date_field)s 的 %(lookup)s 必須是唯一值。"
-#: forms/models.py:574
+#: forms/models.py:589
msgid "Please correct the duplicate values below."
msgstr "請修正下方重覆的數值"
-#: forms/models.py:835
+#: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "內含的外鍵無法連接到對應的上層實體主鍵。"
-#: forms/models.py:896
+#: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "選擇有效的選項: 此選擇不在可用的選項中。"
-#: forms/models.py:986
+#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "選擇一個有效的選項: '%s' 不在可用的選項中。"
-#: forms/models.py:988
+#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" 不是一個主鍵的有效資料。"
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, python-format
+msgid ""
+"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
+"may be ambiguous or it may not exist."
+msgstr ""
+
+#: forms/widgets.py:325
msgid "Currently"
msgstr "目前"
-#: forms/widgets.py:300
+#: forms/widgets.py:326
msgid "Change"
msgstr "變更"
-#: forms/widgets.py:301
+#: forms/widgets.py:327
msgid "Clear"
msgstr "清除"
-#: forms/widgets.py:548
+#: forms/widgets.py:582
msgid "Unknown"
msgstr "未知"
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Yes"
msgstr "是"
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "No"
msgstr "否"
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:797
msgid "yes,no,maybe"
msgstr "是、否、也許"
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d 位元組"
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:832
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:834
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:836
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:838
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:839
#, python-format
msgid "%s PB"
msgstr "%s PB"
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr "p.m."
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr "a.m."
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr "PM"
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr "AM"
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr "午夜"
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr "中午"
@@ -981,78 +1049,78 @@ msgctxt "alt. month"
msgid "December"
msgstr "十二月"
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr "或"
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ", "
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] "年"
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] "月"
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] "週"
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] "天"
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] "小時"
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] "分鐘"
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr "分鐘"
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr "%(number)d %(type)s"
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:568
-msgid "DATE_FORMAT"
-msgstr "Y-m-d"
-
-#: utils/translation/trans_real.py:569
-msgid "DATETIME_FORMAT"
-msgstr "Y-m-d H:i:s"
-
-#: utils/translation/trans_real.py:570
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
+#: views/static.py:52
+msgid "Directory indexes are not allowed here."
+msgstr ""
-#: utils/translation/trans_real.py:591
-msgid "YEAR_MONTH_FORMAT"
-msgstr "Y-m"
+#: views/static.py:54
+#, python-format
+msgid "\"%(path)s\" does not exist"
+msgstr ""
-#: utils/translation/trans_real.py:592
-msgid "MONTH_DAY_FORMAT"
-msgstr "m-d"
+#: views/static.py:95
+#, python-format
+msgid "Index of %(directory)s"
+msgstr ""
#: views/generic/create_update.py:121
#, python-format
@@ -1085,19 +1153,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1107,16 +1175,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""