diff --git a/AUTHORS b/AUTHORS index 5f36d83770..58179e111a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -14,6 +14,7 @@ The PRIMARY AUTHORS are (and/or have been): * Robert Wittams * Gary Wilson * Brian Rosner + * Justin Bronn * Karen Tracey More information on the main contributors to Django can be found in @@ -131,6 +132,7 @@ answer newbie questions, and generally made Django that much better: Andrew Durdin dusk@woofle.net Andy Dustman + J. Clifford Dyer Clint Ecker Nick Efford eibaan@gmail.com @@ -199,6 +201,7 @@ answer newbie questions, and generally made Django that much better: Ian Holsman Kieran Holland Sung-Jin Hong + Leo "hylje" Honkanen Richard House Robert Rock Howard John Huddleston @@ -217,7 +220,7 @@ answer newbie questions, and generally made Django that much better: Michael Josephson jpellerin@gmail.com junzhang.jn@gmail.com - Antti Kaihola + Antti Kaihola Bahadır Kandemir Karderio Nagy Károly @@ -436,6 +439,7 @@ answer newbie questions, and generally made Django that much better: viestards.lists@gmail.com George Vilches Vlado + Zachary Voase Milton Waddams Chris Wagner Rick Wagner diff --git a/django/__init__.py b/django/__init__.py index a21c3344f1..2b87a7e242 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -1,4 +1,4 @@ -VERSION = (1, 1, 0, 'beta', 1) +VERSION = (1, 2, 0, 'alpha', 0) def get_version(): version = '%s.%s' % (VERSION[0], VERSION[1]) @@ -7,9 +7,8 @@ def get_version(): if VERSION[3:] == ('alpha', 0): version = '%s pre-alpha' % version else: - version = '%s %s' % (version, VERSION[3]) if VERSION[3] != 'final': - version = '%s %s' % (version, VERSION[4]) + version = '%s %s %s' % (version, VERSION[3], VERSION[4]) from django.utils.version import get_svn_revision svn_rev = get_svn_revision() if svn_rev != u'SVN-unknown': diff --git a/django/conf/locale/ar/LC_MESSAGES/django.mo b/django/conf/locale/ar/LC_MESSAGES/django.mo index 18b835a588..a31a0fcf0c 100644 Binary files a/django/conf/locale/ar/LC_MESSAGES/django.mo and b/django/conf/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ar/LC_MESSAGES/django.po b/django/conf/locale/ar/LC_MESSAGES/django.po index fa7e6a9151..bb1835b132 100644 --- a/django/conf/locale/ar/LC_MESSAGES/django.po +++ b/django/conf/locale/ar/LC_MESSAGES/django.po @@ -1,19 +1,20 @@ # translation of django.po to Arabic # This file is distributed under the same license as the django package. # +# Ossama M. Khayat , 2009. msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-12 07:33+0300\n" -"PO-Revision-Date: 2009-04-12 08:01+0300\n" -"Last-Translator: Ossama M. Khayat \n" +"POT-Creation-Date: 2009-05-10 15:09+0300\n" +"PO-Revision-Date: 2009-05-10 15:18+0300\n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=4; plural=(n == 1? 0 : (n == 2? 1 : (n <= 10? 2 : 3)))\n\n" +"\n" #: conf/global_settings.py:44 msgid "Arabic" @@ -219,16 +220,16 @@ msgstr "الصينيّة المبسطة" msgid "Traditional Chinese" msgstr "الصينيّة التقليدية" -#: contrib/admin/actions.py:56 +#: contrib/admin/actions.py:60 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "تم حذف %(count)d %(items)s بنجاح." -#: contrib/admin/actions.py:63 contrib/admin/options.py:1023 +#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 msgid "Are you sure?" msgstr "هل أنت متأكد؟" -#: contrib/admin/actions.py:81 +#: contrib/admin/actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "حذف %(verbose_name_plural)s المحددون" @@ -267,15 +268,15 @@ msgstr "هذا الشهر" msgid "This year" msgstr "هذه السنة" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "نعم" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "لا" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "مجهول" @@ -315,80 +316,81 @@ msgstr "مُدخلات السجل" msgid "None" msgstr "لاشيء" -#: contrib/admin/options.py:517 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "عدّل %s." -#: contrib/admin/options.py:517 contrib/admin/options.py:527 -#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:587 msgid "and" msgstr "و" -#: contrib/admin/options.py:522 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "أضاف %(name)s \"%(object)s\"." -#: contrib/admin/options.py:526 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "غيّر %(list)s في %(name)s \"%(object)s\"." -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "حذف %(name)s \"%(object)s\"." -#: contrib/admin/options.py:535 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "لم يتم تغيير أية حقول." -#: contrib/admin/options.py:596 contrib/auth/admin.py:67 +#: contrib/admin/options.py:598 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "تم اضافة %(name)s \"%(obj)s\" بنجاح." -#: contrib/admin/options.py:600 contrib/admin/options.py:633 +#: contrib/admin/options.py:602 contrib/admin/options.py:635 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "يمكنك تعديله مجددا في الأسفل." -#: contrib/admin/options.py:610 contrib/admin/options.py:643 +#: contrib/admin/options.py:612 contrib/admin/options.py:645 #, python-format msgid "You may add another %s below." msgstr "يمكنك إضافة %s آخر بالأسفل." -#: contrib/admin/options.py:631 +#: contrib/admin/options.py:633 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "تم تغيير %(name)s \"%(obj)s\" بنجاح." -#: contrib/admin/options.py:639 +#: contrib/admin/options.py:641 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "تمت إضافة %(name)s \"%(obj)s\" بنجاح، يمكنك تعديله مرة أخرى بالأسفل." -#: contrib/admin/options.py:770 +#: contrib/admin/options.py:772 #, python-format msgid "Add %s" msgstr "أضف %s" -#: contrib/admin/options.py:801 contrib/admin/options.py:1001 +#: contrib/admin/options.py:803 contrib/admin/options.py:1003 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "العنصر %(name)s الذي به الحقل الأساسي %(key)r غير موجود." -#: contrib/admin/options.py:858 +#: contrib/admin/options.py:860 #, python-format msgid "Change %s" msgstr "عدّل %s" -#: contrib/admin/options.py:902 +#: contrib/admin/options.py:904 msgid "Database error" msgstr "خطـأ في قاعدة البيانات" -#: contrib/admin/options.py:938 +#: contrib/admin/options.py:940 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -397,12 +399,12 @@ msgstr[1] "تم تغيير عنصري %(name)s بنجاح." msgstr[2] "تم تغيير %(count)s %(name)s بنجاح." msgstr[3] "تم تغيير %(count)s %(name)s بنجاح." -#: contrib/admin/options.py:1016 +#: contrib/admin/options.py:1018 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح." -#: contrib/admin/options.py:1052 +#: contrib/admin/options.py:1054 #, python-format msgid "Change history: %s" msgstr "تاريخ التغيير: %s" @@ -498,7 +500,7 @@ msgstr "نحن آسفون، لكننا لم نعثر على الصفحة الم #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:31 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -542,7 +544,6 @@ msgid "Run the selected action" msgstr "نفذ العملية المحدّدة" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "نفّذ" @@ -552,18 +553,18 @@ msgstr "نفّذ" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 msgid "Welcome," msgstr "أهلا، " -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "الوثائق" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -571,7 +572,7 @@ msgstr "الوثائق" msgid "Change password" msgstr "غيّر كلمة المرور" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -702,6 +703,10 @@ msgstr "عملياتي" msgid "None available" msgstr "لا يوجد" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "مُحتوى مجهول" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -749,6 +754,10 @@ msgstr "" msgid "Show all" msgstr "أظهر الكل" +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "ابحث" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -1755,18 +1764,24 @@ msgid "" "form from this page." msgstr "نعتذر، لكنّ استمارتك انتهت صلاحيتها. رجاء أكمل تعبئة الاستمارة من هذه الصفحة." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "لم تُدخل أي أحداثيات." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "الإحداثيات غير صحيحة." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "نوع الإحداثيات غير صحيح." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "حدث خطأ أثناء تحويل geometry إلى حقل SRID." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr " " @@ -3699,7 +3714,7 @@ msgstr "إنجلترا" #: contrib/localflavor/uk/uk_regions.py:91 msgid "Northern Ireland" -msgstr "" +msgstr "شمال ايرلندا" #: contrib/localflavor/uk/uk_regions.py:92 msgid "Scotland" @@ -3727,7 +3742,7 @@ msgstr "أدخل رمز بريد جنوب إفريقي صحيح" #: contrib/localflavor/za/za_provinces.py:4 msgid "Eastern Cape" -msgstr "" +msgstr "شرق كيب" #: contrib/localflavor/za/za_provinces.py:5 msgid "Free State" @@ -3751,15 +3766,15 @@ msgstr "" #: contrib/localflavor/za/za_provinces.py:10 msgid "Northern Cape" -msgstr "" +msgstr "شمال كيب" #: contrib/localflavor/za/za_provinces.py:11 msgid "North West" -msgstr "" +msgstr "شمال شرق" #: contrib/localflavor/za/za_provinces.py:12 msgid "Western Cape" -msgstr "" +msgstr "غير كيب" #: contrib/redirects/models.py:7 msgid "redirect from" @@ -3823,7 +3838,7 @@ msgstr "اسم العرض" msgid "sites" msgstr "مواقع" -#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "هذه القيمة يجب أن تكون رقما صحيحا." @@ -3856,15 +3871,15 @@ msgstr "أدخل تاريخ/وقت صحيح بالنسق YYYY-MM-DD HH:MM[:ss[.u msgid "This value must be a decimal number." msgstr "يجب أن تكون هذه القيمة رقماً عشرياً." -#: db/models/fields/__init__.py:683 +#: db/models/fields/__init__.py:686 msgid "This value must be a float." msgstr "هذه القيمة يجب أن تكون عدد فاصلة عائمة." -#: db/models/fields/__init__.py:743 +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." msgstr "يجب أن تكون هذه القيمة None، أو True أو False." -#: db/models/fields/__init__.py:846 db/models/fields/__init__.py:860 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." msgstr "أدخل توقيتاً صحيحاً بالنسق HH:MM[:ss[.uuuuuu]]." @@ -3934,11 +3949,11 @@ msgstr "تحقق من أن تدخل %s خانات عشرية لا أكثر." msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "تحقق من أن تدخل %s أرقام قبل الفاصل العشري لا أكثر." -#: forms/fields.py:288 forms/fields.py:862 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "أدخل تاريخاً صحيحاً." -#: forms/fields.py:322 forms/fields.py:863 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "أدخل وقتاً صحيحاً." @@ -3981,20 +3996,20 @@ msgstr "أدخل رابطاً صحيحاً." msgid "This URL appears to be a broken link." msgstr "يبدو أن هذا الرابط غير متوفر." -#: forms/fields.py:624 forms/fields.py:702 +#: forms/fields.py:625 forms/fields.py:703 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "انتق خياراً صحيحاً. %(value)s ليس أحد الخيارات المتاحة." -#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:965 msgid "Enter a list of values." msgstr "أدخل قائمة من القيم." -#: forms/fields.py:891 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "أدخل عنوان IPv4 صحيح." -#: forms/fields.py:901 +#: forms/fields.py:902 msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة." @@ -4002,34 +4017,62 @@ msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أر msgid "Order" msgstr "الترتيب" -#: forms/models.py:299 forms/models.py:308 +#: forms/models.py:367 +#, python-format +msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." +msgstr "%(field_name)s يجب أن يكون مُميّزاً مع %(date_field)s %(lookup)s." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً." -#: forms/models.py:651 +#: forms/models.py:581 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "رجاء صحّح بيانات %(field)s المتكررة." + +#: forms/models.py:585 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة." + +#: forms/models.py:591 +#, 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:599 +msgid "Please correct the duplicate values below." +msgstr "رجاءً صحّح القيم المُكرّرة أدناه." + +#: forms/models.py:837 msgid "The inline foreign key did not match the parent instance primary key." msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له." -#: forms/models.py:706 +#: forms/models.py:892 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة." -#: forms/models.py:777 +#: forms/models.py:966 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "انتق خياراً صحيحاً. %s ليس أحد الخيارات المتاحة." -#: forms/models.py:779 +#: forms/models.py:968 #, python-format msgid "\"%s\" is not a valid value for a primary key." msgstr "القيمة \"%s\" هي صحيحة للحقل المرجعي." -#: template/defaultfilters.py:765 +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "نعم,لا,ربما" -#: template/defaultfilters.py:796 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" @@ -4038,42 +4081,42 @@ msgstr[1] "%(size)d بايت" msgstr[2] "%(size)d بايت" msgstr[3] "%(size)d بايت" -#: template/defaultfilters.py:798 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f ك.ب" -#: template/defaultfilters.py:800 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f م.ب" -#: template/defaultfilters.py:801 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f ج.ب" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "م" -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "ص" -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "م" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "ص" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "منتصف الليل" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "ظهراً" diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index b4fdb8e9ed..770a846275 100644 Binary files a/django/conf/locale/bn/LC_MESSAGES/django.mo and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po index 0a23ba79b0..dfdaa3595f 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.po +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -1,983 +1,1081 @@ -# django.po -- Bengali (bn) translation of Django core -# Copyright (C) 2005 Django Authors # This file is distributed under the same license as the Django package. -# Baishampayan Ghose , 2005. -# -# +# msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 10:12+0200\n" -"PO-Revision-Date: 2005-11-12 20:05+0530\n" -"Last-Translator: Baishampayan Ghose \n" -"Language-Team: Ankur Bangla \n" +"POT-Creation-Date: 2008-09-02 22:36-0700\n" +"PO-Revision-Date: 2009-07-19 22:49+0000\n" +"Last-Translator: Nasimul Haque \n" +"Language-Team: Nasimul Haque \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/comments/models.py:67 contrib/comments/models.py:166 -#, fuzzy -msgid "object ID" -msgstr "বস্তু আই.ডি." +#: conf/global_settings.py:44 +msgid "Arabic" +msgstr "আরবী" -#: contrib/comments/models.py:68 -msgid "headline" -msgstr "" +#: conf/global_settings.py:45 +msgid "Bengali" +msgstr "বাংলা" -#: contrib/comments/models.py:69 contrib/comments/models.py:90 -#: contrib/comments/models.py:167 -#, fuzzy -msgid "comment" -msgstr "অভ্যন্তরস্থ বস্তু" +#: conf/global_settings.py:46 +msgid "Bulgarian" +msgstr "বুলগেরিয়ান" -#: contrib/comments/models.py:70 -msgid "rating #1" -msgstr "" +#: conf/global_settings.py:47 +msgid "Catalan" +msgstr "ক্যাটালান" -#: contrib/comments/models.py:71 -msgid "rating #2" -msgstr "" +#: conf/global_settings.py:48 +msgid "Czech" +msgstr "চেক" -#: contrib/comments/models.py:72 -msgid "rating #3" -msgstr "" +#: conf/global_settings.py:49 +msgid "Welsh" +msgstr "ওয়েল্স" -#: contrib/comments/models.py:73 -msgid "rating #4" -msgstr "" +#: conf/global_settings.py:50 +msgid "Danish" +msgstr "ড্যানিশ" -#: contrib/comments/models.py:74 -msgid "rating #5" -msgstr "" +#: conf/global_settings.py:51 +msgid "German" +msgstr "জার্মান" -#: contrib/comments/models.py:75 -msgid "rating #6" -msgstr "" +#: conf/global_settings.py:52 +msgid "Greek" +msgstr "গ্রিক" -#: contrib/comments/models.py:76 -msgid "rating #7" -msgstr "" +#: conf/global_settings.py:53 +msgid "English" +msgstr "ইংলিশ" -#: contrib/comments/models.py:77 -msgid "rating #8" -msgstr "" +#: conf/global_settings.py:54 +msgid "Spanish" +msgstr "স্প্যানিশ" -#: contrib/comments/models.py:82 -msgid "is valid rating" -msgstr "" +#: conf/global_settings.py:55 +msgid "Estonian" +msgstr "এস্তোনিয়ান" -#: contrib/comments/models.py:83 contrib/comments/models.py:169 -msgid "date/time submitted" -msgstr "" +#: conf/global_settings.py:56 +msgid "Argentinean Spanish" +msgstr "আর্জেন্টিনিয়ান স্প্যানিশ" -#: contrib/comments/models.py:84 contrib/comments/models.py:170 -msgid "is public" -msgstr "" +#: conf/global_settings.py:57 +msgid "Basque" +msgstr "বাস্ক" -#: contrib/comments/models.py:85 contrib/admin/views/doc.py:289 -#, fuzzy -msgid "IP address" -msgstr "ই-মেল ঠিকানা" +#: conf/global_settings.py:58 +msgid "Persian" +msgstr "ফারসি" -#: contrib/comments/models.py:86 -msgid "is removed" -msgstr "" +#: conf/global_settings.py:59 +msgid "Finnish" +msgstr "ফিনিশ" -#: contrib/comments/models.py:86 -msgid "" -"Check this box if the comment is inappropriate. A \"This comment has been " -"removed\" message will be displayed instead." -msgstr "" +#: conf/global_settings.py:60 +msgid "French" +msgstr "ফ্রেঞ্চ" -#: contrib/comments/models.py:91 -#, fuzzy -msgid "comments" -msgstr "অভ্যন্তরস্থ বস্তু" +#: conf/global_settings.py:61 +msgid "Irish" +msgstr "আইরিশ" -#: contrib/comments/models.py:131 contrib/comments/models.py:207 -#, fuzzy -msgid "Content object" -msgstr "অভ্যন্তরস্থ বস্তু ধরন" +#: conf/global_settings.py:62 +msgid "Galician" +msgstr "গ্যালিসিয়ান" -#: contrib/comments/models.py:159 -#, python-format -msgid "" -"Posted by %(user)s at %(date)s\n" -"\n" -"%(comment)s\n" -"\n" -"http://%(domain)s%(url)s" -msgstr "" +#: conf/global_settings.py:63 +msgid "Hungarian" +msgstr "হাঙ্গেরিয়ান" -#: contrib/comments/models.py:168 -#, fuzzy -msgid "person's name" -msgstr "প্রথম নাম" +#: conf/global_settings.py:64 +msgid "Hebrew" +msgstr "হিব্রু" -#: contrib/comments/models.py:171 -#, fuzzy -msgid "ip address" -msgstr "ই-মেল ঠিকানা" +#: conf/global_settings.py:65 +msgid "Croatian" +msgstr "ক্রোয়েশিয়ান" -#: contrib/comments/models.py:173 -msgid "approved by staff" -msgstr "" +#: conf/global_settings.py:66 +msgid "Icelandic" +msgstr "আইসল্যান্ডিক" -#: contrib/comments/models.py:176 -#, fuzzy -msgid "free comment" -msgstr "মন্তব্য সক্রিয় করুন" +#: conf/global_settings.py:67 +msgid "Italian" +msgstr "ইটালিয়ান" -#: contrib/comments/models.py:177 -#, fuzzy -msgid "free comments" -msgstr "মন্তব্য সক্রিয় করুন" +#: conf/global_settings.py:68 +msgid "Japanese" +msgstr "জাপানিজ" -#: contrib/comments/models.py:233 -msgid "score" -msgstr "" +#: conf/global_settings.py:69 +msgid "Georgian" +msgstr "জর্জিয়ান" -#: contrib/comments/models.py:234 -#, fuzzy -msgid "score date" -msgstr "শেষ তারিখ" +#: conf/global_settings.py:70 +msgid "Korean" +msgstr "কোরিয়ান" -#: contrib/comments/models.py:237 -msgid "karma score" -msgstr "" +#: conf/global_settings.py:71 +msgid "Khmer" +msgstr "খমার" -#: contrib/comments/models.py:238 -msgid "karma scores" -msgstr "" +#: conf/global_settings.py:72 +msgid "Kannada" +msgstr "কান্নাড়া" -#: contrib/comments/models.py:242 -#, python-format -msgid "%(score)d rating by %(user)s" -msgstr "" +#: conf/global_settings.py:73 +msgid "Latvian" +msgstr "লাটভিয়ান" -#: contrib/comments/models.py:258 -#, python-format -msgid "" -"This comment was flagged by %(user)s:\n" -"\n" -"%(text)s" -msgstr "" +#: conf/global_settings.py:74 +msgid "Lithuanian" +msgstr "লিথুয়ানিয়ান" -#: contrib/comments/models.py:265 -#, fuzzy -msgid "flag date" -msgstr "চ্যাপ্টা পাতা" +#: conf/global_settings.py:75 +msgid "Macedonian" +msgstr "ম্যাসাডোনিয়ান" -#: contrib/comments/models.py:268 -#, fuzzy -msgid "user flag" -msgstr "ব্যবহারকারী" +#: conf/global_settings.py:76 +msgid "Dutch" +msgstr "ডাচ" -#: contrib/comments/models.py:269 -#, fuzzy -msgid "user flags" -msgstr "ব্যবহারকারী" +#: conf/global_settings.py:77 +msgid "Norwegian" +msgstr "নরওয়েজিয়ান" -#: contrib/comments/models.py:273 -#, python-format -msgid "Flag by %r" -msgstr "" +#: conf/global_settings.py:78 +msgid "Polish" +msgstr "পোলিশ" -#: contrib/comments/models.py:278 -#, fuzzy -msgid "deletion date" -msgstr "অধিবেশন তথ্য" +#: conf/global_settings.py:79 +msgid "Portugese" +msgstr "পর্তুগীজ" -#: contrib/comments/models.py:280 -msgid "moderator deletion" -msgstr "" +#: conf/global_settings.py:80 +msgid "Brazilian Portuguese" +msgstr "ব্রাজিলিয়ান পর্তুগীজ" -#: contrib/comments/models.py:281 -msgid "moderator deletions" -msgstr "" +#: conf/global_settings.py:81 +msgid "Romanian" +msgstr "রোমানিয়ান" -#: contrib/comments/models.py:285 -#, python-format -msgid "Moderator deletion by %r" -msgstr "" +#: conf/global_settings.py:82 +msgid "Russian" +msgstr "রাশান" -#: contrib/comments/views/karma.py:19 -msgid "Anonymous users cannot vote" -msgstr "" +#: conf/global_settings.py:83 +msgid "Slovak" +msgstr "স্লোভাক" -#: contrib/comments/views/karma.py:23 -#, fuzzy -msgid "Invalid comment ID" -msgstr "মন্তব্য সক্রিয় করুন" +#: conf/global_settings.py:84 +msgid "Slovenian" +msgstr "স্লোভেনিয়ান" -#: contrib/comments/views/karma.py:25 -msgid "No voting for yourself" -msgstr "" +#: conf/global_settings.py:85 +msgid "Serbian" +msgstr "সার্বিয়ান" -#: contrib/comments/views/comments.py:28 -msgid "" -"This rating is required because you've entered at least one other rating." -msgstr "" +#: conf/global_settings.py:86 +msgid "Swedish" +msgstr "সুইডিশ" -#: contrib/comments/views/comments.py:112 -#, python-format -msgid "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comment:\n" -"\n" -"%(text)s" -msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comments:\n" -"\n" -"%(text)s" -msgstr[0] "" -msgstr[1] "" +#: conf/global_settings.py:87 +msgid "Tamil" +msgstr "তামিল" -#: contrib/comments/views/comments.py:117 -#, python-format -msgid "" -"This comment was posted by a sketchy user:\n" -"\n" -"%(text)s" -msgstr "" +#: conf/global_settings.py:88 +msgid "Telugu" +msgstr "তেলেগু" -#: contrib/comments/views/comments.py:189 -#: contrib/comments/views/comments.py:280 -msgid "Only POSTs are allowed" -msgstr "" +#: conf/global_settings.py:89 +msgid "Turkish" +msgstr "তুর্কি" -#: contrib/comments/views/comments.py:193 -#: contrib/comments/views/comments.py:284 -msgid "One or more of the required fields wasn't submitted" -msgstr "" +#: conf/global_settings.py:90 +msgid "Ukrainian" +msgstr "ইউক্রেনিয়ান" -#: contrib/comments/views/comments.py:197 -#: contrib/comments/views/comments.py:286 -msgid "Somebody tampered with the comment form (security violation)" -msgstr "" +#: conf/global_settings.py:91 +msgid "Simplified Chinese" +msgstr "সরলীকৃত চাইনীজ" -#: contrib/comments/views/comments.py:207 -#: contrib/comments/views/comments.py:292 -msgid "" -"The comment form had an invalid 'target' parameter -- the object ID was " -"invalid" -msgstr "" +#: conf/global_settings.py:92 +msgid "Traditional Chinese" +msgstr "প্রচলিত চাইনীজ" -#: contrib/comments/views/comments.py:257 -#: contrib/comments/views/comments.py:321 -msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/login.html:17 -msgid "Username:" -msgstr "ব্যবহারকারীর নাম:" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/admin/templates/admin/login.html:20 -msgid "Password:" -msgstr "পাসওয়ার্ড:" - -#: contrib/comments/templates/comments/form.html:6 -#, fuzzy -msgid "Forgotten your password?" -msgstr "আমার পাসওয়ার্ড পরিবর্তন করুন" - -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "বাইরে যান" - -#: contrib/comments/templates/comments/form.html:12 -msgid "Ratings" -msgstr "" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Required" -msgstr "" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Optional" -msgstr "" - -#: contrib/comments/templates/comments/form.html:23 -msgid "Post a photo" -msgstr "" - -#: contrib/comments/templates/comments/form.html:27 -#: contrib/comments/templates/comments/freeform.html:5 -#, fuzzy -msgid "Comment:" -msgstr "মন্তব্য সক্রিয় করুন" - -#: contrib/comments/templates/comments/form.html:32 -#: contrib/comments/templates/comments/freeform.html:9 -#, fuzzy -msgid "Preview comment" -msgstr "মন্তব্য সক্রিয় করুন" - -#: contrib/comments/templates/comments/freeform.html:4 -#, fuzzy -msgid "Your name:" -msgstr "ব্যবহারকারীর নাম" - -#: contrib/admin/filterspecs.py:40 +#: contrib/admin/filterspecs.py:44 #, python-format msgid "" "

By %s:

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

    %s অনুযায়ী:

    \n" +"
      \n" -#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 -#: contrib/admin/filterspecs.py:143 +#: contrib/admin/filterspecs.py:74 +#: contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:147 +#: contrib/admin/filterspecs.py:173 msgid "All" -msgstr "" - -#: contrib/admin/filterspecs.py:109 -msgid "Any date" -msgstr "" - -#: contrib/admin/filterspecs.py:110 -#, fuzzy -msgid "Today" -msgstr "সোমবার" +msgstr "সকল" #: contrib/admin/filterspecs.py:113 -msgid "Past 7 days" -msgstr "" +msgid "Any date" +msgstr "যে কোন তারিখ" -#: contrib/admin/filterspecs.py:115 -msgid "This month" -msgstr "" +#: contrib/admin/filterspecs.py:114 +msgid "Today" +msgstr "‍আজ" #: contrib/admin/filterspecs.py:117 +msgid "Past 7 days" +msgstr "শেষ ৭ দিন" + +#: contrib/admin/filterspecs.py:119 +msgid "This month" +msgstr "এ মাসে" + +#: contrib/admin/filterspecs.py:121 msgid "This year" -msgstr "" +msgstr "এ বছরে" -#: contrib/admin/filterspecs.py:143 +#: contrib/admin/filterspecs.py:147 +#: forms/widgets.py:391 msgid "Yes" -msgstr "" +msgstr "হ্যাঁ" -#: contrib/admin/filterspecs.py:143 -#, fuzzy +#: contrib/admin/filterspecs.py:147 +#: forms/widgets.py:391 msgid "No" -msgstr "নভে." +msgstr "না" -#: contrib/admin/filterspecs.py:150 +#: contrib/admin/filterspecs.py:154 +#: forms/widgets.py:391 msgid "Unknown" -msgstr "" - -#: contrib/admin/models.py:16 -msgid "action time" -msgstr "কাজের সময়" +msgstr "অজানা" #: contrib/admin/models.py:19 -msgid "object id" -msgstr "বস্তু আই.ডি." - -#: contrib/admin/models.py:20 -msgid "object repr" -msgstr "বস্তু repr" - -#: contrib/admin/models.py:21 -msgid "action flag" -msgstr "কাজের ফ্ল্যাগ" +msgid "action time" +msgstr "কার্য সময়" #: contrib/admin/models.py:22 -msgid "change message" -msgstr "বার্তা পরিবর্তন" +msgid "object id" +msgstr "অবজেক্ট আইডি" + +#: contrib/admin/models.py:23 +msgid "object repr" +msgstr "অবজেক্ট উপস্থাপক" + +#: contrib/admin/models.py:24 +msgid "action flag" +msgstr "কার্যচিহ্ন" #: contrib/admin/models.py:25 +msgid "change message" +msgstr "বার্তা পরিবর্তন করুন" + +#: contrib/admin/models.py:28 msgid "log entry" -msgstr "কার্যবিবরণী এন্ট্রি" +msgstr "লগ এন্ট্রি" -#: contrib/admin/models.py:26 +#: contrib/admin/models.py:29 msgid "log entries" -msgstr "কার্যবিবরণী এন্ট্রি সমুহ" +msgstr "লগ এন্ট্রিসমূহ" -#: contrib/admin/templatetags/admin_list.py:228 -msgid "All dates" -msgstr "" +#: contrib/admin/options.py:60 +#: contrib/admin/options.py:121 +msgid "None" +msgstr "কিছু না" -#: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36 -#: contrib/auth/forms.py:41 -msgid "" -"Please enter a correct username and password. Note that both fields are case-" -"sensitive." -msgstr "" - -#: contrib/admin/views/decorators.py:23 -#: contrib/admin/templates/admin/login.html:25 -msgid "Log in" -msgstr "প্রবেশ করুন" - -#: contrib/admin/views/decorators.py:61 -msgid "" -"Please log in again, because your session has expired. Don't worry: Your " -"submission has been saved." -msgstr "" - -#: contrib/admin/views/decorators.py:68 -msgid "" -"Looks like your browser isn't configured to accept cookies. Please enable " -"cookies, reload this page, and try again." -msgstr "" - -#: contrib/admin/views/decorators.py:82 -msgid "Usernames cannot contain the '@' character." -msgstr "" - -#: contrib/admin/views/decorators.py:84 +#: contrib/admin/options.py:338 #, python-format -msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "" +msgid "Changed %s." +msgstr "%s পরিবর্তিত হয়েছে।" -#: contrib/admin/views/main.py:226 -#, fuzzy -msgid "Site administration" -msgstr "জ্যাঙ্গো পরিচালনা" +#: contrib/admin/options.py:338 +#: contrib/admin/options.py:348 +#: forms/models.py:275 +msgid "and" +msgstr "এবং" -#: contrib/admin/views/main.py:260 +#: contrib/admin/options.py:343 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" যুক্ত হয়েছে।" + +#: contrib/admin/options.py:347 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" এর জন্য %(list)s পরিবর্তিত হয়েছে।" + +#: contrib/admin/options.py:352 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" মোছা হয়েছে।" + +#: contrib/admin/options.py:356 +msgid "No fields changed." +msgstr "কোন ফিল্ড পরিবর্তন হয়নি।" + +#: contrib/admin/options.py:417 +#: contrib/auth/admin.py:51 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "" +msgstr "%(name)s \"%(obj)s\" সফলতার সাথে যুক্ত হয়েছে।" -#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348 +#: contrib/admin/options.py:421 +#: contrib/admin/options.py:454 +#: contrib/auth/admin.py:59 msgid "You may edit it again below." -msgstr "" +msgstr "আপনি নিচে থেকে এটি পুনরায় সম্পাদন করতে পারেন।" -#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357 +#: contrib/admin/options.py:431 +#: contrib/admin/options.py:464 #, python-format msgid "You may add another %s below." -msgstr "" +msgstr "আপনি নিচে থেকে আরেকটি %s যোগ করতে পারেন।" -#: contrib/admin/views/main.py:290 -#, fuzzy, python-format -msgid "Add %s" -msgstr "যোগ করুন" - -#: contrib/admin/views/main.py:336 -#, python-format -msgid "Added %s." -msgstr "" - -#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338 -#: contrib/admin/views/main.py:340 -msgid "and" -msgstr "" - -#: contrib/admin/views/main.py:338 -#, fuzzy, python-format -msgid "Changed %s." -msgstr "পরিবর্তন" - -#: contrib/admin/views/main.py:340 -#, python-format -msgid "Deleted %s." -msgstr "" - -#: contrib/admin/views/main.py:343 -msgid "No fields changed." -msgstr "" - -#: contrib/admin/views/main.py:346 +#: contrib/admin/options.py:452 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "" +msgstr "%(name)s \"%(obj)s\" সফলতার সাথে পরিবর্তিত হয়েছে।" -#: contrib/admin/views/main.py:354 +#: contrib/admin/options.py:460 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "" +msgstr "%(name)s \"%(obj)s\" সফলতার সাথে যুক্ত হয়েছে। আপনি নিচে থেকে এটি পুনরায় সম্পাদন করতে পারেন।" -#: contrib/admin/views/main.py:392 -#, fuzzy, python-format +#: contrib/admin/options.py:536 +#, python-format +msgid "Add %s" +msgstr "%s যোগ করুন" + +#: contrib/admin/options.py:614 +#, python-format msgid "Change %s" -msgstr "পরিবর্তন" +msgstr "%s পরিবর্তন করুন" -#: contrib/admin/views/main.py:470 -#, python-format -msgid "One or more %(fieldname)s in %(name)s: %(obj)s" -msgstr "" +#: contrib/admin/options.py:646 +msgid "Database error" +msgstr "ডাটাবেস সমস্যা" -#: contrib/admin/views/main.py:475 -#, python-format -msgid "One or more %(fieldname)s in %(name)s:" -msgstr "" - -#: contrib/admin/views/main.py:508 +#: contrib/admin/options.py:696 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "" +msgstr "%(name)s \"%(obj)s\" সফলতার সাথে মুছে ফেলা হয়েছে।" -#: contrib/admin/views/main.py:511 +#: contrib/admin/options.py:703 msgid "Are you sure?" -msgstr "" +msgstr "আপনি কি নিশ্চিত?" -#: contrib/admin/views/main.py:533 -#, fuzzy, python-format +#: contrib/admin/options.py:732 +#, python-format msgid "Change history: %s" -msgstr "পাসওয়ার্ড পরিবর্তন করুন" +msgstr "ইতিহাস পরিবর্তনঃ %s" -#: contrib/admin/views/main.py:565 -#, python-format -msgid "Select %s" -msgstr "" - -#: contrib/admin/views/main.py:565 -#, python-format -msgid "Select %s to change" -msgstr "" - -#: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286 -#: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294 -#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297 -msgid "Integer" -msgstr "" - -#: contrib/admin/views/doc.py:278 -msgid "Boolean (Either True or False)" -msgstr "" - -#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296 -#, python-format -msgid "String (up to %(maxlength)s)" -msgstr "" - -#: contrib/admin/views/doc.py:280 -msgid "Comma-separated integers" -msgstr "" - -#: contrib/admin/views/doc.py:281 -#, fuzzy -msgid "Date (without time)" -msgstr "কাজের সময়" - -#: contrib/admin/views/doc.py:282 -#, fuzzy -msgid "Date (with time)" -msgstr "তারিখ/সময়" - -#: contrib/admin/views/doc.py:283 -#, fuzzy -msgid "E-mail address" -msgstr "ই-মেল ঠিকানা:" - -#: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287 -msgid "File path" -msgstr "" - -#: contrib/admin/views/doc.py:285 -#, fuzzy -msgid "Decimal number" -msgstr "ডিসেম্বর" - -#: contrib/admin/views/doc.py:291 -msgid "Boolean (Either True, False or None)" -msgstr "" - -#: contrib/admin/views/doc.py:292 -msgid "Relation to parent model" -msgstr "" - -#: contrib/admin/views/doc.py:293 -#, fuzzy -msgid "Phone number" -msgstr "একটি গোটা সংখ্যা ঢোকান।" - -#: contrib/admin/views/doc.py:298 -msgid "Text" -msgstr "" - -#: contrib/admin/views/doc.py:299 -msgid "Time" -msgstr "" - -#: contrib/admin/views/doc.py:300 contrib/flatpages/models.py:7 -msgid "URL" -msgstr "ইউ.আর.এল" - -#: contrib/admin/views/doc.py:301 -msgid "U.S. state (two uppercase letters)" -msgstr "" - -#: contrib/admin/views/doc.py:302 -msgid "XML text" -msgstr "" - -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "" - -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Change password" -msgstr "পাসওয়ার্ড পরিবর্তন করুন" - -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 -#: contrib/admin/templates/admin/change_list.html:6 -#: contrib/admin/templates/admin/base.html:28 -#: contrib/admin/templates/admin/delete_confirmation.html:6 -#: contrib/admin/templates/admin/change_form.html:13 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 -#: contrib/admin/templates/registration/password_change_form.html:4 -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Home" -msgstr "বাড়ি" - -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/change_form.html:20 -msgid "History" -msgstr "ইতিহাস" - -#: contrib/admin/templates/admin/object_history.html:18 -msgid "Date/time" -msgstr "তারিখ/সময়" - -#: contrib/admin/templates/admin/object_history.html:19 -msgid "User" -msgstr "ব্যবহারকারী" - -#: contrib/admin/templates/admin/object_history.html:20 -msgid "Action" -msgstr "কাজ" - -#: contrib/admin/templates/admin/object_history.html:26 -msgid "DATE_WITH_TIME_FULL" -msgstr "N j, Y, P" - -#: contrib/admin/templates/admin/object_history.html:36 +#: contrib/admin/sites.py:16 +#: contrib/admin/views/decorators.py:14 +#: contrib/auth/forms.py:80 msgid "" -"This object doesn't have a change history. It probably wasn't added via this " -"admin site." -msgstr "" -"এই বস্তুটি একটি পরিবর্তন ইতিহাস নেই। এইটি এই অ্যাডমিন স্থান দ্বারা সম্ভবত যোগ করা " -"হয় নি।" +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." +msgstr "অনুগ্রহপূর্বক সঠিক সদস্যনাম ও পাসওয়ার্ড প্রবেশ করান।" -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "জ্যাঙ্গো স্থান অ্যাডমিন" +#: contrib/admin/sites.py:227 +#: contrib/admin/views/decorators.py:40 +msgid "Please log in again, because your session has expired." +msgstr "অনুগ্রহ করে পুনরায় প্রবেশ করুন, কেননা আপনার সেশনের মেয়াদ শেষ।" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "জ্যাঙ্গো পরিচালনা" +#: contrib/admin/sites.py:234 +#: contrib/admin/views/decorators.py:47 +msgid "" +"Looks like your browser isn't configured to accept cookies. Please enable " +"cookies, reload this page, and try again." +msgstr "আপনার ব্রাউজার কুকি গ্রহণ করছে না। অনুগ্রহ করে কুকি কার্যকর করুন।" + +#: contrib/admin/sites.py:250 +#: contrib/admin/sites.py:256 +#: contrib/admin/views/decorators.py:66 +msgid "Usernames cannot contain the '@' character." +msgstr "সদস্যনামে @ থাকতে পারবে না।" + +#: contrib/admin/sites.py:253 +#: contrib/admin/views/decorators.py:62 +#, python-format +msgid "Your e-mail address is not your username. Try '%s' instead." +msgstr "আপনার ইমেইল ঠিকানা, আপনার সদস্যনাম নয়। ’%s' চেষ্টা করতে পারেন।" + +#: contrib/admin/sites.py:313 +msgid "Site administration" +msgstr "সাইট প্রশাসন" + +#: contrib/admin/sites.py:326 +#: contrib/admin/templates/admin/login.html:26 +#: contrib/admin/templates/registration/password_reset_complete.html:14 +#: contrib/admin/views/decorators.py:20 +msgid "Log in" +msgstr "প্রবেশ করুন" + +#: contrib/admin/sites.py:373 +#, python-format +msgid "%s administration" +msgstr "%s প্রশাসন" + +#: contrib/admin/util.py:138 +#, python-format +msgid "One or more %(fieldname)s in %(name)s: %(obj)s" +msgstr "%(name)s: %(obj)s -এ এক একাধিক %(fieldname)s রয়েছে" + +#: contrib/admin/util.py:143 +#, python-format +msgid "One or more %(fieldname)s in %(name)s:" +msgstr "%(name)s -এ এক একাধিক %(fieldname)s রয়েছেঃ" + +#: contrib/admin/widgets.py:70 +msgid "Date:" +msgstr "তারিখঃ" + +#: contrib/admin/widgets.py:70 +msgid "Time:" +msgstr "সময়ঃ" + +#: contrib/admin/widgets.py:94 +msgid "Currently:" +msgstr "চলতিঃ" + +#: contrib/admin/widgets.py:94 +msgid "Change:" +msgstr "পরিবর্তিতঃ" + +#: contrib/admin/widgets.py:121 +msgid "Lookup" +msgstr "খুঁজুন" + +#: contrib/admin/widgets.py:228 +msgid "Add Another" +msgstr "আরেকটি যোগ করুন" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "পৃষ্ঠা পাওয়া যায়নি" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "দুঃখিত, অনুরোধকৃত পাতাটি পাওয়া যায়নি।" + +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/app_index.html:8 +#: contrib/admin/templates/admin/base.html:30 +#: contrib/admin/templates/admin/change_form.html:17 +#: contrib/admin/templates/admin/change_list.html:8 +#: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/invalid_setup.html:4 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/admin/auth/user/change_password.html:10 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_complete.html:4 +#: contrib/admin/templates/registration/password_reset_confirm.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 +msgid "Home" +msgstr "নীড়পাতা" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" -msgstr "সার্ভার ত্রুটি" +msgstr "সার্ভার সমস্যা" #: contrib/admin/templates/admin/500.html:6 msgid "Server error (500)" -msgstr "সার্ভার ত্রুটি (৫০০)" +msgstr "সার্ভার সমস্যা (৫০০)" #: contrib/admin/templates/admin/500.html:9 msgid "Server Error (500)" -msgstr "সার্ভার ত্রুটি(৫০০)" +msgstr "সার্ভার সমস্যা (৫০০)" #: contrib/admin/templates/admin/500.html:10 msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"একটি ত্রুটি আছে। এইটি স্থান পরিচালককে ই-মেল দ্বারা প্রতিবেদন করা হয়েছে এবং খুব " -"তাড়াতাড়ি মেরামত করা হবে। আপনার ধৈর্য্যের জন্য ধন্যবাদ।" +msgstr "একটি সমস্যা দেখা গিয়েছে। সাইট প্রশাসনকে ইমেইলের মাধ্যমে অবহিত করা হয়েছে। খুব শীঘ্রই সমস্যার সমাধান হবে আশা করা যাচ্ছে। অনুগ্রহপূর্বক অপেক্ষা করুন।" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "পাতা খুঁজে পাওয়া গেল না" - -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "আমরা দুঃখিত, কিন্তু আবেদনকৃত পাতা খুঁজে পাওয়া গেল না।" - -#: contrib/admin/templates/admin/index.html:17 +#: contrib/admin/templates/admin/app_index.html:10 +#: contrib/admin/templates/admin/index.html:19 #, python-format -msgid "Models available in the %(name)s application." -msgstr "" +msgid "%(name)s" +msgstr "%(name)s" -#: contrib/admin/templates/admin/index.html:28 -#: contrib/admin/templates/admin/change_form.html:15 -msgid "Add" -msgstr "যোগ করুন" - -#: contrib/admin/templates/admin/index.html:34 -msgid "Change" -msgstr "পরিবর্তন" - -#: contrib/admin/templates/admin/index.html:44 -msgid "You don't have permission to edit anything." -msgstr "আপনার কোন কিছু সম্পাদনা করতে অনুমতি নেই।" - -#: contrib/admin/templates/admin/index.html:52 -msgid "Recent Actions" -msgstr "সাম্প্রতিক কাজ" - -#: contrib/admin/templates/admin/index.html:53 -msgid "My Actions" -msgstr "আমার কাজ" - -#: contrib/admin/templates/admin/index.html:57 -msgid "None available" -msgstr "কিছুই পাওয়া যাচ্ছে না" - -#: contrib/admin/templates/admin/change_list.html:11 -#, fuzzy, python-format -msgid "Add %(name)s" -msgstr "যোগ করুন" - -#: contrib/admin/templates/admin/login.html:22 -msgid "Have you forgotten your password?" -msgstr "আপনি কি আপনার পাসওয়ার্ড ভুলে গেছেন?" - -#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/base.html:25 msgid "Welcome," -msgstr "স্বাগত," +msgstr "স্বাগতম," -#: contrib/admin/templates/admin/delete_confirmation.html:9 -#: contrib/admin/templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "সহায়িকা" + +#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +msgid "Change password" +msgstr "পাসওয়ার্ড বদলান" + +#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +msgid "Log out" +msgstr "প্রস্থান" + +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "জ্যাঙ্গো সাইট প্রশাসক" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "জ্যাঙ্গো প্রশাসন" + +#: contrib/admin/templates/admin/change_form.html:20 +#: contrib/admin/templates/admin/index.html:29 +msgid "Add" +msgstr "যোগ করুন" + +#: contrib/admin/templates/admin/change_form.html:27 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "ইতিহাস" + +#: contrib/admin/templates/admin/change_form.html:28 +#: contrib/admin/templates/admin/edit_inline/stacked.html:13 +#: contrib/admin/templates/admin/edit_inline/tabular.html:25 +msgid "View on site" +msgstr "সাইটে দেখুন" + +#: contrib/admin/templates/admin/change_form.html:38 +#: contrib/admin/templates/admin/auth/user/change_password.html:22 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "অনুগ্রহ করে নিচের ভুলটি সংশোধন করুন।" +msgstr[1] "অনুগ্রহ করে নিচের ভুলগুলো সংশোধন করুন।" + +#: contrib/admin/templates/admin/change_list.html:16 +#, python-format +msgid "Add %(name)s" +msgstr "%(name)s যোগ করুন" + +#: contrib/admin/templates/admin/change_list.html:26 +msgid "Filter" +msgstr "ফিল্টার" + +#: contrib/admin/templates/admin/delete_confirmation.html:10 +#: contrib/admin/templates/admin/submit_line.html:4 +#: forms/formsets.py:246 msgid "Delete" -msgstr "" +msgstr "মুছুন" -#: contrib/admin/templates/admin/delete_confirmation.html:14 +#: contrib/admin/templates/admin/delete_confirmation.html:16 #, python-format msgid "" -"Deleting the %(object_name)s '%(object)s' would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" -"%(object_name)s '%(object)s' মুছে ফেললে তা সম্পর্কিত বস্তুও মুছে ফেলা হবে কিন্তু " -"আপনার অ্যাকাউন্টে বস্তুর নিম্নলিখিত ধরন মুছে ফেলার অনুমতি নেই:" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "%(object_name)s '%(escaped_object)s' মুছে ফেললে এর সম্পর্কিত অবজেক্টগুলোও মুছে যাবে, কিন্তু আপনার নিম্নবর্ণিত অবজেক্টগুলো মোছার অধিকার নেইঃ" -#: contrib/admin/templates/admin/delete_confirmation.html:21 +#: contrib/admin/templates/admin/delete_confirmation.html:23 #, python-format msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"%(object_name)s\" %(object)s\" মুছে ফেলতে আপনি কি নিশ্চিত? নিম্নলিখিত সম্পর্কিত " -"বস্তুর সব মুছে ফেলা হবে:" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "আপনি কি %(object_name)s \"%(escaped_object)s\" মুছে ফেলার ব্যাপারে নিশ্চিত? নিম্নে বর্ণিত সকল আইটেম মুছে যাবেঃ" -#: contrib/admin/templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:28 msgid "Yes, I'm sure" -msgstr "হ্যাঁ, আমি নিশ্চিত" +msgstr "হ্যা়ঁ, আমি নিশ্চিত" #: contrib/admin/templates/admin/filter.html:2 #, python-format -msgid " By %(title)s " -msgstr "" +msgid " By %(filter_title)s " +msgstr " %(filter_title)s অনুযায়ী " + +#: contrib/admin/templates/admin/index.html:18 +#, python-format +msgid "Models available in the %(name)s application." +msgstr "%(name)s এ্যপ্লিকেশনে অবস্থিত মডেলসমূহ" + +#: contrib/admin/templates/admin/index.html:35 +msgid "Change" +msgstr "পরিবর্তন" + +#: contrib/admin/templates/admin/index.html:45 +msgid "You don't have permission to edit anything." +msgstr "কোন কিছু পরিবর্তনে আপনার অধিকার নেই।" + +#: contrib/admin/templates/admin/index.html:53 +msgid "Recent Actions" +msgstr "সাম্প্রতিক কার্যাবলী" + +#: contrib/admin/templates/admin/index.html:54 +msgid "My Actions" +msgstr "আমার কার্যাবলী" + +#: contrib/admin/templates/admin/index.html:58 +msgid "None available" +msgstr "কিছুই পাওয়া যায়নি" + +#: contrib/admin/templates/admin/invalid_setup.html:7 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "আপনার ডাটাবেস ইনস্টলে সমস্যা হয়েছে। নিশ্চিত করুন যে, ডাটাবেস টেবিলগুলো সঠিকভাবে তৈরী হয়েছে, এবং যথাযথ সদস্যের ডাটাবেস পড়ার অধিকার রয়েছে।" + +#: contrib/admin/templates/admin/login.html:19 +msgid "Username:" +msgstr "সদস্যনামঃ" + +#: contrib/admin/templates/admin/login.html:22 +msgid "Password:" +msgstr "পাসওয়ার্ডঃ" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "তারিখ/সময়" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "সদস্য" + +#: contrib/admin/templates/admin/object_history.html:24 +msgid "Action" +msgstr "কার্য" + +#: contrib/admin/templates/admin/object_history.html:30 +#: utils/translation/trans_real.py:404 +msgid "DATETIME_FORMAT" +msgstr "N j, Y, P" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "এই অবজেক্টের কোন ইতিহাস নেই। সম্ভবত এটি প্রশাসন সাইট দিয়ে তৈরী করা হয়নি।" + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "সব দেখান" #: contrib/admin/templates/admin/search_form.html:8 msgid "Go" -msgstr "" +msgstr "যান" -#: contrib/admin/templates/admin/change_form.html:21 -msgid "View on site" -msgstr "" +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "1 result" +msgid_plural "%(counter)s results" +msgstr[0] "একটি ফলাফল" +msgstr[1] "%(counter)s ফলাফল" -#: contrib/admin/templates/admin/change_form.html:30 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "%(full_result_count)s total" +msgstr "মোট %(full_result_count)s" -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:51 -msgid "Order:" -msgstr "" - -#: contrib/admin/templates/admin/submit_line.html:4 -msgid "Save as new" -msgstr "" +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "সংরক্ষণ করুন" #: contrib/admin/templates/admin/submit_line.html:5 -msgid "Save and add another" -msgstr "" +msgid "Save as new" +msgstr "নতুনভাবে সংরক্ষণ করুন" #: contrib/admin/templates/admin/submit_line.html:6 -msgid "Save and continue editing" -msgstr "" +msgid "Save and add another" +msgstr "সংরক্ষণ করুন এবং আরেকটি যোগ করুন" #: contrib/admin/templates/admin/submit_line.html:7 -#, fuzzy -msgid "Save" -msgstr "সক্রিয়" +msgid "Save and continue editing" +msgstr "সংরক্ষণ করুন এবং সম্পাদনা চালিয়ে যান" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "প্রথমে একটি সদস্যনাম ও পাসওয়ার্ড প্রবেশ করান। তারপরে আপনি ‍আরও সদস্য-অপশন যুক্ত করতে পারবেন।" + +#: contrib/admin/templates/admin/auth/user/add_form.html:13 +#: contrib/auth/forms.py:14 +#: contrib/auth/forms.py:47 +#: contrib/auth/forms.py:59 +msgid "Username" +msgstr "সদস্যনাম" + +#: contrib/admin/templates/admin/auth/user/add_form.html:20 +#: contrib/admin/templates/admin/auth/user/change_password.html:33 +#: contrib/auth/forms.py:17 +#: contrib/auth/forms.py:60 +#: contrib/auth/forms.py:184 +msgid "Password" +msgstr "পাসওয়ার্ড" + +#: contrib/admin/templates/admin/auth/user/add_form.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:39 +#: contrib/auth/forms.py:185 +msgid "Password (again)" +msgstr "পাসওয়ার্ড (পুনরায়)" + +#: contrib/admin/templates/admin/auth/user/add_form.html:27 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +msgid "Enter the same password as above, for verification." +msgstr "উপরের পাসওয়ার্ডটি পুনরায় প্রবেশ করান, যাচাইয়ের জন্য।" + +#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s সদস্যের জন্য নতুন পাসওয়ার্ড দিন।" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:15 +msgid "Delete?" +msgstr "মুছে ফেলুন?" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "ওয়েবসাইটে কিছু সময় কাটানোর জন্য আপনাকে আন্তরিক ধন্যবাদ।" + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "পুনরায় প্রবেশ করুন" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 #: contrib/admin/templates/registration/password_change_form.html:6 #: contrib/admin/templates/registration/password_change_form.html:10 msgid "Password change" -msgstr "পাসওয়ার্ড পরিবর্তন" +msgstr "পাসওয়ার্ড বদলান" #: contrib/admin/templates/registration/password_change_done.html:6 #: contrib/admin/templates/registration/password_change_done.html:10 msgid "Password change successful" -msgstr "পাসওয়ার্ড পরিবর্তন সফল" +msgstr "পাসওয়ার্ড বদল সফল হয়েছে" #: contrib/admin/templates/registration/password_change_done.html:12 msgid "Your password was changed." -msgstr "আপনার পাসওয়ার্ড পরিবর্তন করা হয়েছিল।" - -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_form.html:10 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "পাসওয়ার্ড রিসেট" - -#: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll reset " -"your password and e-mail the new one to you." -msgstr "" -"আপনি কি আপনার পাসওয়ার্ড ভুলে গেছেন? আপনার ই-মেল ঠিকানা নিচে দিন এবং আমরা আপনার " -"পাসওয়ার্ড রিসেট করে এবং আপনাকে নতুন এক পাসওয়ার্ড ই-মেল করে দেব।" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "ই-মেল ঠিকানা:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "আমার পাসওয়ার্ড রিসেট করুন" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "এই ওয়েব স্থানে আপনার কিছু সময় খরচ করার জন্য ধন্যবাদ।" - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "আবার প্রবেশ করুন" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "পাসওয়ার্ড রিসেট সফল" - -#: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "" -"We've e-mailed a new password to the e-mail address you submitted. You " -"should be receiving it shortly." -msgstr "" -"আমরা আপনাকে একটি নতুন পাসওয়ার্ড আপনার দেওয়া ই-মেল ঠিকানায় পাঠিয়ে দিয়েছি। আপনার " -"তা খুব তাড়াতাড়ি পাওয়া উচিত।" +msgstr "আপনার পাসওয়ার্ড বদলানো হয়েছে।" #: contrib/admin/templates/registration/password_change_form.html:12 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." -msgstr "" -"দয়া করে আপনার পুরনো পাসওয়ার্ড ঢোকান, নিরাপত্তার জন্য, এবংএর জন্য তারপর আপনার নতুন " -"পাসওয়ার্ড দুবার ঢোকান যাতে আমরা সঠিকভাবেতে তার বৈধতা পরীক্ষণ করতে পারি।" +msgstr "অনুগ্রহ করে আপনার পুরনো পাসওয়ার্ড প্রবেশ করান, নিরাপত্তার কাতিরে, এবং পরপর দু’বার নতুন পাসওয়ার্ড প্রবেশ করান, যাচাই করার জন্য।" #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" -msgstr "পুরনো পাসওয়ার্ড:" +msgstr "পুরনো পাসওয়ার্ডঃ" #: contrib/admin/templates/registration/password_change_form.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:18 msgid "New password:" -msgstr "নতুন পাসওয়ার্ড:" +msgstr "নতুন পাসওয়ার্ডঃ" #: contrib/admin/templates/registration/password_change_form.html:21 +#: contrib/admin/templates/registration/password_reset_confirm.html:20 msgid "Confirm password:" -msgstr "পাসওয়ার্ড দৃঢ়তরভাবে প্রতিপন্ন করুন:" +msgstr "পাসওয়ার্ড নিশ্চিতকরণঃ" #: contrib/admin/templates/registration/password_change_form.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "Change my password" msgstr "আমার পাসওয়ার্ড পরিবর্তন করুন" +#: contrib/admin/templates/registration/password_reset_complete.html:4 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:10 +msgid "Password reset" +msgstr "পাসওয়ার্ড রিসেট করুন" + +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_complete.html:10 +msgid "Password reset complete" +msgstr "পাসওয়ার্ড রিসেট সম্পন্ন হয়েছে" + +#: contrib/admin/templates/registration/password_reset_complete.html:12 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "আপনার পাসওয়ার্ড দেয়া হয়েছে। আপনি এখন প্রবেশ (লগইন) করতে পারেন।" + +#: contrib/admin/templates/registration/password_reset_confirm.html:4 +msgid "Password reset confirmation" +msgstr "পাসওয়ার্ড রিসেট নিশ্চিত করুন" + +#: contrib/admin/templates/registration/password_reset_confirm.html:12 +msgid "Enter new password" +msgstr "নতুন পাসওয়ার্ড দিন" + +#: contrib/admin/templates/registration/password_reset_confirm.html:14 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "অনুগ্রহ করে আপনার পাসওয়ার্ড দুবার প্রবেশ করান, যাতে আমরা যাচাই করতে পারি আপনি সঠিকভাবে টাইপ করেছেন।" + +#: contrib/admin/templates/registration/password_reset_confirm.html:26 +msgid "Password reset unsuccessful" +msgstr "পাসওয়ার্ড রিসেট সফল হয়নি" + +#: contrib/admin/templates/registration/password_reset_confirm.html:28 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "পাসওয়ার্ড রিসেট লিঙ্কটি ঠিক নয়, হয়তো এটা ইতোমধ্যে ব্যবহৃত হয়েছে। পাসওয়ার্ড রিসেটের জন্য অনুগ্রহ করে নতুনভাবে আবেদন করুন।" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "পাসওয়ার্ড রিসেট সফল হয়েছে" + +#: contrib/admin/templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed you instructions for setting your password to the e-mail " +"address you submitted. You should be receiving it shortly." +msgstr "আপনার পাসওয়ার্ড ঠিক করার নিয়ম আপনাকে ইমেইল করা হয়েছে। শীঘ্রই আপনি ইমেইল পাবেন।" + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" -msgstr "আপনি এই ই-মেলটি পাচ্ছেন কারণ আপনি একটি পাসওয়ার্ড রিসেট অনুরোধ করেছেন" +msgstr "আপনি পাসওয়ার্ড রিসেট করতে চেয়েছেন বিধায় এই ইমেইল পাঠানো হয়েছে" #: contrib/admin/templates/registration/password_reset_email.html:3 #, python-format msgid "for your user account at %(site_name)s" -msgstr "%(site_name)s আপনার ব্যবহারকারী অ্যাকাউন্টের জন্য" +msgstr "%(site_name)s -এ আপনার একাউন্টের জন্য" #: contrib/admin/templates/registration/password_reset_email.html:5 -#, python-format -msgid "Your new password is: %(new_password)s" -msgstr "আপনার নতুন পাসওয়ার্ড: %(new_password)s" +msgid "Please go to the following page and choose a new password:" +msgstr "অনুগ্রহ করে নিচের পাতাটিতে যান এবং নতুন পাসওয়ার্ড বাছাই করুনঃ" -#: contrib/admin/templates/registration/password_reset_email.html:7 -msgid "Feel free to change this password by going to this page:" -msgstr "এই পাতাটিতে গিয়ে এই পাসওয়ার্ডটি পরিবর্তন করতে মুক্ত অনুভব করুন:" +#: contrib/admin/templates/registration/password_reset_email.html:9 +msgid "Your username, in case you've forgotten:" +msgstr "আপনার সদস্যনাম, যদি ভুলে গিয়ে থাকেনঃ" #: contrib/admin/templates/registration/password_reset_email.html:11 -msgid "Your username, in case you've forgotten:" -msgstr "আপনার ব্যবহারকারীর নাম, যদি আপনি ভুলে গিয়ে থাকেন:" +msgid "Thanks for using our site!" +msgstr "আমাদের সাইট ব্যবহারের জন্য ধন্যবাদ!" #: contrib/admin/templates/registration/password_reset_email.html:13 -msgid "Thanks for using our site!" -msgstr "আমাদের স্থান ব্যবহার করার জন্য ধন্যবাদ!" - -#: contrib/admin/templates/registration/password_reset_email.html:15 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s দল" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +#: contrib/admin/templates/registration/password_reset_form.html:12 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll e-mail " +"instructions for setting a new one." +msgstr "পাসওয়ার্ড ভুলে গেছেন? আপনার ইমেইল ঠিকানা দিন, আমরা নতুন পাসওয়ার্ড দেয়ার নিয়ম আপনাকে মেইল করে দেবো।" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "ইমেইল ঠিকানঃ" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "আমার পাসওয়ার্ড রিসেট করুন" + +#: contrib/admin/templatetags/admin_list.py:288 +msgid "All dates" +msgstr "সকল তারিখ" + +#: contrib/admin/views/main.py:69 +#, python-format +msgid "Select %s" +msgstr "%s বাছাই করুন" + +#: contrib/admin/views/main.py:69 +#, python-format +msgid "Select %s to change" +msgstr "%s পরিবর্তনের জন্য বাছাই করুন" + +#: contrib/admin/views/template.py:36 +#: contrib/sites/models.py:38 +msgid "site" +msgstr "সাইট" + +#: contrib/admin/views/template.py:38 +msgid "template" +msgstr "টেমপ্লেট" + +#: contrib/admindocs/views.py:57 +#: contrib/admindocs/views.py:59 +#: contrib/admindocs/views.py:61 +msgid "tag:" +msgstr "ট্যাগঃ" + +#: contrib/admindocs/views.py:90 +#: contrib/admindocs/views.py:92 +#: contrib/admindocs/views.py:94 +msgid "filter:" +msgstr "ফিল্টারঃ" + +#: contrib/admindocs/views.py:154 +#: contrib/admindocs/views.py:156 +#: contrib/admindocs/views.py:158 +msgid "view:" +msgstr "ভিউঃ" + +#: contrib/admindocs/views.py:186 +#, python-format +msgid "App %r not found" +msgstr "%r এ্যপটি পাওয়া যায়নি" + +#: contrib/admindocs/views.py:193 +#, python-format +msgid "Model %(model_name)r not found in app %(app_label)r" +msgstr "%(app_label)r এ্যপে %(model_name)r মডেলটি পাওয়া যায়নি" + +#: contrib/admindocs/views.py:205 +#, python-format +msgid "the related `%(app_label)s.%(data_type)s` object" +msgstr "`%(app_label)s.%(data_type)s` সম্পর্কিত অবজেক্ট" + +#: contrib/admindocs/views.py:205 +#: contrib/admindocs/views.py:227 +#: contrib/admindocs/views.py:241 +#: contrib/admindocs/views.py:246 +msgid "model:" +msgstr "মডেলঃ" + +#: contrib/admindocs/views.py:236 +#, python-format +msgid "related `%(app_label)s.%(object_name)s` objects" +msgstr "`%(app_label)s.%(object_name)s` সম্পর্কিত অবজেক্ট সমূহ" + +#: contrib/admindocs/views.py:241 +#, python-format +msgid "all %s" +msgstr "সকল %s" + +#: contrib/admindocs/views.py:246 +#, python-format +msgid "number of %s" +msgstr "%s সংখ্যা" + +#: contrib/admindocs/views.py:251 +#, python-format +msgid "Fields on %s objects" +msgstr "%s অবজেক্টে ফিল্ডগুলো" + +#: contrib/admindocs/views.py:314 +#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:334 +#: contrib/admindocs/views.py:336 +msgid "Integer" +msgstr "ইন্টিজার" + +#: contrib/admindocs/views.py:315 +msgid "Boolean (Either True or False)" +msgstr "বুলিয়ান (হয় True অথবা False)" + +#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "স্ট্রিং (সর্বোচ্চ %(max_length)s)" + +#: contrib/admindocs/views.py:317 +msgid "Comma-separated integers" +msgstr "কমা দিয়ে আলাদা করা ইন্টিজার" + +#: contrib/admindocs/views.py:318 +msgid "Date (without time)" +msgstr "তারিখ (সময় বাদে)" + +#: contrib/admindocs/views.py:319 +msgid "Date (with time)" +msgstr "তারিখ (সময় সহ)" + +#: contrib/admindocs/views.py:320 +msgid "Decimal number" +msgstr "দশমিক সংখ্যা" + +#: contrib/admindocs/views.py:321 +msgid "E-mail address" +msgstr "ইমেইল ঠিকানা" + +#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:323 +#: contrib/admindocs/views.py:326 +msgid "File path" +msgstr "ফাইল পথ" + +#: contrib/admindocs/views.py:324 +msgid "Floating point number" +msgstr "ফ্লোটিং পয়েন্ট সংখ্যা" + +#: contrib/admindocs/views.py:328 +#: contrib/comments/models.py:58 +msgid "IP address" +msgstr "আইপি ঠিকানা" + +#: contrib/admindocs/views.py:330 +msgid "Boolean (Either True, False or None)" +msgstr "বুলিয়ান (হয় True, False অথবা None)" + +#: contrib/admindocs/views.py:331 +msgid "Relation to parent model" +msgstr "পৈতৃক মডলের সাথে সম্পর্ক" + +#: contrib/admindocs/views.py:332 +msgid "Phone number" +msgstr "ফোন নাম্বার" + +#: contrib/admindocs/views.py:337 +msgid "Text" +msgstr "টেক্সট" + +#: contrib/admindocs/views.py:338 +msgid "Time" +msgstr "সময়" + +#: contrib/admindocs/views.py:339 +#: contrib/comments/forms.py:22 +#: contrib/flatpages/admin.py:8 +#: contrib/flatpages/models.py:7 +msgid "URL" +msgstr "ইউআরএল (URL)" + +#: contrib/admindocs/views.py:340 +msgid "U.S. state (two uppercase letters)" +msgstr "ইউ, এস, রাজ্য (দুটো আপারকেস অক্ষর)" + +#: contrib/admindocs/views.py:341 +msgid "XML text" +msgstr "XML টেক্সট" + +#: contrib/admindocs/views.py:367 +#, python-format +msgid "%s does not appear to be a urlpattern object" +msgstr "%s ইউআরএল -এর মত নয়" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" -msgstr "" +msgstr "বুকমার্কলেট" -#: contrib/admin/templates/admin_doc/bookmarklets.html:5 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:4 msgid "Documentation bookmarklets" -msgstr "" +msgstr "সহায়িকা বুকমার্কলেট" -#: contrib/admin/templates/admin_doc/bookmarklets.html:9 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:8 msgid "" "\n" "

      To install bookmarklets, drag the link to your bookmarks\n" @@ -986,329 +1084,2695 @@ msgid "" "bookmarklets require you to be viewing the site from a computer designated\n" "as \"internal\" (talk to your system administrator if you aren't sure if\n" "your computer is \"internal\").

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

      বুকমার্ক ইনস্টলের জন্য লিঙ্কটি আপনার বুকমার্ক টুলবারে টেনে নিয়ে যান, অথবা রাইট-ক্লিক করে বুকমার্কে যোগ করুন। এখন আপনি\n" +"সাইটের যেকোন পাতা থেকে বুকমার্কলেটটি ব্যবহার করতে পারবেন। লক্ষ্য করুন যে, বেশ কিছু বুকমার্কলেট দেখার জন্য \"internal\" কম্পিউটার থেকে\nদেখতে হবে (আপনার প্রশাসনের কাছ থেকে জানুন যে আপনার কম্পিউটার \"internal\" কিনা)।

      \n" -#: contrib/admin/templates/admin_doc/bookmarklets.html:19 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:18 msgid "Documentation for this page" -msgstr "" +msgstr "এই পাতার সহায়িকা" -#: contrib/admin/templates/admin_doc/bookmarklets.html:20 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:19 msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." -msgstr "" +msgstr "যেকোন পাতা থেকে ভিউ সহায়িকাতে নিয়ে যান।" -#: contrib/admin/templates/admin_doc/bookmarklets.html:22 -#, fuzzy +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:21 msgid "Show object ID" -msgstr "বস্তু আই.ডি." +msgstr "অবজেক্ট আইডি দেখান" -#: contrib/admin/templates/admin_doc/bookmarklets.html:23 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:22 msgid "" "Shows the content-type and unique ID for pages that represent a single " "object." -msgstr "" +msgstr "কনটেন্ট-টাইপ এবং একক আইডি দেখায়, যা কিনা একটি নির্দিষ্ট অবজেক্টকে বোঝায়।" -#: contrib/admin/templates/admin_doc/bookmarklets.html:25 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:24 msgid "Edit this object (current window)" -msgstr "" +msgstr "এই অবজেক্টটি সম্পাদন করুন (বর্তমান উইন্ডো)" -#: contrib/admin/templates/admin_doc/bookmarklets.html:26 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:25 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "" +msgstr "প্রশাসন পাতায় নিয়ে যান, যা কিনা একটি নির্দিষ্ট পাতা অবজেক্টকে বোঝায়।" -#: contrib/admin/templates/admin_doc/bookmarklets.html:28 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:27 msgid "Edit this object (new window)" -msgstr "" +msgstr "এই অবজেক্টটি সম্পাদন করুন (নতুন উইন্ডো)" -#: contrib/admin/templates/admin_doc/bookmarklets.html:29 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:28 msgid "As above, but opens the admin page in a new window." -msgstr "" +msgstr "উপরের মতই, কিন্তু নতুন উইন্ডোতে খুলুন।" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" +#: contrib/auth/admin.py:21 +msgid "Personal info" +msgstr "ব্যক্তিগত তথ্য" -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "" +#: contrib/auth/admin.py:22 +msgid "Permissions" +msgstr "অনুমোদন" -#: contrib/admin/templates/widget/file.html:2 -msgid "Currently:" -msgstr "" +#: contrib/auth/admin.py:23 +msgid "Important dates" +msgstr "গুরুত্বপূর্ণ তারিখ" + +#: contrib/auth/admin.py:24 +msgid "Groups" +msgstr "দল" + +#: contrib/auth/admin.py:64 +msgid "Add user" +msgstr "সদস্য যোগ করুন" + +#: contrib/auth/admin.py:90 +msgid "Password changed successfully." +msgstr "পাসওয়ার্ড বদল সফল হয়েছে।" + +#: contrib/auth/admin.py:96 +#, python-format +msgid "Change password: %s" +msgstr "পাসওয়ার্ড বদলানঃ %s" + +#: contrib/auth/forms.py:15 +#: contrib/auth/forms.py:48 +#: contrib/auth/models.py:136 +msgid "" +"Required. 30 characters or fewer. Alphanumeric characters only (letters, " +"digits and underscores)." +msgstr "আবশ্যক। সর্বোচ্চ ৩০ অক্ষর। শুধুমাত্র আলফানিউম্যারিক অক্ষর প্রযোজ্য (ইংরেজী বর্ণ, অঙ্ক এবং আন্ডারস্কোর)।" + +#: contrib/auth/forms.py:16 +#: contrib/auth/forms.py:49 +msgid "This value must contain only letters, numbers and underscores." +msgstr "এটি শুধুমাত্র ইংরেজী বর্ণ, অঙ্ক এবং আন্ডারস্কোর ধারণ করতে পারে।" + +#: contrib/auth/forms.py:18 +msgid "Password confirmation" +msgstr "পাসওয়ার্ড নিশ্চিত করুন" + +#: contrib/auth/forms.py:30 +msgid "A user with that username already exists." +msgstr "এই সদস্যনামে একজন সদস্য আছেন।" + +#: contrib/auth/forms.py:36 +#: contrib/auth/forms.py:154 +#: contrib/auth/forms.py:196 +msgid "The two password fields didn't match." +msgstr "পাসওয়ার্ড দুটো মেলেনি।" + +#: contrib/auth/forms.py:82 +msgid "This account is inactive." +msgstr "এই একাউন্টটি কার্যকর নয়।" + +#: contrib/auth/forms.py:87 +msgid "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." +msgstr "আপনার ব্রাউজার কুকি গ্রহণে সক্ষম নয়। লগইন করার জন্য কুকি আবশ্যক।" + +#: contrib/auth/forms.py:100 +msgid "E-mail" +msgstr "ইমেইল" + +#: contrib/auth/forms.py:109 +msgid "" +"That e-mail address doesn't have an associated user account. Are you sure " +"you've registered?" +msgstr "এই ইমেইল ঠিকানা কোন সদস্য একাউন্টের সাথে সম্পর্কিত নয়। আপনি কি নিবন্ধন করেছেন?" + +#: contrib/auth/forms.py:134 +#, python-format +msgid "Password reset on %s" +msgstr "পাসওয়ার্ড রিসেট হয়েছে %s" + +#: contrib/auth/forms.py:142 +msgid "New password" +msgstr "নতুন পাসওয়ার্ড" + +#: contrib/auth/forms.py:143 +msgid "New password confirmation" +msgstr "নতুন পাসওয়ার্ড নিশ্চিতকরণ" + +#: contrib/auth/forms.py:168 +msgid "Old password" +msgstr "পুরনো পাসওয়ার্ড" + +#: contrib/auth/forms.py:176 +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "আপনার পুরনো পাসওয়ার্ড ঠিকভাবে প্রবেশ করানো হয়নি। অনুগ্রহপূর্বক সঠিক পাসওয়ার্ড দিন।" + +#: contrib/auth/models.py:72 +#: contrib/auth/models.py:95 +msgid "name" +msgstr "নাম" + +#: contrib/auth/models.py:74 +msgid "codename" +msgstr "কোডনাম" + +#: contrib/auth/models.py:77 +msgid "permission" +msgstr "অনুমোদন" + +#: contrib/auth/models.py:78 +#: contrib/auth/models.py:96 +msgid "permissions" +msgstr "অনুমোদন" + +#: contrib/auth/models.py:99 +msgid "group" +msgstr "দল" + +#: contrib/auth/models.py:100 +#: contrib/auth/models.py:146 +msgid "groups" +msgstr "দল সমূহ" + +#: contrib/auth/models.py:136 +msgid "username" +msgstr "সদস্যনাম" + +#: contrib/auth/models.py:137 +msgid "first name" +msgstr "প্রথম নাম" + +#: contrib/auth/models.py:138 +msgid "last name" +msgstr "শেষ নাম" + +#: contrib/auth/models.py:139 +msgid "e-mail address" +msgstr "ইমেইল ঠিকানা" + +#: contrib/auth/models.py:140 +msgid "password" +msgstr "পাসওয়ার্ড" + +#: contrib/auth/models.py:140 +msgid "" +"Use '[algo]$[salt]$[hexdigest]' or use the change " +"password form." +msgstr "'[algo]$[salt]$[hexdigest]' ব্যবহার করুন অথবা পাসওয়ার্ড বদল করুন।" + +#: contrib/auth/models.py:141 +msgid "staff status" +msgstr "স্টাফ মর্যাদা" + +#: contrib/auth/models.py:141 +msgid "Designates whether the user can log into this admin site." +msgstr "সদস্যকে প্রশাসন সাইটে প্রবেশাধিকার প্রদান।" + +#: contrib/auth/models.py:142 +msgid "active" +msgstr "সচল" + +#: contrib/auth/models.py:142 +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "সদস্যকে সচল হিসেবে নির্ধারণ করুন। একাউন্ট মুছে ফেলার বদলে এটি ব্যবহার করুন।" + +#: contrib/auth/models.py:143 +msgid "superuser status" +msgstr "সুপারইউজার মর্যাদা" + +#: contrib/auth/models.py:143 +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "সদস্যকে সকল ধরণের অনুমতি প্রদান করে।" + +#: contrib/auth/models.py:144 +msgid "last login" +msgstr "সর্বশেষ প্রবেশ" + +#: contrib/auth/models.py:145 +msgid "date joined" +msgstr "যোগদানের তারিখ" + +#: contrib/auth/models.py:147 +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "এই সদস্যকে দেয়া সকল অনুমোদনের পাশাপাশি অন্যান্য সকল দলের, যেখানে এই সদস্য রয়েছেন, অনুমতিও তিনি পাবেন।" + +#: contrib/auth/models.py:148 +msgid "user permissions" +msgstr "সদস্যের অনুমোদন সমূহ" + +#: contrib/auth/models.py:152 +msgid "user" +msgstr "সদস্য" + +#: contrib/auth/models.py:153 +msgid "users" +msgstr "সদস্যগণ" + +#: contrib/auth/models.py:308 +msgid "message" +msgstr "বার্তা" + +#: contrib/auth/views.py:50 +msgid "Logged out" +msgstr "প্রস্থান সম্পন্ন" + +#: contrib/auth/management/commands/createsuperuser.py:23 +#: forms/fields.py:428 +msgid "Enter a valid e-mail address." +msgstr "বৈধ ইমেইল ঠিকানা দিন।" + +#: contrib/comments/admin.py:11 +msgid "Content" +msgstr "কনটেন্ট" + +#: contrib/comments/admin.py:14 +msgid "Metadata" +msgstr "মেটাডাটা" + +#: contrib/comments/forms.py:20 +msgid "Name" +msgstr "নাম" + +#: contrib/comments/forms.py:21 +msgid "Email address" +msgstr "ইমেইল ঠিকানা" + +#: contrib/comments/forms.py:23 +msgid "Comment" +msgstr "মন্তব্য" + +#: contrib/comments/forms.py:26 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "আপনি যদি এখানে কোনকিছু লিখেন তবে আপনার মন্তব্যকে স্প্যাম হিসেবে ধরা হবে" + +#: contrib/comments/forms.py:126 +#, python-format +msgid "Watch your mouth! The word %s is not allowed here." +msgid_plural "Watch your mouth! The words %s are not allowed here." +msgstr[0] "সাবধান! %s শব্দটি এখানে প্রযোজ্য নয়।" +msgstr[1] "সাবধান! %s শব্দগুলো এখানে প্রযোজ্য নয়।" + +#: contrib/comments/models.py:23 +msgid "object ID" +msgstr "অবজেক্ট আইডি" + +#: contrib/comments/models.py:50 +msgid "user's name" +msgstr "সদস্যের নাম" + +#: contrib/comments/models.py:51 +msgid "user's email address" +msgstr "সদস্যের ইমেইল ঠিকানা" + +#: contrib/comments/models.py:52 +msgid "user's URL" +msgstr "সদস্যের ইউআরএল (URL)" + +#: contrib/comments/models.py:54 +msgid "comment" +msgstr "মন্তব্য" + +#: contrib/comments/models.py:57 +msgid "date/time submitted" +msgstr "দাখিলের তারিখ/সময়" + +#: contrib/comments/models.py:59 +msgid "is public" +msgstr "সার্বজনীন" + +#: contrib/comments/models.py:60 +msgid "" +"Uncheck this box to make the comment effectively disappear from the site." +msgstr "সাইট থেকে মন্তব্য মুছে ফেলতে এখানে আনচেক করুন।" + +#: contrib/comments/models.py:62 +msgid "is removed" +msgstr "মোছা হয়েছে" + +#: contrib/comments/models.py:63 +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "এই বাক্সে চেক করুন যদি মন্তব্যটি যথাযথ না হয়। মন্তব্যের পরিবর্তে \"মন্তব্যদি মুছে ফেলা হয়েছে\" দেখানো হবে।" + +#: contrib/comments/models.py:115 +msgid "" +"This comment was posted by an authenticated user and thus the name is read-" +"only." +msgstr "এই মন্তব্যটি একজন নিবন্ধনকৃত সদস্য করেছেন, সেজন্যই নামটি শুধুমাত্র পড়ার যোগ্য।" + +#: contrib/comments/models.py:124 +msgid "" +"This comment was posted by an authenticated user and thus the email is read-" +"only." +msgstr "এই মন্তব্যটি একজন নিবন্ধনকৃত সদস্য করেছেন, সেজন্যই ইমেইল ঠিকানা শুধুমাত্র পড়ার যোগ্য।" + +#: contrib/comments/models.py:149 +#, python-format +msgid "" +"Posted by %(user)s at %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" +msgstr "লিখেছেন %(user)s - %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" + +#: contrib/contenttypes/models.py:67 +msgid "python model class name" +msgstr "পাইথন মডেল ক্লাসের নাম" + +#: contrib/contenttypes/models.py:71 +msgid "content type" +msgstr "কনটেন্ট টাইপ" + +#: contrib/contenttypes/models.py:72 +msgid "content types" +msgstr "কনটেন্ট টাইপ সমূহ" + +#: contrib/flatpages/admin.py:9 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "উদাহরণঃ '/about/contact/'। শুরু এবং শেষের স্ল্যাশগুলো আবশ্যক।" + +#: contrib/flatpages/admin.py:11 +msgid "" +"This value must contain only letters, numbers, underscores, dashes or " +"slashes." +msgstr "এটি শুধুমাত্র ইংরেজী বর্ণ, সংখ্যা, আন্ডারস্কোর, ড্যাশ অথবা স্ল্যাশ ব্যবহার সম্ভব।" + +#: contrib/flatpages/admin.py:22 +msgid "Advanced options" +msgstr "এডভান্সড অপশন" + +#: contrib/flatpages/models.py:8 +msgid "title" +msgstr "শিরোনাম" + +#: contrib/flatpages/models.py:9 +msgid "content" +msgstr "কনটেন্ট" + +#: contrib/flatpages/models.py:10 +msgid "enable comments" +msgstr "মন্তব্য প্রদান সচল করুন" + +#: contrib/flatpages/models.py:11 +msgid "template name" +msgstr "টেমপ্লেট নাম" + +#: contrib/flatpages/models.py:12 +msgid "" +"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " +"will use 'flatpages/default.html'." +msgstr "উদাহরণঃ ’flatpage/contact_page.html'। এটি যদি খালি থাকে, তবে সিস্টেম ’flatpage/default.html' ব্যবহার করবে।" + +#: contrib/flatpages/models.py:13 +msgid "registration required" +msgstr "নিবন্ধন আবশ্যক" + +#: contrib/flatpages/models.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "এটি চেক করা হলে, শুধুমাত্র লগইন করা সদস্যরা পাতাটি দেখতে সমর্থ হবেন।" + +#: contrib/flatpages/models.py:18 +msgid "flat page" +msgstr "ফ্লাট পাতা" + +#: contrib/flatpages/models.py:19 +msgid "flat pages" +msgstr "ফ্লাট পাতা সমূহ" + +#: contrib/formtools/wizard.py:130 +msgid "" +"We apologize, but your form has expired. Please continue filling out the " +"form from this page." +msgstr "আমরা দুঃখিত, আপনার ফর্মের মেয়াদ শেষ। অনুগ্রহপূর্বক এই পাতা থেকে ফর্ম পূরণ করতে থাকুন।" + +#: contrib/gis/forms/fields.py:14 +msgid "No geometry value provided." +msgstr "কোন জ্যামিতিক মান দেয়া হয়নি।" + +#: contrib/gis/forms/fields.py:15 +msgid "Invalid geometry value." +msgstr "জ্যামিতিক মানটি বৈধ নয়।" + +#: contrib/gis/forms/fields.py:16 +msgid "Invalid geometry type." +msgstr "জ্যামিতিক নমুনাটি বৈধ নয়।" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "th" +msgstr "তম" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "st" +msgstr "ম" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "nd" +msgstr "য়" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "rd" +msgstr "য়" + +#: contrib/humanize/templatetags/humanize.py:51 +#, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "%(value).1f মিলিয়ন" +msgstr[1] "%(value).1f মিলিয়ন" + +#: contrib/humanize/templatetags/humanize.py:54 +#, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "%(value).1f বিলিয়ন" +msgstr[1] "%(value).1f বিলিয়ন" + +#: contrib/humanize/templatetags/humanize.py:57 +#, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "%(value).1f ট্রিলিয়ন" +msgstr[1] "%(value).1f ট্রিলিয়ন" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "one" +msgstr "এক" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "two" +msgstr "দুই" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "three" +msgstr "তিন" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "four" +msgstr "চার" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "five" +msgstr "পাঁচ" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "six" +msgstr "ছয়" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "seven" +msgstr "সাত" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "eight" +msgstr "আট" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "nine" +msgstr "নয়" + +#: contrib/humanize/templatetags/humanize.py:93 +msgid "today" +msgstr "আজ" + +#: contrib/humanize/templatetags/humanize.py:95 +msgid "tomorrow" +msgstr "আগামীকাল" + +#: contrib/humanize/templatetags/humanize.py:97 +msgid "yesterday" +msgstr "গতকাল" -#: contrib/admin/templates/widget/file.html:3 #, fuzzy -msgid "Change:" -msgstr "পরিবর্তন" +#: contrib/localflavor/ar/forms.py:27 +msgid "Enter a postal code in the format NNNN or ANNNNAAA." +msgstr "" + +#, fuzzy +#: contrib/localflavor/ar/forms.py:49 +#: contrib/localflavor/br/forms.py:96 +#: contrib/localflavor/br/forms.py:135 +#: contrib/localflavor/pe/forms.py:23 +#: contrib/localflavor/pe/forms.py:51 +msgid "This field requires only numbers." +msgstr "" + +#, fuzzy +#: contrib/localflavor/ar/forms.py:50 +msgid "This field requires 7 or 8 digits." +msgstr "" + +#, fuzzy +#: contrib/localflavor/ar/forms.py:79 +msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." +msgstr "" + +#, fuzzy +#: contrib/localflavor/ar/forms.py:80 +msgid "Invalid CUIT." +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/at_states.py:5 +msgid "Burgenland" +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/at_states.py:6 +msgid "Carinthia" +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/at_states.py:7 +msgid "Lower Austria" +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/at_states.py:8 +msgid "Upper Austria" +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/at_states.py:9 +msgid "Salzburg" +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/at_states.py:10 +msgid "Styria" +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/at_states.py:11 +msgid "Tyrol" +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/at_states.py:12 +msgid "Vorarlberg" +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/at_states.py:13 +msgid "Vienna" +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/forms.py:20 +#: contrib/localflavor/ch/forms.py:16 +#: contrib/localflavor/no/forms.py:12 +msgid "Enter a zip code in the format XXXX." +msgstr "" + +#, fuzzy +#: contrib/localflavor/at/forms.py:48 +msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format." +msgstr "" + +#, fuzzy +#: contrib/localflavor/au/forms.py:16 +msgid "Enter a 4 digit post code." +msgstr "" + +#, fuzzy +#: contrib/localflavor/br/forms.py:21 +msgid "Enter a zip code in the format XXXXX-XXX." +msgstr "" + +#, fuzzy +#: contrib/localflavor/br/forms.py:30 +msgid "Phone numbers must be in XX-XXXX-XXXX format." +msgstr "" + +#: contrib/localflavor/br/forms.py:58 +msgid "" +"Select a valid brazilian state. That state is not one of the available " +"states." +msgstr "" + +#: contrib/localflavor/br/forms.py:94 +msgid "Invalid CPF number." +msgstr "" + +#: contrib/localflavor/br/forms.py:95 +msgid "This field requires at most 11 digits or 14 characters." +msgstr "" + +#: contrib/localflavor/br/forms.py:134 +msgid "Invalid CNPJ number." +msgstr "" + +#: contrib/localflavor/br/forms.py:136 +msgid "This field requires at least 14 digits" +msgstr "" + +#: contrib/localflavor/ca/forms.py:17 +msgid "Enter a postal code in the format XXX XXX." +msgstr "" + +#: contrib/localflavor/ca/forms.py:88 +msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:5 +msgid "Aargau" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:6 +msgid "Appenzell Innerrhoden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:7 +msgid "Appenzell Ausserrhoden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:8 +msgid "Basel-Stadt" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:9 +msgid "Basel-Land" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:10 +msgid "Berne" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:11 +msgid "Fribourg" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:12 +msgid "Geneva" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:13 +msgid "Glarus" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:14 +msgid "Graubuenden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:15 +msgid "Jura" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:16 +msgid "Lucerne" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:17 +msgid "Neuchatel" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:18 +msgid "Nidwalden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:19 +msgid "Obwalden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:20 +msgid "Schaffhausen" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:21 +msgid "Schwyz" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:22 +msgid "Solothurn" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:23 +msgid "St. Gallen" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:24 +msgid "Thurgau" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:25 +msgid "Ticino" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:26 +msgid "Uri" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:27 +msgid "Valais" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:28 +msgid "Vaud" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:29 +msgid "Zug" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:30 +msgid "Zurich" +msgstr "" + +#: contrib/localflavor/ch/forms.py:64 +msgid "" +"Enter a valid Swiss identity or passport card number in X1234567<0 or " +"1234567890 format." +msgstr "" + +#: contrib/localflavor/cl/forms.py:29 +msgid "Enter a valid Chilean RUT." +msgstr "" + +#: contrib/localflavor/cl/forms.py:30 +msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X." +msgstr "" + +#: contrib/localflavor/cl/forms.py:31 +msgid "The Chilean RUT is not valid." +msgstr "" + +#: contrib/localflavor/de/de_states.py:5 +msgid "Baden-Wuerttemberg" +msgstr "" + +#: contrib/localflavor/de/de_states.py:6 +msgid "Bavaria" +msgstr "" + +#: contrib/localflavor/de/de_states.py:7 +msgid "Berlin" +msgstr "" + +#: contrib/localflavor/de/de_states.py:8 +msgid "Brandenburg" +msgstr "" + +#: contrib/localflavor/de/de_states.py:9 +msgid "Bremen" +msgstr "" + +#: contrib/localflavor/de/de_states.py:10 +msgid "Hamburg" +msgstr "" + +#: contrib/localflavor/de/de_states.py:11 +msgid "Hessen" +msgstr "" + +#: contrib/localflavor/de/de_states.py:12 +msgid "Mecklenburg-Western Pomerania" +msgstr "" + +#: contrib/localflavor/de/de_states.py:13 +msgid "Lower Saxony" +msgstr "" + +#: contrib/localflavor/de/de_states.py:14 +msgid "North Rhine-Westphalia" +msgstr "" + +#: contrib/localflavor/de/de_states.py:15 +msgid "Rhineland-Palatinate" +msgstr "" + +#: contrib/localflavor/de/de_states.py:16 +msgid "Saarland" +msgstr "" + +#: contrib/localflavor/de/de_states.py:17 +msgid "Saxony" +msgstr "" + +#: contrib/localflavor/de/de_states.py:18 +msgid "Saxony-Anhalt" +msgstr "" + +#: contrib/localflavor/de/de_states.py:19 +msgid "Schleswig-Holstein" +msgstr "" + +#: contrib/localflavor/de/de_states.py:20 +msgid "Thuringia" +msgstr "" + +#: contrib/localflavor/de/forms.py:14 +#: contrib/localflavor/fi/forms.py:12 +#: contrib/localflavor/fr/forms.py:15 +msgid "Enter a zip code in the format XXXXX." +msgstr "" + +#: contrib/localflavor/de/forms.py:41 +msgid "" +"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " +"format." +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:5 +msgid "Arava" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:6 +msgid "Albacete" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:7 +msgid "Alacant" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:8 +msgid "Almeria" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:9 +msgid "Avila" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:10 +msgid "Badajoz" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:11 +msgid "Illes Balears" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:12 +msgid "Barcelona" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:13 +msgid "Burgos" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:14 +msgid "Caceres" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:15 +msgid "Cadiz" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:16 +msgid "Castello" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:17 +msgid "Ciudad Real" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:18 +msgid "Cordoba" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:19 +msgid "A Coruna" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:20 +msgid "Cuenca" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:21 +msgid "Girona" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:22 +msgid "Granada" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:23 +msgid "Guadalajara" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:24 +msgid "Guipuzkoa" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:25 +msgid "Huelva" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:26 +msgid "Huesca" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:27 +msgid "Jaen" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:28 +msgid "Leon" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:29 +msgid "Lleida" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:30 +#: contrib/localflavor/es/es_regions.py:17 +msgid "La Rioja" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:31 +msgid "Lugo" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:32 +#: contrib/localflavor/es/es_regions.py:18 +msgid "Madrid" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:33 +msgid "Malaga" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:34 +msgid "Murcia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:35 +msgid "Navarre" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:36 +msgid "Ourense" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:37 +msgid "Asturias" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:38 +msgid "Palencia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:39 +msgid "Las Palmas" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:40 +msgid "Pontevedra" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:41 +msgid "Salamanca" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:42 +msgid "Santa Cruz de Tenerife" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:43 +#: contrib/localflavor/es/es_regions.py:11 +msgid "Cantabria" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:44 +msgid "Segovia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:45 +msgid "Seville" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:46 +msgid "Soria" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:47 +msgid "Tarragona" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:48 +msgid "Teruel" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:49 +msgid "Toledo" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:50 +msgid "Valencia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:51 +msgid "Valladolid" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:52 +msgid "Bizkaia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:53 +msgid "Zamora" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:54 +msgid "Zaragoza" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:55 +msgid "Ceuta" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:56 +msgid "Melilla" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:5 +msgid "Andalusia" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:6 +msgid "Aragon" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:7 +msgid "Principality of Asturias" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:8 +msgid "Balearic Islands" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:9 +msgid "Basque Country" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:10 +msgid "Canary Islands" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:12 +msgid "Castile-La Mancha" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:13 +msgid "Castile and Leon" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:14 +msgid "Catalonia" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:15 +msgid "Extremadura" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:16 +msgid "Galicia" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:19 +msgid "Region of Murcia" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:20 +msgid "Foral Community of Navarre" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:21 +msgid "Valencian Community" +msgstr "" + +#: contrib/localflavor/es/forms.py:19 +msgid "Enter a valid postal code in the range and format 01XXX - 52XXX." +msgstr "" + +#: contrib/localflavor/es/forms.py:39 +msgid "" +"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or " +"9XXXXXXXX." +msgstr "" + +#: contrib/localflavor/es/forms.py:66 +msgid "Please enter a valid NIF, NIE, or CIF." +msgstr "" + +#: contrib/localflavor/es/forms.py:67 +msgid "Please enter a valid NIF or NIE." +msgstr "" + +#: contrib/localflavor/es/forms.py:68 +msgid "Invalid checksum for NIF." +msgstr "" + +#: contrib/localflavor/es/forms.py:69 +msgid "Invalid checksum for NIE." +msgstr "" + +#: contrib/localflavor/es/forms.py:70 +msgid "Invalid checksum for CIF." +msgstr "" + +#: contrib/localflavor/es/forms.py:142 +msgid "" +"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." +msgstr "" + +#: contrib/localflavor/es/forms.py:143 +msgid "Invalid checksum for bank account number." +msgstr "" + +#: contrib/localflavor/fi/forms.py:28 +msgid "Enter a valid Finnish social security number." +msgstr "" + +#: contrib/localflavor/in_/forms.py:14 +msgid "Enter a zip code in the format XXXXXXX." +msgstr "" + +#: contrib/localflavor/is_/forms.py:17 +msgid "" +"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." +msgstr "" + +#: contrib/localflavor/is_/forms.py:18 +msgid "The Icelandic identification number is not valid." +msgstr "" + +#: contrib/localflavor/it/forms.py:14 +msgid "Enter a valid zip code." +msgstr "" + +#: contrib/localflavor/it/forms.py:43 +msgid "Enter a valid Social Security number." +msgstr "" + +#: contrib/localflavor/it/forms.py:68 +msgid "Enter a valid VAT number." +msgstr "" + +#: contrib/localflavor/jp/forms.py:16 +msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX." +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:4 +msgid "Hokkaido" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:5 +msgid "Aomori" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:6 +msgid "Iwate" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:7 +msgid "Miyagi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:8 +msgid "Akita" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:9 +msgid "Yamagata" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:10 +msgid "Fukushima" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:11 +msgid "Ibaraki" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:12 +msgid "Tochigi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:13 +msgid "Gunma" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:14 +msgid "Saitama" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:15 +msgid "Chiba" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:16 +msgid "Tokyo" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:17 +msgid "Kanagawa" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:18 +msgid "Yamanashi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:19 +msgid "Nagano" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:20 +msgid "Niigata" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:21 +msgid "Toyama" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:22 +msgid "Ishikawa" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:23 +msgid "Fukui" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:24 +msgid "Gifu" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:25 +msgid "Shizuoka" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:26 +msgid "Aichi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:27 +msgid "Mie" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:28 +msgid "Shiga" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:29 +msgid "Kyoto" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:30 +msgid "Osaka" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:31 +msgid "Hyogo" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:32 +msgid "Nara" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:33 +msgid "Wakayama" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:34 +msgid "Tottori" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:35 +msgid "Shimane" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:36 +msgid "Okayama" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:37 +msgid "Hiroshima" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:38 +msgid "Yamaguchi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:39 +msgid "Tokushima" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:40 +msgid "Kagawa" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:41 +msgid "Ehime" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:42 +msgid "Kochi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:43 +msgid "Fukuoka" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:44 +msgid "Saga" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:45 +msgid "Nagasaki" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:46 +msgid "Kumamoto" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:47 +msgid "Oita" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:48 +msgid "Miyazaki" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:49 +msgid "Kagoshima" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:50 +msgid "Okinawa" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:12 +msgid "Aguascalientes" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:13 +msgid "Baja California" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:14 +msgid "Baja California Sur" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:15 +msgid "Campeche" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:16 +msgid "Chihuahua" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:17 +msgid "Chiapas" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:18 +msgid "Coahuila" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:19 +msgid "Colima" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:20 +msgid "Distrito Federal" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:21 +msgid "Durango" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:22 +msgid "Guerrero" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:23 +msgid "Guanajuato" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:24 +msgid "Hidalgo" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:25 +msgid "Jalisco" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:26 +msgid "Estado de México" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:27 +msgid "Michoacán" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:28 +msgid "Morelos" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:29 +msgid "Nayarit" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:30 +msgid "Nuevo León" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:31 +msgid "Oaxaca" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:32 +msgid "Puebla" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:33 +msgid "Querétaro" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:34 +msgid "Quintana Roo" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:35 +msgid "Sinaloa" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:36 +msgid "San Luis Potosí" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:37 +msgid "Sonora" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:38 +msgid "Tabasco" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:39 +msgid "Tamaulipas" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:40 +msgid "Tlaxcala" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:41 +msgid "Veracruz" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:42 +msgid "Yucatán" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:43 +msgid "Zacatecas" +msgstr "" + +#: contrib/localflavor/nl/forms.py:21 +msgid "Enter a valid postal code" +msgstr "" + +#: contrib/localflavor/nl/forms.py:52 +msgid "Enter a valid phone number" +msgstr "" + +#: contrib/localflavor/nl/forms.py:78 +msgid "Enter a valid SoFi number" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:4 +msgid "Drenthe" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:5 +msgid "Flevoland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:6 +msgid "Friesland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:7 +msgid "Gelderland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:8 +msgid "Groningen" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:9 +msgid "Limburg" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:10 +msgid "Noord-Brabant" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:11 +msgid "Noord-Holland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:12 +msgid "Overijssel" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:13 +msgid "Utrecht" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:14 +msgid "Zeeland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:15 +msgid "Zuid-Holland" +msgstr "" + +#: contrib/localflavor/no/forms.py:33 +msgid "Enter a valid Norwegian social security number." +msgstr "" + +#: contrib/localflavor/pe/forms.py:24 +msgid "This field requires 8 digits." +msgstr "" + +#: contrib/localflavor/pe/forms.py:52 +msgid "This field requires 11 digits." +msgstr "" + +#: contrib/localflavor/pl/forms.py:38 +msgid "National Identification Number consists of 11 digits." +msgstr "" + +#: contrib/localflavor/pl/forms.py:39 +msgid "Wrong checksum for the National Identification Number." +msgstr "" + +#: contrib/localflavor/pl/forms.py:71 +msgid "" +"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." +msgstr "" + +#: contrib/localflavor/pl/forms.py:72 +msgid "Wrong checksum for the Tax Number (NIP)." +msgstr "" + +#: contrib/localflavor/pl/forms.py:111 +msgid "National Business Register Number (REGON) consists of 7 or 9 digits." +msgstr "" + +#: contrib/localflavor/pl/forms.py:112 +msgid "Wrong checksum for the National Business Register Number (REGON)." +msgstr "" + +#: contrib/localflavor/pl/forms.py:155 +msgid "Enter a postal code in the format XX-XXX." +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:8 +msgid "Lower Silesia" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:9 +msgid "Kuyavia-Pomerania" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:10 +msgid "Lublin" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:11 +msgid "Lubusz" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:12 +msgid "Lodz" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:13 +msgid "Lesser Poland" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:14 +msgid "Masovia" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:15 +msgid "Opole" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:16 +msgid "Subcarpatia" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:17 +msgid "Podlasie" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:18 +msgid "Pomerania" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:19 +msgid "Silesia" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:20 +msgid "Swietokrzyskie" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:21 +msgid "Warmia-Masuria" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:22 +msgid "Greater Poland" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:23 +msgid "West Pomerania" +msgstr "" + +#: contrib/localflavor/ro/forms.py:19 +msgid "Enter a valid CIF." +msgstr "" + +#: contrib/localflavor/ro/forms.py:56 +msgid "Enter a valid CNP." +msgstr "" + +#: contrib/localflavor/ro/forms.py:141 +msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format" +msgstr "" + +#: contrib/localflavor/ro/forms.py:171 +msgid "Phone numbers must be in XXXX-XXXXXX format." +msgstr "" + +#: contrib/localflavor/ro/forms.py:194 +msgid "Enter a valid postal code in the format XXXXXX" +msgstr "" + +#: contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:8 +msgid "Banska Bystrica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:9 +msgid "Banska Stiavnica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:10 +msgid "Bardejov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:11 +msgid "Banovce nad Bebravou" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:12 +msgid "Brezno" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:13 +msgid "Bratislava I" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:14 +msgid "Bratislava II" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:15 +msgid "Bratislava III" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:16 +msgid "Bratislava IV" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:17 +msgid "Bratislava V" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:18 +msgid "Bytca" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:19 +msgid "Cadca" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:20 +msgid "Detva" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:21 +msgid "Dolny Kubin" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:22 +msgid "Dunajska Streda" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:23 +msgid "Galanta" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:24 +msgid "Gelnica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:25 +msgid "Hlohovec" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:26 +msgid "Humenne" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:27 +msgid "Ilava" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:28 +msgid "Kezmarok" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:29 +msgid "Komarno" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:30 +msgid "Kosice I" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:31 +msgid "Kosice II" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:32 +msgid "Kosice III" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:33 +msgid "Kosice IV" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:34 +msgid "Kosice - okolie" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:35 +msgid "Krupina" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:36 +msgid "Kysucke Nove Mesto" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:37 +msgid "Levice" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:38 +msgid "Levoca" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:39 +msgid "Liptovsky Mikulas" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:40 +msgid "Lucenec" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:41 +msgid "Malacky" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:42 +msgid "Martin" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:43 +msgid "Medzilaborce" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:44 +msgid "Michalovce" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:45 +msgid "Myjava" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:46 +msgid "Namestovo" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:47 +msgid "Nitra" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:48 +msgid "Nove Mesto nad Vahom" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:49 +msgid "Nove Zamky" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:50 +msgid "Partizanske" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:51 +msgid "Pezinok" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:52 +msgid "Piestany" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:53 +msgid "Poltar" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:54 +msgid "Poprad" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:55 +msgid "Povazska Bystrica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:56 +msgid "Presov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:57 +msgid "Prievidza" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:58 +msgid "Puchov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:59 +msgid "Revuca" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:60 +msgid "Rimavska Sobota" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:61 +msgid "Roznava" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:62 +msgid "Ruzomberok" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:63 +msgid "Sabinov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:64 +msgid "Senec" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:65 +msgid "Senica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:66 +msgid "Skalica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:67 +msgid "Snina" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:68 +msgid "Sobrance" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:69 +msgid "Spisska Nova Ves" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:70 +msgid "Stara Lubovna" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:71 +msgid "Stropkov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:72 +msgid "Svidnik" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:73 +msgid "Sala" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:74 +msgid "Topolcany" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:75 +msgid "Trebisov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:76 +msgid "Trencin" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:77 +msgid "Trnava" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:78 +msgid "Turcianske Teplice" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:79 +msgid "Tvrdosin" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:80 +msgid "Velky Krtis" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:81 +msgid "Vranov nad Toplou" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:82 +msgid "Zlate Moravce" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:83 +msgid "Zvolen" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:84 +msgid "Zarnovica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:85 +msgid "Ziar nad Hronom" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:86 +msgid "Zilina" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:8 +msgid "Banska Bystrica region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:9 +msgid "Bratislava region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:10 +msgid "Kosice region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:11 +msgid "Nitra region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:12 +msgid "Presov region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:13 +msgid "Trencin region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:14 +msgid "Trnava region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:15 +msgid "Zilina region" +msgstr "" + +#: contrib/localflavor/uk/forms.py:21 +msgid "Enter a valid postcode." +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:11 +msgid "Bedfordshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:12 +msgid "Buckinghamshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:14 +msgid "Cheshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:15 +msgid "Cornwall and Isles of Scilly" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:16 +msgid "Cumbria" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:17 +msgid "Derbyshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:18 +msgid "Devon" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:19 +msgid "Dorset" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:20 +msgid "Durham" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:21 +msgid "East Sussex" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:22 +msgid "Essex" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:23 +msgid "Gloucestershire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:24 +msgid "Greater London" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:25 +msgid "Greater Manchester" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:26 +msgid "Hampshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:27 +msgid "Hertfordshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:28 +msgid "Kent" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:29 +msgid "Lancashire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:30 +msgid "Leicestershire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:31 +msgid "Lincolnshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:32 +msgid "Merseyside" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:33 +msgid "Norfolk" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:34 +msgid "North Yorkshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:35 +msgid "Northamptonshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:36 +msgid "Northumberland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:37 +msgid "Nottinghamshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:38 +msgid "Oxfordshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:39 +msgid "Shropshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:40 +msgid "Somerset" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:41 +msgid "South Yorkshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:42 +msgid "Staffordshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:43 +msgid "Suffolk" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:44 +msgid "Surrey" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:45 +msgid "Tyne and Wear" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:46 +msgid "Warwickshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:47 +msgid "West Midlands" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:48 +msgid "West Sussex" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:49 +msgid "West Yorkshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:50 +msgid "Wiltshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:51 +msgid "Worcestershire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:55 +msgid "County Antrim" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:56 +msgid "County Armagh" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:57 +msgid "County Down" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:58 +msgid "County Fermanagh" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:59 +msgid "County Londonderry" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:60 +msgid "County Tyrone" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:64 +msgid "Clwyd" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:65 +msgid "Dyfed" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:66 +msgid "Gwent" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:67 +msgid "Gwynedd" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:68 +msgid "Mid Glamorgan" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:69 +msgid "Powys" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:70 +msgid "South Glamorgan" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:71 +msgid "West Glamorgan" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:75 +msgid "Borders" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:76 +msgid "Central Scotland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:77 +msgid "Dumfries and Galloway" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:78 +msgid "Fife" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:79 +msgid "Grampian" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:80 +msgid "Highland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:81 +msgid "Lothian" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:82 +msgid "Orkney Islands" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:83 +msgid "Shetland Islands" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:84 +msgid "Strathclyde" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:85 +msgid "Tayside" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:86 +msgid "Western Isles" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:90 +msgid "England" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:91 +msgid "Northern Ireland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:92 +msgid "Scotland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:93 +msgid "Wales" +msgstr "" + +#: contrib/localflavor/us/forms.py:16 +msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." +msgstr "" + +#: contrib/localflavor/us/forms.py:54 +msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." +msgstr "" + +#: contrib/localflavor/za/forms.py:20 +msgid "Enter a valid South African ID number" +msgstr "" + +#: contrib/localflavor/za/forms.py:54 +msgid "Enter a valid South African postal code" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:4 +msgid "Eastern Cape" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:5 +msgid "Free State" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:6 +msgid "Gauteng" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:7 +msgid "KwaZulu-Natal" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:8 +msgid "Limpopo" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:9 +msgid "Mpumalanga" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:10 +msgid "Northern Cape" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:11 +msgid "North West" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:12 +msgid "Western Cape" +msgstr "" #: contrib/redirects/models.py:7 msgid "redirect from" -msgstr "রিডাইরেক্ট করা" +msgstr "রিডাইরেক্ট করা হবে" #: contrib/redirects/models.py:8 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." -msgstr "" -"এইটি একটি পরম পাথ হওয়া উচিত, ক্ষেত্র নাম বাদ দিয়ে। উদাহরণ: '/events/search / '।" +msgstr "এর মান অবশ্যই এবসল্যুট পথ, ডোমেইন নাম বাদ দিয়ে, হতে হবে, উদাহরণঃ '/events/search/'।" #: contrib/redirects/models.py:9 msgid "redirect to" -msgstr "রিডাইরেক্ট কর" +msgstr "রিডাইরেক্ট করুন" #: contrib/redirects/models.py:10 msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." -msgstr "" -"এইটি হয় একটি পরম পাথ হতে পারে (যেমন উপরে) অথবা 'http:// এর সঙ্গে শুরু হওয়া " -"একটি পূর্ণ ইউ.আর.এল ।" +msgstr "এর মান এবসল্যুট পথ (উপরের মত) অথবা পুরো URL পাথ ('http://' সহ) হতে পারে।" -#: contrib/redirects/models.py:12 +#: contrib/redirects/models.py:13 msgid "redirect" msgstr "রিডাইরেক্ট" -#: contrib/redirects/models.py:13 +#: contrib/redirects/models.py:14 msgid "redirects" -msgstr "রিডাইরেক্ট করে" +msgstr "রিডাইরেক্ট" -#: contrib/flatpages/models.py:8 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"উদাহরণ: '/about/contact / '। প্রধান এবং অনুসরণ করা স্ল্যাশ যেন নিশ্চিত ভাবে থাকে।" - -#: contrib/flatpages/models.py:9 -msgid "title" -msgstr "শিরোনাম" - -#: contrib/flatpages/models.py:10 -msgid "content" -msgstr "অভ্যন্তরস্থ বস্তু" - -#: contrib/flatpages/models.py:11 -msgid "enable comments" -msgstr "মন্তব্য সক্রিয় করুন" - -#: contrib/flatpages/models.py:12 -msgid "template name" -msgstr "ছাঁদ নাম" - -#: contrib/flatpages/models.py:13 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"উদাহরণ: 'flatfiles/contact_page '। যদি এইটি দেওয়া না থাকে তাহলে সিস্টেম " -"'flatfiles/default ব্যবহার করবে।" - -#: contrib/flatpages/models.py:14 -msgid "registration required" -msgstr "নিবন্ধন প্রয়োজনীয়" - -#: contrib/flatpages/models.py:14 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"যদি এইটি টিক্ করা থাকে তাহলে শুধুমাত্র প্রবেশ করা ব্যবহারকারী পাতা দেখতে সক্ষম হবে।" - -#: contrib/flatpages/models.py:18 -msgid "flat page" -msgstr "চ্যাপ্টা পাতা" - -#: contrib/flatpages/models.py:19 -msgid "flat pages" -msgstr "চ্যাপ্টা পাতাগুলো" - -#: contrib/auth/models.py:13 contrib/auth/models.py:26 -msgid "name" -msgstr "নাম" - -#: contrib/auth/models.py:15 -msgid "codename" -msgstr "ছদ্বনাম" - -#: contrib/auth/models.py:17 -#, fuzzy -msgid "permission" -msgstr "অনুমতি" - -#: contrib/auth/models.py:18 contrib/auth/models.py:27 -#, fuzzy -msgid "permissions" -msgstr "অনুমতি" - -#: contrib/auth/models.py:29 -#, fuzzy -msgid "group" -msgstr "গ্রুপ" - -#: contrib/auth/models.py:30 contrib/auth/models.py:65 -#, fuzzy -msgid "groups" -msgstr "দল" - -#: contrib/auth/models.py:55 -msgid "username" -msgstr "ব্যবহারকারীর নাম" - -#: contrib/auth/models.py:56 -msgid "first name" -msgstr "প্রথম নাম" - -#: contrib/auth/models.py:57 -msgid "last name" -msgstr "শেষ নাম" - -#: contrib/auth/models.py:58 -msgid "e-mail address" -msgstr "ই-মেল ঠিকানা" - -#: contrib/auth/models.py:59 -msgid "password" -msgstr "পাসওয়ার্ড" - -#: contrib/auth/models.py:59 -msgid "Use '[algo]$[salt]$[hexdigest]'" -msgstr "" - -#: contrib/auth/models.py:60 -msgid "staff status" -msgstr " অবস্থা" - -#: contrib/auth/models.py:60 -msgid "Designates whether the user can log into this admin site." -msgstr "নিশ্চয় করে যে ব্যবহারকারী এই অ্যাডমিন স্থানে প্রবেশ করতে পারে কিনা।" - -#: contrib/auth/models.py:61 -msgid "active" -msgstr "সক্রিয়" - -#: contrib/auth/models.py:62 -msgid "superuser status" -msgstr "সুপারইউজার অবস্থা" - -#: contrib/auth/models.py:63 -msgid "last login" -msgstr "শেষ প্রবেশ" - -#: contrib/auth/models.py:64 -msgid "date joined" -msgstr "যোগাদান করার তারিখ " - -#: contrib/auth/models.py:66 -msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "" -"নিজ হাতে বরাদ্দকৃতে অনুমতি ছাড়া এই ব্যবহারকারীটি যে সব গ্রুপে আছে তার অনুমতিও পাবে।" - -#: contrib/auth/models.py:67 -#, fuzzy -msgid "user permissions" -msgstr "অনুমতি" - -#: contrib/auth/models.py:70 -#, fuzzy -msgid "user" -msgstr "ব্যবহারকারী" - -#: contrib/auth/models.py:71 -#, fuzzy -msgid "users" -msgstr "ব্যবহারকারী" - -#: contrib/auth/models.py:76 -msgid "Personal info" -msgstr "ব্যক্তিগত তথ্য" - -#: contrib/auth/models.py:77 -msgid "Permissions" -msgstr "অনুমতি" - -#: contrib/auth/models.py:78 -msgid "Important dates" -msgstr "গুরুত্বপূর্ণ তারিখ" - -#: contrib/auth/models.py:79 -msgid "Groups" -msgstr "দল" - -#: contrib/auth/models.py:219 -#, fuzzy -msgid "message" -msgstr "বার্তা" - -#: contrib/auth/forms.py:30 -msgid "" -"Your Web browser doesn't appear to have cookies enabled. Cookies are " -"required for logging in." -msgstr "" - -#: contrib/contenttypes/models.py:25 -#, fuzzy -msgid "python model class name" -msgstr "পাইথন মডিউলের নাম" - -#: contrib/contenttypes/models.py:28 -msgid "content type" -msgstr "অভ্যন্তরস্থ বস্তু ধরন" - -#: contrib/contenttypes/models.py:29 -msgid "content types" -msgstr "অভ্যন্তরস্থ বস্তু ধরন" - -#: contrib/sessions/models.py:35 +#: contrib/sessions/models.py:45 msgid "session key" -msgstr "অধিবেশন চাবি" +msgstr "সেশন কি" -#: contrib/sessions/models.py:36 +#: contrib/sessions/models.py:47 msgid "session data" -msgstr "অধিবেশন তথ্য" +msgstr "সেশন ডাটা" -#: contrib/sessions/models.py:37 +#: contrib/sessions/models.py:48 msgid "expire date" -msgstr "শেষ তারিখ" +msgstr "মেয়াদ শেষের তারিখ" -#: contrib/sessions/models.py:41 +#: contrib/sessions/models.py:53 msgid "session" -msgstr "অধিবেশন" - -#: contrib/sessions/models.py:42 -msgid "sessions" msgstr "সেশন" -#: contrib/sites/models.py:10 +#: contrib/sessions/models.py:54 +msgid "sessions" +msgstr "সেশনসমূহ" + +#: contrib/sites/models.py:32 msgid "domain name" -msgstr "ক্ষেত্র নাম" +msgstr "ডোমেইন নাম" -#: contrib/sites/models.py:11 +#: contrib/sites/models.py:33 msgid "display name" -msgstr "প্রদর্শিত নাম" +msgstr "ডিসপ্লে নাম" -#: contrib/sites/models.py:15 -msgid "site" -msgstr "স্থান" - -#: contrib/sites/models.py:16 +#: contrib/sites/models.py:39 msgid "sites" -msgstr "স্থান" +msgstr "সাইটসমূহ" -#: utils/translation.py:360 -msgid "DATE_FORMAT" -msgstr "" +#: db/models/fields/__init__.py:348 +#: db/models/fields/__init__.py:683 +msgid "This value must be an integer." +msgstr "এর মান অবশ্যই ইন্টিজার হতে হবে।" -#: utils/translation.py:361 -msgid "DATETIME_FORMAT" -msgstr "" +#: db/models/fields/__init__.py:379 +msgid "This value must be either True or False." +msgstr "এর মান অবশ্যই True অথবা False হতে হবে।" -#: utils/translation.py:362 -msgid "TIME_FORMAT" -msgstr "" +#: db/models/fields/__init__.py:412 +msgid "This field cannot be null." +msgstr "এর মান null হতে পারবে না।" + +#: db/models/fields/__init__.py:428 +msgid "Enter only digits separated by commas." +msgstr "শুধুমাত্র কমা দিয়ে সংখ্যা দিন।" + +#: db/models/fields/__init__.py:459 +msgid "Enter a valid date in YYYY-MM-DD format." +msgstr "একটি বৈধ তারিখ দিন (ফরম্যাট YYYY-MM-DD)।" + +#: db/models/fields/__init__.py:468 +#, python-format +msgid "Invalid date: %s" +msgstr "অবৈধ তারিখঃ %s" + +#: db/models/fields/__init__.py:532 +#: db/models/fields/__init__.py:550 +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:586 +msgid "This value must be a decimal number." +msgstr "এর মান অবশ্যই ডেসিমাল সংখ্যা হতে হবে।" + +#: db/models/fields/__init__.py:719 +msgid "This value must be either None, True or False." +msgstr "এর মান অবশ্যই True, False অথবা None হতে হবে।" + +#: db/models/fields/__init__.py:817 +#: db/models/fields/__init__.py:831 +msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." +msgstr "বৈধ সময় প্রবেশ করান (ফরম্যাট HH:MM[:ss[:uuuuuu]])।" + +#: db/models/fields/related.py:761 +msgid "" +"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "একাধিক বাছাই করতে \"কন্ট্রোল\", অথবা ম্যাকে \"কমান্ড\", চেপে ধরুন।" + +#: db/models/fields/related.py:838 +#, python-format +msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." +msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgstr[0] "অনুগ্রহ করে বৈধ %(self)s ID দিন। %(value)r বৈধ নয়।" +msgstr[1] "অনুগ্রহ করে বৈধ %(self)s ID দিন। %(value)r বৈধ নয়।" + +#: forms/fields.py:54 +msgid "This field is required." +msgstr "এটি আবশ্যক।" + +#: forms/fields.py:55 +msgid "Enter a valid value." +msgstr "একটি বৈধ মান দিন।" + +#: forms/fields.py:138 +#, python-format +msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." +msgstr "নিশ্চিত করুন যে এটি সর্বোচ্চ %(max)d সংখ্যক বর্ণ আছে (এর আছে %(length)d)।" + +#: forms/fields.py:139 +#, python-format +msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." +msgstr "নিশ্চিত করুন যে এটি কমপক্ষে %(min)d সংখ্যক বর্ণ আছে (এর আছে %(length)d)।" + +#: forms/fields.py:166 +msgid "Enter a whole number." +msgstr "একটি পূর্ণসংখ্যা দিন" + +#: forms/fields.py:167 +#: forms/fields.py:196 +#: forms/fields.py:225 +#, python-format +msgid "Ensure this value is less than or equal to %s." +msgstr "নিশ্চিত করুন যে, সংখ্যাটি %s -এর কম অথবা সমান।" + +#: forms/fields.py:168 +#: forms/fields.py:197 +#: forms/fields.py:226 +#, python-format +msgid "Ensure this value is greater than or equal to %s." +msgstr "নিশ্চিত করুন যে, সংখ্যাটি %s -এর বেশি অথবা সমান।" + +#: forms/fields.py:195 +#: forms/fields.py:224 +msgid "Enter a number." +msgstr "একটি সংখ্যা প্রবেশ করান।" + +#: forms/fields.py:227 +#, python-format +msgid "Ensure that there are no more than %s digits in total." +msgstr "নিশ্চিত করুন যে, এখানে %s সংখ্যক দশমিক অঙ্ক রয়েছে।" + +#: forms/fields.py:228 +#, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "নিশ্চিত করুন যে, এখানে %s -এর বেশি দশমিক সংখ্যা নেই।" + +#: forms/fields.py:229 +#, python-format +msgid "Ensure that there are no more than %s digits before the decimal point." +msgstr "নিশ্চিত করুন যে, এখানে %s -এর বেশি দশমিক সংখ্যা নেই।" + +#: forms/fields.py:287 +#: forms/fields.py:848 +msgid "Enter a valid date." +msgstr "বৈধ তারিখ দিন।" + +#: forms/fields.py:321 +#: forms/fields.py:849 +msgid "Enter a valid time." +msgstr "বৈধ সময় দিন।" + +#: forms/fields.py:360 +msgid "Enter a valid date/time." +msgstr "বৈধ ডারিখ/সময় দিন।" + +#: forms/fields.py:446 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "কোন ফাইল দেয়া হয়নি। ফর্মের এনকোডিং ঠিক আছে কিনা দেখুন।" + +#: forms/fields.py:447 +msgid "No file was submitted." +msgstr "কোন ফাইল দেয়া হয়নি।" + +#: forms/fields.py:448 +msgid "The submitted file is empty." +msgstr "ফাইলটি খালি।" + +#: forms/fields.py:477 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "সঠিক ছবি আপলোড করুন। যে ফাইলটি আপলোড করা হয়েছে তা হয় ছবি নয় অথবা নষ্ট হয়ে যাওয়া ছবি।" + +#: forms/fields.py:538 +msgid "Enter a valid URL." +msgstr "বৈধ URL দিন" + +#: forms/fields.py:539 +msgid "This URL appears to be a broken link." +msgstr "এই URL টি সঠিক নয়।" + +#: forms/fields.py:618 +#: forms/fields.py:696 +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "%(value)s বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।" + +#: forms/fields.py:697 +#: forms/fields.py:758 +#: forms/models.py:654 +msgid "Enter a list of values." +msgstr "কয়েকটি মানের তালিকা দিন।" + +#: forms/fields.py:877 +msgid "Enter a valid IPv4 address." +msgstr "একটি বৈধ IPv4 ঠিকানা দিন।" + +#: forms/fields.py:887 +msgid "" +"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +msgstr "বৈধ ’slug' প্রবেশ করান যাতে শুধুমাত্র ইংরেজী বর্ণ, অঙ্ক, আন্ডারস্কোর অথবা হাইফেন রয়েছে।" + +#: forms/formsets.py:242 +#: forms/formsets.py:244 +msgid "Order" +msgstr "ক্রম" + +#: forms/models.py:268 +#: forms/models.py:277 +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "%(field_label)s সহ %(model_name)s আরেকটি রয়েছে।" + +#: forms/models.py:584 +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "এটি বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।" + +#: forms/models.py:655 +#, python-format +msgid "Select a valid choice. %s is not one of the available choices." +msgstr "%s বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।" + +#: template/defaultfilters.py:706 +msgid "yes,no,maybe" +msgstr "হ্যাঁ,না,হয়তো" + +#: template/defaultfilters.py:737 +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "%(size)d বাইট" +msgstr[1] "%(size)d বাইট" + +#: template/defaultfilters.py:739 +#, python-format +msgid "%.1f KB" +msgstr "%.1f কেবি" + +#: template/defaultfilters.py:741 +#, python-format +msgid "%.1f MB" +msgstr "%.1f এমবি" + +#: template/defaultfilters.py:742 +#, python-format +msgid "%.1f GB" +msgstr "%.1f জিবি" + +#: utils/dateformat.py:41 +msgid "p.m." +msgstr "অপরাহ্ন" + +#: utils/dateformat.py:42 +msgid "a.m." +msgstr "পূর্বাহ্ন" + +#: utils/dateformat.py:47 +msgid "PM" +msgstr "অপরাহ্ন" + +#: utils/dateformat.py:48 +msgid "AM" +msgstr "পূর্বাহ্ন" + +#: utils/dateformat.py:97 +msgid "midnight" +msgstr "মধ্যরাত" + +#: utils/dateformat.py:99 +msgid "noon" +msgstr "দুপুর" #: utils/dates.py:6 msgid "Monday" -msgstr "সোমবার" +msgstr "সোমবার" #: utils/dates.py:6 msgid "Tuesday" @@ -1320,7 +3784,7 @@ msgstr "বুধবার" #: utils/dates.py:6 msgid "Thursday" -msgstr "বৃহস্পতিবার" +msgstr "বৃহঃ" #: utils/dates.py:6 msgid "Friday" @@ -1334,660 +3798,244 @@ msgstr "শনিবার" msgid "Sunday" msgstr "রবিবার" -#: utils/dates.py:14 +#: utils/dates.py:10 +msgid "Mon" +msgstr "সোম" + +#: utils/dates.py:10 +msgid "Tue" +msgstr "মঙ্গল" + +#: utils/dates.py:10 +msgid "Wed" +msgstr "বুধ" + +#: utils/dates.py:10 +msgid "Thu" +msgstr "বৃহঃ" + +#: utils/dates.py:10 +msgid "Fri" +msgstr "শুক্র" + +#: utils/dates.py:11 +msgid "Sat" +msgstr "শনি" + +#: utils/dates.py:11 +msgid "Sun" +msgstr "রবি" + +#: utils/dates.py:18 msgid "January" -msgstr "জানুয়ারী" +msgstr "জানুয়ারি" -#: utils/dates.py:14 +#: utils/dates.py:18 msgid "February" -msgstr "ফেব্রুয়ারী" +msgstr "ফেব্রুয়ারি" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:18 +#: utils/dates.py:31 msgid "March" msgstr "মার্চ" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:18 +#: utils/dates.py:31 msgid "April" msgstr "এপ্রিল" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:18 +#: utils/dates.py:31 msgid "May" msgstr "মে" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:18 +#: utils/dates.py:31 msgid "June" msgstr "জুন" -#: utils/dates.py:15 utils/dates.py:27 +#: utils/dates.py:19 +#: utils/dates.py:31 msgid "July" msgstr "জুলাই" -#: utils/dates.py:15 +#: utils/dates.py:19 msgid "August" -msgstr "অগাস্ট" +msgstr "আগস্ট" -#: utils/dates.py:15 +#: utils/dates.py:19 msgid "September" msgstr "সেপ্টেম্বর" -#: utils/dates.py:15 +#: utils/dates.py:19 msgid "October" -msgstr "অক্টোবর" +msgstr "অক্টোবর" -#: utils/dates.py:15 +#: utils/dates.py:19 msgid "November" msgstr "নভেম্বর" -#: utils/dates.py:16 +#: utils/dates.py:20 msgid "December" msgstr "ডিসেম্বর" -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "jan" -msgstr "" +msgstr "জান." -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "feb" -msgstr "" +msgstr "ফেব." -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "mar" -msgstr "" +msgstr "মার্চ" -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "apr" -msgstr "" +msgstr "এপ্রি." -#: utils/dates.py:19 -#, fuzzy +#: utils/dates.py:23 msgid "may" msgstr "মে" -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "jun" -msgstr "" +msgstr "জুন" -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "jul" -msgstr "" +msgstr "জুল." -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "aug" -msgstr "" +msgstr "আগ." -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "sep" -msgstr "" +msgstr "সেপ্টে." -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "oct" -msgstr "" +msgstr "অক্টো." -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "nov" -msgstr "" +msgstr "নভে." -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "dec" -msgstr "" +msgstr "ডিসে." -#: utils/dates.py:27 +#: utils/dates.py:31 msgid "Jan." -msgstr "জানু." +msgstr "জান." -#: utils/dates.py:27 +#: utils/dates.py:31 msgid "Feb." -msgstr "ফেব্রু" +msgstr "ফেব." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Aug." -msgstr "অগা." +msgstr "আগ." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Sept." msgstr "সেপ্টে." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Oct." -msgstr "অক্টো." +msgstr "অক্টো." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Nov." msgstr "নভে." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Dec." msgstr "ডিসে." -#: utils/timesince.py:12 +#: utils/text.py:128 +msgid "or" +msgstr "অথবা" + +#: utils/timesince.py:21 msgid "year" msgid_plural "years" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "বছর" +msgstr[1] "বছর" -#: utils/timesince.py:13 +#: utils/timesince.py:22 msgid "month" msgid_plural "months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "মাস" +msgstr[1] "মাস" -#: utils/timesince.py:14 +#: utils/timesince.py:23 msgid "week" msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "সপ্তাহ" +msgstr[1] "সপ্তাহ" -#: utils/timesince.py:15 -#, fuzzy +#: utils/timesince.py:24 msgid "day" msgid_plural "days" -msgstr[0] "মে" -msgstr[1] "মে" +msgstr[0] "দিন" +msgstr[1] "দিন" -#: utils/timesince.py:16 +#: utils/timesince.py:25 msgid "hour" msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ঘন্টা" +msgstr[1] "ঘন্টা" -#: utils/timesince.py:17 -#, fuzzy +#: utils/timesince.py:26 msgid "minute" msgid_plural "minutes" -msgstr[0] "স্থান" -msgstr[1] "স্থান" +msgstr[0] "মিনিট" +msgstr[1] "মিনিট" -#: conf/global_settings.py:37 -msgid "Bengali" -msgstr "বাংলা" +#: utils/timesince.py:43 +msgid "minutes" +msgstr "মিনিট" -#: conf/global_settings.py:38 -msgid "Czech" -msgstr "চেক" - -#: conf/global_settings.py:39 -msgid "Welsh" -msgstr "ওয়েল্শ" - -#: conf/global_settings.py:40 -#, fuzzy -msgid "Danish" -msgstr "স্প্যানিশ" - -#: conf/global_settings.py:41 -msgid "German" -msgstr "জার্মান" - -#: conf/global_settings.py:42 -msgid "Greek" -msgstr "" - -#: conf/global_settings.py:43 -msgid "English" -msgstr "ইংরেজী" - -#: conf/global_settings.py:44 -msgid "Spanish" -msgstr "স্প্যানিশ" - -#: conf/global_settings.py:45 -msgid "French" -msgstr "ফরাসী" - -#: conf/global_settings.py:46 -msgid "Galician" -msgstr "গ্যালিসিয়" - -#: conf/global_settings.py:47 -msgid "Hungarian" -msgstr "" - -#: conf/global_settings.py:48 -msgid "Hebrew" -msgstr "" - -#: conf/global_settings.py:49 -msgid "Icelandic" -msgstr "" - -#: conf/global_settings.py:50 -msgid "Italian" -msgstr "ইতালিয়" - -#: conf/global_settings.py:51 -msgid "Japanese" -msgstr "" - -#: conf/global_settings.py:52 -msgid "Dutch" -msgstr "" - -#: conf/global_settings.py:53 -msgid "Norwegian" -msgstr "নরওয়েজিয়" - -#: conf/global_settings.py:54 -msgid "Brazilian" -msgstr "ব্রাজিলীয়" - -#: conf/global_settings.py:55 -msgid "Romanian" -msgstr "রোমানীয়" - -#: conf/global_settings.py:56 -msgid "Russian" -msgstr "রুশ" - -#: conf/global_settings.py:57 -msgid "Slovak" -msgstr "স্লোভাক" - -#: conf/global_settings.py:58 -#, fuzzy -msgid "Slovenian" -msgstr "স্লোভাক" - -#: conf/global_settings.py:59 -msgid "Serbian" -msgstr "সার্বিয়ান" - -#: conf/global_settings.py:60 -msgid "Swedish" -msgstr "" - -#: conf/global_settings.py:61 -#, fuzzy -msgid "Ukrainian" -msgstr "ব্রাজিলীয়" - -#: conf/global_settings.py:62 -msgid "Simplified Chinese" -msgstr "সরলীকৃত চীনা" - -#: conf/global_settings.py:63 -msgid "Traditional Chinese" -msgstr "" - -#: core/validators.py:60 -msgid "This value must contain only letters, numbers and underscores." -msgstr "এই মানটি শুধু মাত্র অক্ষর, অংক, এবং আন্ডারস্কোর (_) হতে পারবে।" - -#: core/validators.py:64 -#, fuzzy -msgid "" -"This value must contain only letters, numbers, underscores, dashes or " -"slashes." -msgstr "এই মানটি শুধু মাত্র অক্ষর, অংক, আন্ডারস্কোর (_) এবং স্ল্যাশ হতে পারবে।" - -#: core/validators.py:72 -msgid "Uppercase letters are not allowed here." -msgstr "বড় হাতের অক্ষর এখানে ঢোকাতে পারবেন না।" - -#: core/validators.py:76 -msgid "Lowercase letters are not allowed here." -msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।" - -#: core/validators.py:83 -msgid "Enter only digits separated by commas." -msgstr "কমা দ্বারা আলাদা করে শুধু মাত্র অংক ঢোকান।" - -#: core/validators.py:95 -msgid "Enter valid e-mail addresses separated by commas." -msgstr "কমা দ্বারা আলাদা করে বৈধ ই-মেল ঠিকানা ঢোকান।" - -#: core/validators.py:99 -msgid "Please enter a valid IP address." -msgstr "দয়া করে একটি বৈধ IP ঠিকানা ঢোকান।" - -#: core/validators.py:103 -msgid "Empty values are not allowed here." -msgstr "ফাঁকা মান এখানে ঢোকাতে পারবেন না।" - -#: core/validators.py:107 -msgid "Non-numeric characters aren't allowed here." -msgstr "অংক বিহীন অক্ষর এখানে ঢোকাতে পারবেন না।" - -#: core/validators.py:111 -msgid "This value can't be comprised solely of digits." -msgstr "এই মানটি শুধু মাত্র অংকের দ্বারা গঠিত হতে পারে না।" - -#: core/validators.py:116 -msgid "Enter a whole number." -msgstr "একটি গোটা সংখ্যা ঢোকান।" - -#: core/validators.py:120 -msgid "Only alphabetical characters are allowed here." -msgstr "এখানে শুধু মাত্র অক্ষর ঢোকাতে পারবেন ।" - -#: core/validators.py:124 -msgid "Enter a valid date in YYYY-MM-DD format." -msgstr "YYYY-MM-DD ফরম্যাটে একটি বৈধ তারিখ ঢোকান।" - -#: core/validators.py:128 -msgid "Enter a valid time in HH:MM format." -msgstr "HH:MM ফরম্যাটে একটি বৈধ সময় ঢোকান।" - -#: core/validators.py:132 db/models/fields/__init__.py:468 -msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -msgstr "YYYY-MM-DD.HH:MM ফরম্যাটে একটি বৈধ তারিখ/সময় ঢোকান।" - -#: core/validators.py:136 -msgid "Enter a valid e-mail address." -msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।" - -#: core/validators.py:148 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." -msgstr "" -"একটি বৈধ চিত্র আপলোড করুন। যে ফাইল আপনি আপলোড করলেন তা হয় একটি চিত্র নয় অথবা " -"একটি খারাপ চিত্র।" - -#: core/validators.py:155 +#: utils/timesince.py:48 #, python-format -msgid "The URL %s does not point to a valid image." -msgstr "%s ইউ.আর.এল-এ একটি বৈধ চিত্র নেই।" +msgid "%(number)d %(type)s" +msgstr "%(number)d %(type)s" -#: core/validators.py:159 +#: utils/timesince.py:54 #, python-format -msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -msgstr "ফোন নম্বর XXX-XXX-XXXX ফরম্যাটে অবশ্যই হতে হবে। \"%s\" অবৈধ।" +msgid ", %(number)d %(type)s" +msgstr ", %(number)d %(type)s" -#: core/validators.py:167 +#: utils/translation/trans_real.py:403 +msgid "DATE_FORMAT" +msgstr "N j, Y" + +#: utils/translation/trans_real.py:405 +msgid "TIME_FORMAT" +msgstr "P" + +#: utils/translation/trans_real.py:421 +msgid "YEAR_MONTH_FORMAT" +msgstr "F Y" + +#: utils/translation/trans_real.py:422 +msgid "MONTH_DAY_FORMAT" +msgstr "F j" + +#: views/generic/create_update.py:114 #, python-format -msgid "The URL %s does not point to a valid QuickTime video." -msgstr "%s ইউ.আর.এল-এ একটি বৈধ QuickTime ভিডিও পাওয়া গেল না।" +msgid "The %(verbose_name)s was created successfully." +msgstr "%(verbose_name)s তৈরী সফল হয়েছে।" -#: core/validators.py:171 -msgid "A valid URL is required." -msgstr "একটি বৈধ ইউ.আর.এল জরুরি।" - -#: core/validators.py:185 +#: views/generic/create_update.py:156 #, python-format -msgid "" -"Valid HTML is required. Specific errors are:\n" -"%s" -msgstr "" -"বৈধ এইচটিএমএল প্রয়োজনীয়। ত্রুটিগুল হল:\n" -"%s" +msgid "The %(verbose_name)s was updated successfully." +msgstr "%(verbose_name)s হালনাগাদ সফল হয়েছে।" -#: core/validators.py:192 +#: views/generic/create_update.py:198 #, python-format -msgid "Badly formed XML: %s" -msgstr "খারাপভাবে গঠিত এক্সএমএল: %s" - -#: core/validators.py:202 -#, python-format -msgid "Invalid URL: %s" -msgstr "অবৈধ ইউ.আর.এল: %s" - -#: core/validators.py:206 core/validators.py:208 -#, python-format -msgid "The URL %s is a broken link." -msgstr "ইউ.আর.এল %s একটি ভাঙা সংযোগ।" - -#: core/validators.py:214 -msgid "Enter a valid U.S. state abbreviation." -msgstr "একটি বৈধ U S. রাজ্য abbreviation ঢোকান।" - -#: core/validators.py:229 -#, python-format -msgid "Watch your mouth! The word %s is not allowed here." -msgid_plural "Watch your mouth! The words %s are not allowed here." -msgstr[0] "মুখ সামলে! %s এখানে ব্যাবহার করতে পারবেন না।" -msgstr[1] "মুখ সামলে! %s এখানে ব্যাবহার করতে পারবেন না।" - -#: core/validators.py:236 -#, python-format -msgid "This field must match the '%s' field." -msgstr "এই ক্ষেত্রটি '%s' ক্ষেত্রের সঙ্গে অবশ্যই মিলতে হবে।" - -#: core/validators.py:255 -msgid "Please enter something for at least one field." -msgstr "দয়া করে অন্তত এক ক্ষেত্রেতে কিছু জিনিষ ঢোকান।" - -#: core/validators.py:264 core/validators.py:275 -msgid "Please enter both fields or leave them both empty." -msgstr "দয়া করে উভয় ক্ষেত্রে ঢোকান অথবা তাদেরকে উভয় ফাঁকা ছেড়ে চলে যান।" - -#: core/validators.py:282 -#, python-format -msgid "This field must be given if %(field)s is %(value)s" -msgstr "এই ক্ষেত্রেটি অবশ্যই দেওয়া হবে যদি %(field)s %(value)s হয়" - -#: core/validators.py:294 -#, python-format -msgid "This field must be given if %(field)s is not %(value)s" -msgstr "এই ক্ষেত্রেটি অবশ্যই দেওয়া হবে যদি %(field)s %(value)s না হয়" - -#: core/validators.py:313 -msgid "Duplicate values are not allowed." -msgstr "নকল মান অনুমতি দেওয়া হল না।" - -#: core/validators.py:336 -#, python-format -msgid "This value must be a power of %s." -msgstr "এই মানটি %sএর একটি গুন অবশ্যই হতে হবে।" - -#: core/validators.py:347 -msgid "Please enter a valid decimal number." -msgstr "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান।" - -#: core/validators.py:349 -#, python-format -msgid "Please enter a valid decimal number with at most %s total digit." -msgid_plural "" -"Please enter a valid decimal number with at most %s total digits." -msgstr[0] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" -msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" - -#: core/validators.py:352 -#, python-format -msgid "Please enter a valid decimal number with at most %s decimal place." -msgid_plural "" -"Please enter a valid decimal number with at most %s decimal places." -msgstr[0] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" -msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" - -#: core/validators.py:362 -#, python-format -msgid "Make sure your uploaded file is at least %s bytes big." -msgstr "আাপনার আপলোড করা ফাইল যেন অন্তত %s বাইট বড় হয় তা নিশ্চিত করুন।" - -#: core/validators.py:363 -#, python-format -msgid "Make sure your uploaded file is at most %s bytes big." -msgstr "আাপনার আপলোড করা ফাইল যেন %s বাইটের থেকে বড় না হয় তা নিশ্চিত করুন।" - -#: core/validators.py:376 -msgid "The format for this field is wrong." -msgstr "এই ক্ষেত্রের জন্য ফরম্যাটটি ভূল।" - -#: core/validators.py:391 -msgid "This field is invalid." -msgstr "এই ক্ষেত্রেটি অবৈধ।" - -#: core/validators.py:426 -#, python-format -msgid "Could not retrieve anything from %s." -msgstr "%s থেকে কোন কিছু গ্রহন করতে পারলাম না।" - -#: core/validators.py:429 -#, python-format -msgid "" -"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." -msgstr "" -"ইউ.আর.এল %(url)s অবৈধ Content-Type শিরোনাম নিয়ে '%(contenttype)s ফিরে আসল।" - -#: core/validators.py:462 -#, python-format -msgid "" -"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " -"\"%(start)s\".)" -msgstr "" -"দয়া করে লাইন %(line)s থেকে খোলা %(tag)s বন্ধ করুন। (\"%(start)s\"এর সঙ্গে লাইন " -"আরম্ভ।)" - -#: core/validators.py:466 -#, python-format -msgid "" -"Some text starting on line %(line)s is not allowed in that context. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"লাইন %(line)s এই প্রসঙ্গে কিছু শব্দ লেখার অনুমতি দেওয়া গেল না। (\"%(start)s\"এর " -"সঙ্গে লাইন আরম্ভ।)" - -#: core/validators.py:471 -#, python-format -msgid "" -"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" -"(start)s\".)" -msgstr "" -"লাইন %(line)s\"%(attr)s\"একটি অবৈধ বৈশিষ্ট্য। (\"%(start)s\"এর সঙ্গে লাইন আরম্ভ।)" - -#: core/validators.py:476 -#, python-format -msgid "" -"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" -"(start)s\".)" -msgstr "" -" %(line)s লাইনে \"<%(tag)s>\" একটি অবৈধ ট্যাগ। (\"%(start)s\"এর সঙ্গে লাইন " -"আরম্ভ।)" - -#: core/validators.py:480 -#, python-format -msgid "" -"A tag on line %(line)s is missing one or more required attributes. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"লাইন %(line)s একটি ট্যাগে এক অথবা আরও বেশি প্রয়োজনীয় বিশিষ্ট্যাবলী নেই। (\"%" -"(start)s\"এর সঙ্গে লাইন আরম্ভ।)" - -#: core/validators.py:485 -#, python-format -msgid "" -"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"\"%(attr)s\"বৈশিষ্ট্যয় লাইন %(line)s একটি অবৈধ মান আছে । (\"%(start)s\"এর সঙ্গে " -"লাইন আরম্ভ।)" - -#: db/models/manipulators.py:302 -#, python-format -msgid "%(object)s with this %(type)s already exists for the given %(field)s." -msgstr "" - -#: db/models/fields/__init__.py:40 -#, python-format -msgid "%(optname)s with this %(fieldname)s already exists." -msgstr "" - -#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265 -#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553 -#: forms/__init__.py:346 -#, fuzzy -msgid "This field is required." -msgstr "এই ক্ষেত্রেটি অবৈধ।" - -#: db/models/fields/__init__.py:337 -#, fuzzy -msgid "This value must be an integer." -msgstr "এই মানটি %sএর একটি গুন অবশ্যই হতে হবে।" - -#: db/models/fields/__init__.py:369 -#, fuzzy -msgid "This value must be either True or False." -msgstr "এই মানটি %sএর একটি গুন অবশ্যই হতে হবে।" - -#: db/models/fields/__init__.py:385 -#, fuzzy -msgid "This field cannot be null." -msgstr "এই ক্ষেত্রেটি অবৈধ।" - -#: db/models/fields/__init__.py:562 -#, fuzzy -msgid "Enter a valid filename." -msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।" - -#: db/models/fields/related.py:43 -#, fuzzy, python-format -msgid "Please enter a valid %s." -msgstr "দয়া করে একটি বৈধ IP ঠিকানা ঢোকান।" - -#: db/models/fields/related.py:579 -#, fuzzy -msgid "Separate multiple IDs with commas." -msgstr "একাধিক আই.ডি.কমার দ্বারা আলাদা করুন।" - -#: db/models/fields/related.py:581 -#, fuzzy -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "" -"একের চেয়ে বেশি নির্বাচন করতে \"Control\" অথবা ম্যাক-এ \"Command\" চেপে ধরে " -"রাখুন।" - -#: db/models/fields/related.py:625 -#, python-format -msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "" -"Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr[0] "" -msgstr[1] "" - -#: forms/__init__.py:380 -#, python-format -msgid "Ensure your text is less than %s character." -msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "" -msgstr[1] "" - -#: forms/__init__.py:385 -#, fuzzy -msgid "Line breaks are not allowed here." -msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।" - -#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589 -#, python-format -msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -msgstr "" - -#: forms/__init__.py:645 -msgid "The submitted file is empty." -msgstr "" - -#: forms/__init__.py:699 -#, fuzzy -msgid "Enter a whole number between -32,768 and 32,767." -msgstr "একটি গোটা সংখ্যা ঢোকান।" - -#: forms/__init__.py:708 -#, fuzzy -msgid "Enter a positive number." -msgstr "একটি গোটা সংখ্যা ঢোকান।" - -#: forms/__init__.py:717 -#, fuzzy -msgid "Enter a whole number between 0 and 32,767." -msgstr "একটি গোটা সংখ্যা ঢোকান।" - -#: template/defaultfilters.py:379 -msgid "yes,no,maybe" -msgstr "" - -#, fuzzy -#~ msgid "Comments" -#~ msgstr "মন্তব্য সক্রিয় করুন" - -#~ msgid "label" -#~ msgstr "লেবেল" - -#~ msgid "package" -#~ msgstr "প্যাকেজ" - -#~ msgid "packages" -#~ msgstr "প্যাকেজ" - -#, fuzzy -#~ msgid "count" -#~ msgstr "অভ্যন্তরস্থ বস্তু" +msgid "The %(verbose_name)s was deleted." +msgstr "%(verbose_name)s মুছে ফেলা হয়েছে।" diff --git a/django/conf/locale/bn/LC_MESSAGES/djangojs.mo b/django/conf/locale/bn/LC_MESSAGES/djangojs.mo index fae1fdc90e..acb90fbbf8 100644 Binary files a/django/conf/locale/bn/LC_MESSAGES/djangojs.mo and b/django/conf/locale/bn/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/bn/LC_MESSAGES/djangojs.po b/django/conf/locale/bn/LC_MESSAGES/djangojs.po index 120d08d70d..eefa9483e9 100644 --- a/django/conf/locale/bn/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/bn/LC_MESSAGES/djangojs.po @@ -1,17 +1,13 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# This file is distributed under the same license as the Django package. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-06-28 17:36+1000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2008-09-02 22:36-0700\n" +"PO-Revision-Date: 2009-07-19 22:49+0000\n" +"Last-Translator: Nasimul Haque \n" +"Language-Team: Nasimul Haque \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -19,100 +15,100 @@ msgstr "" #: contrib/admin/media/js/SelectFilter2.js:33 #, perl-format msgid "Available %s" -msgstr "" +msgstr "%s বিদ্যমান" #: contrib/admin/media/js/SelectFilter2.js:41 msgid "Choose all" -msgstr "" +msgstr "সব বাছাই করুন" #: contrib/admin/media/js/SelectFilter2.js:46 msgid "Add" -msgstr "" +msgstr "যোগ করুন" #: contrib/admin/media/js/SelectFilter2.js:48 msgid "Remove" -msgstr "" +msgstr "মুছে ফেলুন" #: contrib/admin/media/js/SelectFilter2.js:53 #, perl-format msgid "Chosen %s" -msgstr "" +msgstr "%s বাছাই করা হয়েছে" #: contrib/admin/media/js/SelectFilter2.js:54 msgid "Select your choice(s) and click " -msgstr "" +msgstr "আপনার পছন্দ বাছাই এবং ক্লিক করুন" #: contrib/admin/media/js/SelectFilter2.js:59 msgid "Clear all" -msgstr "" +msgstr "সব পরিষ্কার করুন" -#: contrib/admin/media/js/dateparse.js:32 #: contrib/admin/media/js/calendar.js:24 +#: contrib/admin/media/js/dateparse.js:32 msgid "" "January February March April May June July August September October November " "December" -msgstr "" - -#: contrib/admin/media/js/dateparse.js:33 -msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" -msgstr "" +msgstr "জানুয়ারি ফেব্রুয়ারি মার্চ এপ্রিল মে জুন জুলাই অাগস্ট সেপ্টেম্বর অক্টোবর নভেম্বর ডিসেম্বর" #: contrib/admin/media/js/calendar.js:25 msgid "S M T W T F S" -msgstr "" +msgstr "র স ম ব ব শ শ" -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47 -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 -msgid "Now" -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51 -msgid "Clock" -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78 -msgid "Choose a time" -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 -msgid "Midnight" -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 -msgid "6 a.m." -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84 -msgid "Noon" -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88 -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183 -msgid "Cancel" -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128 -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177 -msgid "Today" -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132 -msgid "Calendar" -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175 -msgid "Yesterday" -msgstr "" - -#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179 -msgid "Tomorrow" -msgstr "" +#: contrib/admin/media/js/dateparse.js:33 +msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" +msgstr "রবিবার সোমবার মঙ্গলবার বুধবার বৃহস্পতিবার শুক্রবার শনিবার" #: contrib/admin/media/js/admin/CollapsedFieldsets.js:34 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:72 msgid "Show" -msgstr "" +msgstr "দেখান" #: contrib/admin/media/js/admin/CollapsedFieldsets.js:63 msgid "Hide" -msgstr "" +msgstr "লুকান" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 +msgid "Now" +msgstr "এখন" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51 +msgid "Clock" +msgstr "ঘড়ি" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78 +msgid "Choose a time" +msgstr "সময় নির্বাচন করুন" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 +msgid "Midnight" +msgstr "মধ্যরাত" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 +msgid "6 a.m." +msgstr "৬ পূর্বাহ্ন" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84 +msgid "Noon" +msgstr "দুপুর" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183 +msgid "Cancel" +msgstr "বাতিল" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177 +msgid "Today" +msgstr "আজ" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132 +msgid "Calendar" +msgstr "দিনপঞ্জিকা" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175 +msgid "Yesterday" +msgstr "গতকাল" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179 +msgid "Tomorrow" +msgstr "আগামীকাল" diff --git a/django/conf/locale/ca/LC_MESSAGES/django.mo b/django/conf/locale/ca/LC_MESSAGES/django.mo index 38aecaae32..3039bd8fad 100644 Binary files a/django/conf/locale/ca/LC_MESSAGES/django.mo and b/django/conf/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ca/LC_MESSAGES/django.po b/django/conf/locale/ca/LC_MESSAGES/django.po index 9cfafe3e2a..57f8764938 100644 --- a/django/conf/locale/ca/LC_MESSAGES/django.po +++ b/django/conf/locale/ca/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-24 13:00+0100\n" +"POT-Creation-Date: 2009-07-07 15:04+0200\n" "PO-Revision-Date: 2009-03-24 13:28+0100\n" "Last-Translator: Django Catalan Group \n" "Language-Team: Catalan \n" @@ -218,6 +218,20 @@ msgstr "xinès simplificat" msgid "Traditional Chinese" msgstr "xinès tradicional" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Eliminat/s %(count)d %(items)s satisfactòriament." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 +msgid "Are you sure?" +msgstr "Esteu segurs?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Eliminar els %(verbose_name_plural)s seleccionats" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" @@ -252,15 +266,15 @@ msgstr "Aquest mes" msgid "This year" msgstr "Aquest any" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Si" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "No" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Desconegut" @@ -296,74 +310,61 @@ msgstr "entrada del registre" msgid "log entries" msgstr "entrades del registre" -#: contrib/admin/options.py:131 contrib/admin/options.py:145 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" msgstr "cap" -#: contrib/admin/options.py:498 -#, python-format -msgid "Successfully deleted %(count)d %(items)s." -msgstr "Eliminat/s %(count)d %(items)s satisfactòriament." - -#: contrib/admin/options.py:505 contrib/admin/options.py:1012 -msgid "Are you sure?" -msgstr "Esteu segurs?" - -#: contrib/admin/options.py:523 -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Eliminar els %(verbose_name_plural)s seleccionats" - -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Modificat %s." -#: contrib/admin/options.py:531 contrib/admin/options.py:541 -#: contrib/comments/templates/comments/preview.html:15 forms/models.py:296 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "i" -#: contrib/admin/options.py:536 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Afegit %(name)s \"%(object)s\"" -#: contrib/admin/options.py:540 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificat %(list)s per a %(name)s \"%(object)s\"." -#: contrib/admin/options.py:545 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Eliminat %(name)s \"%(object)s\"." -#: contrib/admin/options.py:549 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Cap camp canviat." -#: contrib/admin/options.py:610 contrib/auth/admin.py:67 +#: contrib/admin/options.py:598 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "El/la %(name)s \"%(obj)s\".ha estat afegit/da amb èxit." -#: contrib/admin/options.py:614 contrib/admin/options.py:647 +#: contrib/admin/options.py:602 contrib/admin/options.py:635 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Podeu editar-lo de nou a baix." -#: contrib/admin/options.py:624 contrib/admin/options.py:657 +#: contrib/admin/options.py:612 contrib/admin/options.py:645 #, python-format msgid "You may add another %s below." msgstr "Podeu afegir un altre %s a baix." -#: contrib/admin/options.py:645 +#: contrib/admin/options.py:633 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s." -#: contrib/admin/options.py:653 +#: contrib/admin/options.py:641 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -371,43 +372,43 @@ msgstr "" "S'ha afegit exitosament el/la %(name)s \"%(obj)s\". Pot editar-lo de nou " "abaix." -#: contrib/admin/options.py:774 +#: contrib/admin/options.py:772 #, python-format msgid "Add %s" msgstr "Afegir %s" -#: contrib/admin/options.py:805 contrib/admin/options.py:990 +#: contrib/admin/options.py:803 contrib/admin/options.py:1003 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "No existèix cap objecte %(name)s amb la clau primària %(key)r." -#: contrib/admin/options.py:862 +#: contrib/admin/options.py:860 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: contrib/admin/options.py:894 +#: contrib/admin/options.py:904 msgid "Database error" msgstr "Error de base de dades" -#: contrib/admin/options.py:930 +#: contrib/admin/options.py:940 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s s'ha modificat amb èxit." msgstr[1] "%(count)s %(name)s s'han modificat amb èxit." -#: contrib/admin/options.py:1005 +#: contrib/admin/options.py:1018 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "El/la %(name)s \"%(obj)s\" ha estat eliminat amb èxit." -#: contrib/admin/options.py:1041 +#: contrib/admin/options.py:1054 #, python-format msgid "Change history: %s" msgstr "Modificar històric: %s" -#: contrib/admin/sites.py:15 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -416,11 +417,11 @@ msgstr "" "Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en " "compte que tots dos camps son sensibles a majúscules i minúscules." -#: contrib/admin/sites.py:250 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Si us plau, identifiqueu-vos de nou doncs la vostra sessió ha expirat." -#: contrib/admin/sites.py:257 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -429,29 +430,29 @@ msgstr "" "'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu " "aquesta pàgina i proveu-ho de nou. " -#: contrib/admin/sites.py:273 contrib/admin/sites.py:279 +#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Els noms d'usuari no poden contenir el caracter '@'." -#: contrib/admin/sites.py:276 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" "La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot " "cas." -#: contrib/admin/sites.py:336 +#: contrib/admin/sites.py:360 msgid "Site administration" msgstr "Lloc administratiu" -#: contrib/admin/sites.py:349 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Iniciar sessió" -#: contrib/admin/sites.py:396 +#: contrib/admin/sites.py:417 #, python-format msgid "%s administration" msgstr "Administració de %s" @@ -466,34 +467,27 @@ msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s" msgid "One or more %(fieldname)s in %(name)s:" msgstr "Un o més %(fieldname)s en %(name)s:" -#: contrib/admin/util.py:222 -#, fuzzy -msgid "verbose_name" -msgid_plural "verbose_name_plural" -msgstr[0] "verbose_name" -msgstr[1] "verbose_name_plural" - -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Date:" msgstr "Data:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Time:" msgstr "Hora:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Currently:" msgstr "Actualment:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Change:" msgstr "Modificar:" -#: contrib/admin/widgets.py:123 +#: contrib/admin/widgets.py:124 msgid "Lookup" msgstr "Cercar" -#: contrib/admin/widgets.py:230 +#: contrib/admin/widgets.py:236 msgid "Add Another" msgstr "Afegir un altre" @@ -508,9 +502,9 @@ msgstr "Ho sentim, però no s'ha pogut trobar la pàgina sol·licitada" #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:31 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:20 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 #: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 @@ -552,7 +546,6 @@ msgid "Run the selected action" msgstr "Executar la acció seleccionada" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Anar" @@ -562,26 +555,26 @@ msgstr "Anar" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 msgid "Welcome," msgstr "Benvingut/da," -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentació" -#: contrib/admin/templates/admin/base.html:28 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" msgstr "Canviar contrasenya" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -612,24 +605,24 @@ msgid "View on site" msgstr "Veure al lloc" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/change_list.html:49 -#: contrib/admin/templates/admin/auth/user/change_password.html:22 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Si us plau, corregiu l'error mostrat a baix." msgstr[1] "Si us plau, corregiu els errors mostrats a baix." -#: contrib/admin/templates/admin/change_list.html:41 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" msgstr "Afegir %(name)s" -#: contrib/admin/templates/admin/change_list.html:60 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "Filtre" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:251 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 msgid "Delete" msgstr "Eliminar" @@ -669,9 +662,9 @@ msgid "" "your account doesn't have permission to delete the following types of " "objects:" msgstr "" -"Eliminar el/la %(object_name)s provocaria l'eliminació " -"d'objectes relacionats, però el vostre compte no te permissos per a esborrar " -"els tipus d'objecte següents:" +"Eliminar el/la %(object_name)s provocaria l'eliminació d'objectes " +"relacionats, però el vostre compte no te permissos per a esborrar els tipus " +"d'objecte següents:" #: contrib/admin/templates/admin/delete_selected_confirmation.html:22 #, python-format @@ -679,8 +672,8 @@ msgid "" "Are you sure you want to delete the selected %(object_name)s objects? All of " "the following objects and it's related items will be deleted:" msgstr "" -"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats?" -"Tots aquests objectes i els seus elements relacionats s'esborraran:" +"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats?Tots " +"aquests objectes i els seus elements relacionats s'esborraran:" #: contrib/admin/templates/admin/filter.html:2 #, python-format @@ -712,6 +705,10 @@ msgstr "Les meves accions" msgid "None available" msgstr "Cap disponible" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Contingut desconegut" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -760,6 +757,15 @@ msgstr "" msgid "Show all" msgstr "Mostrar tots" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Desar" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "Cerca" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -772,10 +778,6 @@ msgstr[1] "%(counter)s resultats" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s en total" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Desar" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Desar com a nou" @@ -802,23 +804,23 @@ msgid "Username" msgstr "Usuari" #: contrib/admin/templates/admin/auth/user/add_form.html:20 -#: contrib/admin/templates/admin/auth/user/change_password.html:33 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 #: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 msgid "Password" msgstr "Contrasenya" #: contrib/admin/templates/admin/auth/user/add_form.html:26 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 #: contrib/auth/forms.py:186 msgid "Password (again)" msgstr "Contrasenya (de nou)" #: contrib/admin/templates/admin/auth/user/add_form.html:27 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 msgid "Enter the same password as above, for verification." msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació." -#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "Introduïu una contrasenya per l'usuari %(username)s" @@ -1035,114 +1037,115 @@ msgstr "El model %(model_name)r no s'ha trobat en l'aplicació %(app_label)r" msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "l'objecte relacionat `%(app_label)s.%(data_type)s`" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:225 +#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244 +#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263 msgid "model:" msgstr "model:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "objectes relacionats `%(app_label)s.%(object_name)s`" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258 #, python-format msgid "all %s" msgstr "tots %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263 #, python-format msgid "number of %s" msgstr "nombre de %s" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:268 #, python-format msgid "Fields on %s objects" msgstr "Camps en objectes %s" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:331 contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:344 contrib/admindocs/views.py:350 +#: contrib/admindocs/views.py:351 contrib/admindocs/views.py:353 msgid "Integer" msgstr "Enter" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:332 msgid "Boolean (Either True or False)" msgstr "Booleà (Verdader o Fals)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:333 contrib/admindocs/views.py:352 #, python-format msgid "String (up to %(max_length)s)" msgstr "Cadena (de fins a %(max_length)s)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:334 msgid "Comma-separated integers" msgstr "Enters separats per comes" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:335 msgid "Date (without time)" msgstr "Data (sense hora)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:336 msgid "Date (with time)" msgstr "Data (amb hora)" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:337 msgid "Decimal number" msgstr "Número decimal" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:338 msgid "E-mail address" msgstr "Adreça de correu electrònic" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:339 contrib/admindocs/views.py:340 +#: contrib/admindocs/views.py:343 msgid "File path" msgstr "Ruta del fitxer" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:341 msgid "Floating point number" msgstr "Número amb punt de coma flotant" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:58 +#: contrib/admindocs/views.py:345 contrib/comments/models.py:60 msgid "IP address" msgstr "Adreça IP" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:347 msgid "Boolean (Either True, False or None)" msgstr "Booleà (Verdader, Fals o 'None' (cap))" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:348 msgid "Relation to parent model" msgstr "Relació amb el model pare" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:349 msgid "Phone number" msgstr "Número de telèfon" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:354 msgid "Text" msgstr "Text" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:355 msgid "Time" msgstr "Hora" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:356 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:357 msgid "U.S. state (two uppercase letters)" msgstr "Estat dels E.U.A. (dues lletres majúscules)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:358 msgid "XML text" msgstr "Text XML" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:384 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s no sembla ser un objecte 'urlpattern'" @@ -1247,7 +1250,7 @@ msgid "Change password: %s" msgstr "Canviar contrasenya: %s" #: contrib/auth/forms.py:15 contrib/auth/forms.py:48 -#: contrib/auth/models.py:127 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." @@ -1338,31 +1341,31 @@ msgstr "permisos" msgid "group" msgstr "grup" -#: contrib/auth/models.py:91 contrib/auth/models.py:137 +#: contrib/auth/models.py:91 contrib/auth/models.py:138 msgid "groups" msgstr "grups" -#: contrib/auth/models.py:127 +#: contrib/auth/models.py:128 msgid "username" msgstr "nom d'usuari" -#: contrib/auth/models.py:128 +#: contrib/auth/models.py:129 msgid "first name" msgstr "nom propi" -#: contrib/auth/models.py:129 +#: contrib/auth/models.py:130 msgid "last name" msgstr "cognoms" -#: contrib/auth/models.py:130 +#: contrib/auth/models.py:131 msgid "e-mail address" msgstr "adreça de correu electrònic" -#: contrib/auth/models.py:131 +#: contrib/auth/models.py:132 msgid "password" msgstr "contrasenya" -#: contrib/auth/models.py:131 +#: contrib/auth/models.py:132 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." @@ -1370,19 +1373,19 @@ msgstr "" "Utilitzeu '[algo]$[salt]$[hexdigest]' o el formulari " "de canvi de contrasenya." -#: contrib/auth/models.py:132 +#: contrib/auth/models.py:133 msgid "staff status" msgstr "membre del personal" -#: contrib/auth/models.py:132 +#: contrib/auth/models.py:133 msgid "Designates whether the user can log into this admin site." msgstr "Indica si l'usuari pot entrar en el lloc administratiu." -#: contrib/auth/models.py:133 +#: contrib/auth/models.py:134 msgid "active" msgstr "actiu" -#: contrib/auth/models.py:133 +#: contrib/auth/models.py:134 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -1390,11 +1393,11 @@ msgstr "" "Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho " "enlloc d'esborrar comptes d'usuari." -#: contrib/auth/models.py:134 +#: contrib/auth/models.py:135 msgid "superuser status" msgstr "estat de superusuari" -#: contrib/auth/models.py:134 +#: contrib/auth/models.py:135 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -1402,15 +1405,15 @@ msgstr "" "Designa que aquest usuari té tots els permissos sense assignar-los " "explícitament." -#: contrib/auth/models.py:135 +#: contrib/auth/models.py:136 msgid "last login" msgstr "últim inici de sessió" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:137 msgid "date joined" msgstr "data de creació" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:139 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." @@ -1418,23 +1421,24 @@ msgstr "" "Junt amb els permissos asignats manualment, aquest usuari tindrà, també, els " "permissos dels grups dels que sigui membre." -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:140 msgid "user permissions" msgstr "permissos de l'usuari" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "usuari" -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:145 msgid "users" msgstr "usuaris" -#: contrib/auth/models.py:300 +#: contrib/auth/models.py:301 msgid "message" msgstr "missatge" -#: contrib/auth/views.py:50 +#: contrib/auth/views.py:56 msgid "Logged out" msgstr "Sessió finalitzada" @@ -1450,6 +1454,16 @@ msgstr "contingut" msgid "Metadata" msgstr "metadades" +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "comentaris de %(site_name)s" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Últims comentaris a %(site_name)s." + #: contrib/comments/forms.py:93 #: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" @@ -1479,46 +1493,51 @@ msgstr "" "Si entreu cualsevol cosa en aquest camp el vostre comentari es tractarà com " "a spam" -#: contrib/comments/models.py:23 +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "tipus de contingut" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "ID de l'objecte" -#: contrib/comments/models.py:50 +#: contrib/comments/models.py:52 msgid "user's name" msgstr "nom d'usuari" -#: contrib/comments/models.py:51 +#: contrib/comments/models.py:53 msgid "user's email address" msgstr "adreça de correu electrònic del usuari" -#: contrib/comments/models.py:52 +#: contrib/comments/models.py:54 msgid "user's URL" msgstr "URL del usuari" -#: contrib/comments/models.py:54 +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "comentari" -#: contrib/comments/models.py:57 +#: contrib/comments/models.py:59 msgid "date/time submitted" msgstr "data/hora d'enviament" -#: contrib/comments/models.py:59 +#: contrib/comments/models.py:61 msgid "is public" msgstr "és públic" -#: contrib/comments/models.py:60 +#: contrib/comments/models.py:62 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "" "Desmarqui aquesta casella per fer desaparèixar aquest comentari del lloc web " "de forma efectiva." -#: contrib/comments/models.py:62 +#: contrib/comments/models.py:64 msgid "is removed" msgstr "està eliminat" -#: contrib/comments/models.py:63 +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." @@ -1526,7 +1545,11 @@ msgstr "" "Marqueu aquesta caixa si el comentari no és apropiat. En lloc seu es " "mostrarà \"Aquest comentari ha estat eliminat\" " -#: contrib/comments/models.py:115 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "comentaris" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." @@ -1534,7 +1557,7 @@ msgstr "" "Aquest comentari va ser publicat per un usuari autentificat, per això el seu " "nom no es modificable." -#: contrib/comments/models.py:124 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." @@ -1542,7 +1565,7 @@ msgstr "" "Aquest comentari va ser publicat per un usuari autentificat, per això la " "seva adreça de correu electrònic no es pot modificar." -#: contrib/comments/models.py:149 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1557,9 +1580,26 @@ msgstr "" "\n" "http://%(domain)s%(url)s" +# Context problem... waitting for comments from django-i18n +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "marcar" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "data" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "marca del comentari" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "marques de comentari" + #: contrib/comments/templates/comments/approve.html:4 msgid "Approve a comment" -msgstr "aprovar un comentari" +msgstr "Aprovar un comentari" #: contrib/comments/templates/comments/approve.html:7 msgid "Really make this comment public?" @@ -1616,13 +1656,13 @@ msgstr "Marcar" msgid "Thanks for flagging" msgstr "Gràcies per marcar" -#: contrib/comments/templates/comments/form.html:16 -#: contrib/comments/templates/comments/preview.html:31 +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 msgid "Post" msgstr "Publicar" -#: contrib/comments/templates/comments/form.html:17 -#: contrib/comments/templates/comments/preview.html:32 +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 msgid "Preview" msgstr "Vista prèvia" @@ -1668,33 +1708,29 @@ msgid "Thank you for your comment" msgstr "Gràcies pel seu comentari" #: contrib/comments/templates/comments/preview.html:4 -#: contrib/comments/templates/comments/preview.html:12 +#: contrib/comments/templates/comments/preview.html:13 msgid "Preview your comment" msgstr "Previsualitzar el seu comentari" -#: contrib/comments/templates/comments/preview.html:10 +#: contrib/comments/templates/comments/preview.html:11 msgid "Please correct the error below" msgid_plural "Please correct the errors below" msgstr[0] "Si us plau, corregiu l'error mostrat a baix." msgstr[1] "Si us plau, corregiu els errors mostrats a baix." -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "Post your comment" msgstr "Enviar el seu comentari" -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "or make changes" msgstr "o faci canvis." -#: contrib/contenttypes/models.py:67 +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "nom de la classe del model en python" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "tipus de contingut" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "tipus de continguts" @@ -1765,18 +1801,26 @@ msgstr "" "Ho sentim, pero el seu formulari ha expirat. Per favor, continui omplint el " "formulari en aquesta pàgina." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "No s'ha indicat cap valor de geometria." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Valor de geometria invàlid." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Tipus de geometria invàlid." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"Ha ocurregut un error al transformar la geometria al SRID de la geometria " +"del camp de formulari." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "rt" @@ -2112,51 +2156,51 @@ msgstr "Regió Bohèmia Central" #: contrib/localflavor/cz/cz_regions.py:10 msgid "South Bohemian Region" -msgstr "Regió Bohemia Sur" +msgstr "Regió Bohèmia Sur" #: contrib/localflavor/cz/cz_regions.py:11 msgid "Pilsen Region" -msgstr "" +msgstr "Regió Pilsen" #: contrib/localflavor/cz/cz_regions.py:12 msgid "Carlsbad Region" -msgstr "" +msgstr "Regió Carlsbad" #: contrib/localflavor/cz/cz_regions.py:13 msgid "Usti Region" -msgstr "" +msgstr "Regió Usti" #: contrib/localflavor/cz/cz_regions.py:14 msgid "Liberec Region" -msgstr "" +msgstr "Regió Liberec" #: contrib/localflavor/cz/cz_regions.py:15 msgid "Hradec Region" -msgstr "" +msgstr "Regió Hradec" #: contrib/localflavor/cz/cz_regions.py:16 msgid "Pardubice Region" -msgstr "" +msgstr "Regió Pardubice" #: contrib/localflavor/cz/cz_regions.py:17 msgid "Vysocina Region" -msgstr "" +msgstr "Regió Vysocina" #: contrib/localflavor/cz/cz_regions.py:18 msgid "South Moravian Region" -msgstr "" +msgstr "Regió Moràvia Sur" #: contrib/localflavor/cz/cz_regions.py:19 msgid "Olomouc Region" -msgstr "" +msgstr "Regió Olomouc" #: contrib/localflavor/cz/cz_regions.py:20 msgid "Zlin Region" -msgstr "" +msgstr "Regió Zlin" #: contrib/localflavor/cz/cz_regions.py:21 msgid "Moravian-Silesian Region" -msgstr "" +msgstr "Regió Moràvia-Silesiana" #: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 msgid "Enter a postal code in the format XXXXX or XXX XX." @@ -2164,11 +2208,13 @@ msgstr "Introduïu un codi postal en el format XXXXX or XXX XX." #: contrib/localflavor/cz/forms.py:47 msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." -msgstr "Introduïu un número de naixement en el format XXXXXX/XXXX o XXXXXXXXXX." +msgstr "" +"Introduïu un número de naixement en el format XXXXXX/XXXX o XXXXXXXXXX." #: contrib/localflavor/cz/forms.py:48 msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" -msgstr "El paràmetre opcional 'Gènere' és invàlid, els valors vàlids son 'f' i 'm'." +msgstr "" +"El paràmetre opcional 'Gènere' és invàlid, els valors vàlids son 'f' i 'm'." #: contrib/localflavor/cz/forms.py:49 msgid "Enter a valid birth number." @@ -3004,16 +3050,16 @@ msgstr "Introduïu un número NIP en el format XXX-XXX-XX-XX o XX-XX-XXX-XXX." msgid "Wrong checksum for the Tax Number (NIP)." msgstr "Validació invàlida del número tributari (NIP)." -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." msgstr "" -"El número nacional de registre de negocis (REGON) consisteix en 7 o 9 dígits." +"El número nacional de registre de negocis (REGON) consisteix en 9 o 14 dígits." -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." msgstr "Validació invàlida del número nacional de registre de negocis." -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." msgstr "Introduïu un codi postal en el format XX-XXX." @@ -3851,60 +3897,60 @@ msgstr "nom per mostrar" msgid "sites" msgstr "llocs" -#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "Aquest valor ha de ser un enter." -#: db/models/fields/__init__.py:387 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." msgstr "Aquest valor ha de ser True (Veritat) o False (Fals)" -#: db/models/fields/__init__.py:420 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Aquest camp no pot ser nul." -#: db/models/fields/__init__.py:436 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "Introduïu només dígits separats per comes." -#: db/models/fields/__init__.py:467 +#: db/models/fields/__init__.py:474 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:476 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Data invàlida: %s" -#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format." msgstr "" "Introduïu un data/hora vàlida en format YYYY-MM-DD HH:MM[:ss[.uuuuuu]]." -#: db/models/fields/__init__.py:594 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." msgstr "Aquest valor ha de ser un número decimal." -#: db/models/fields/__init__.py:676 +#: db/models/fields/__init__.py:686 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:736 +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)" -#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 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/related.py:779 +#: db/models/fields/related.py:816 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." -#: db/models/fields/related.py:857 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3971,11 +4017,11 @@ msgstr "Assegureu-vos de que no hi ha més de %s decimals." msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Assegureu-vos de que no hi ha més de %s dígits decimals." -#: forms/fields.py:288 forms/fields.py:850 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Introduïu una data vàlida." -#: forms/fields.py:322 forms/fields.py:851 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Introduïu una hora vàlida." @@ -3996,7 +4042,15 @@ msgstr "No s'ha enviat cap fitxer." msgid "The submitted file is empty." msgstr "El fitxer enviat està buit." -#: forms/fields.py:478 +#: forms/fields.py:450 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "" +"Assegureu-vos de que el valor té com a màxim %(max)d caràcters " +"(en té %(length)d)." + +#: forms/fields.py:483 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -4004,106 +4058,139 @@ msgstr "" "Envieu una imatge vàlida. El fitxer que heu enviat no era una imatge o " "estava corrupte." -#: forms/fields.py:539 +#: forms/fields.py:544 msgid "Enter a valid URL." msgstr "Introduïu una URL vàlida." -#: forms/fields.py:540 +#: forms/fields.py:545 msgid "This URL appears to be a broken link." msgstr "Aquesta URL sembla ser un enllaç trencat." -#: forms/fields.py:619 forms/fields.py:697 +#: forms/fields.py:625 forms/fields.py:703 #, 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:698 forms/fields.py:759 forms/models.py:729 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Introduïu una llista de valors." -#: forms/fields.py:879 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Introduïu una adreça IPv4 vàlida." -#: forms/fields.py:889 +#: forms/fields.py:902 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." -#: forms/formsets.py:247 forms/formsets.py:249 +#: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Ordre" -#: forms/models.py:289 forms/models.py:298 +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "Ja existeix %(model_name)s amb aquest %(field_label)s." -#: forms/models.py:602 +#: forms/models.py:594 +#, 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:598 +#, 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:604 +#, 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 "" +"Si us plau, corregiu la dada duplicada per a %(field_name)s, " +"la qual ha de ser única per a la cerca %(lookup)s en %(date_field)s." + +#: forms/models.py:612 +msgid "Please correct the duplicate values below." +msgstr "Si us plau, corregiu els valors duplicats a baix." + +#: forms/models.py:867 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" "La clau forànea en línea no coincideix amb la clau primària de la instància " "del pare" -#: forms/models.py:659 +#: forms/models.py:930 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Escolli una opció vàlida; Aquesta opció no és una de les opcions disponibles." -#: forms/models.py:730 +#: forms/models.py:1004 #, 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." -#: template/defaultfilters.py:751 +#: forms/models.py:1006 +#, 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." + +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "si,no,potser" -#: template/defaultfilters.py:782 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d byte" msgstr[1] "%(size)d bytes" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:786 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:787 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "p.m." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "a.m." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "PM" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "AM" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "mitja nit" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "mig dia" @@ -4327,16 +4414,16 @@ msgid_plural "minutes" msgstr[0] "minut" msgstr[1] "minuts" -#: utils/timesince.py:43 +#: utils/timesince.py:45 msgid "minutes" msgstr "minuts" -#: utils/timesince.py:48 +#: utils/timesince.py:50 #, python-format msgid "%(number)d %(type)s" msgstr "%(number)d %(type)s" -#: utils/timesince.py:54 +#: utils/timesince.py:56 #, python-format msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" @@ -4371,3 +4458,9 @@ msgstr "El/la %(verbose_name)s s'ha actualtzat amb èxit." #, python-format msgid "The %(verbose_name)s was deleted." msgstr "El %(verbose_name)s s'ha eliminat." + +#, fuzzy +#~ msgid "verbose_name" +#~ msgid_plural "verbose_name_plural" +#~ msgstr[0] "verbose_name" +#~ msgstr[1] "verbose_name_plural" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 0d2f393ef4..2ec6b08c88 100644 Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index 7f67021461..9dcb760f75 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -1,13 +1,16 @@ # Translation of django.po to Czech -# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the DJANGO package. -# Radek Svarz , 2005. +# Radek Svarz , 2005, +# Tomáš Ehrlich , 2009, +# Vláďa Macek , 2009. # msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-01 19:39-0700\n" +"POT-Creation-Date: 2009-05-15 14:17+0200\n" +"PO-Revision-Date: 2009-05-15 14:19+0200\n" +"Last-Translator: Vláďa Macek \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,117 +102,139 @@ msgid "Hebrew" msgstr "hebrejsky" #: conf/global_settings.py:65 +msgid "Hindi" +msgstr "hindsky" + +#: conf/global_settings.py:66 msgid "Croatian" msgstr "chorvatsky" -#: conf/global_settings.py:66 +#: conf/global_settings.py:67 msgid "Icelandic" msgstr "islandsky" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Italian" msgstr "italsky" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Japanese" msgstr "japonsky" -#: conf/global_settings.py:69 -msgid "Georgian" -msgstr "gruzijsky" - #: conf/global_settings.py:70 +msgid "Georgian" +msgstr "gruzínsky" + +#: conf/global_settings.py:71 msgid "Korean" msgstr "korejsky" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Khmer" msgstr "khmersky" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Kannada" msgstr "kannadsky" -#: conf/global_settings.py:73 -msgid "Latvian" -msgstr "litevsky" - #: conf/global_settings.py:74 -msgid "Lithuanian" +msgid "Latvian" msgstr "lotyšsky" #: conf/global_settings.py:75 +msgid "Lithuanian" +msgstr "litevsky" + +#: conf/global_settings.py:76 msgid "Macedonian" msgstr "makedonsky" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Dutch" msgstr "holandsky" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "Norwegian" msgstr "norsky" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Polish" msgstr "polsky" -#: conf/global_settings.py:79 -msgid "Portugese" +#: conf/global_settings.py:80 +msgid "Portuguese" msgstr "portugalsky" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Brazilian Portuguese" msgstr "brazilskou portugalštinou" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Romanian" msgstr "rumunsky" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Russian" msgstr "rusky" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Slovak" msgstr "slovensky" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Slovenian" msgstr "slovinsky" -#: conf/global_settings.py:85 +#: conf/global_settings.py:86 msgid "Serbian" msgstr "srbsky" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Swedish" msgstr "švédsky" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 msgid "Tamil" msgstr "tamilsky" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Telugu" msgstr "telužsky" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 +msgid "Thai" +msgstr "thajsky" + +#: conf/global_settings.py:91 msgid "Turkish" msgstr "turecky" -#: conf/global_settings.py:90 +#: conf/global_settings.py:92 msgid "Ukrainian" msgstr "ukrajinsky" -#: conf/global_settings.py:91 +#: conf/global_settings.py:93 msgid "Simplified Chinese" -msgstr "jednoduchou čínštinou" +msgstr "zjednodušenou čínštinou" -#: conf/global_settings.py:92 +#: conf/global_settings.py:94 msgid "Traditional Chinese" msgstr "tradiční čínštinou" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Úspěšně smazané: %(count)d %(items)s." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 +msgid "Are you sure?" +msgstr "Jste si jisti?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Smazat vybrané %(verbose_name_plural)s" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" @@ -219,7 +244,7 @@ msgstr "" "

      %s:

      \n" "
        \n" -#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 #: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 msgid "All" msgstr "Vše" @@ -244,29 +269,33 @@ msgstr "Tento měsíc" msgid "This year" msgstr "Tento rok" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Ano" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Ne" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Neznámé" +#: contrib/admin/helpers.py:14 +msgid "Action:" +msgstr "Akce:" + #: contrib/admin/models.py:19 msgid "action time" msgstr "čas akce" #: contrib/admin/models.py:22 msgid "object id" -msgstr "object id" +msgstr "id objektu" #: contrib/admin/models.py:23 msgid "object repr" -msgstr "object repr" +msgstr "reprez. objektu" #: contrib/admin/models.py:24 msgid "action flag" @@ -274,70 +303,71 @@ msgstr "příznak akce" #: contrib/admin/models.py:25 msgid "change message" -msgstr "zpráva změny" +msgstr "zpráva o změně" #: contrib/admin/models.py:28 msgid "log entry" -msgstr "log záznam" +msgstr "položka protokolu" #: contrib/admin/models.py:29 msgid "log entries" -msgstr "log záznamy" +msgstr "položky protokolu" -#: contrib/admin/options.py:59 contrib/admin/options.py:120 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" msgstr "Žádný" -#: contrib/admin/options.py:332 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Záznam %s změněn." -#: contrib/admin/options.py:332 contrib/admin/options.py:342 -#: forms/models.py:265 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:587 msgid "and" msgstr "a" -#: contrib/admin/options.py:337 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Přidán záznam \"%(object)s\" typu \"%(name)s\"." -#: contrib/admin/options.py:341 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Změněn \"%(list)s\" pro záznam \"%(object)s\" typu \"%(name)s\"." -#: contrib/admin/options.py:346 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Smazán záznam \"%(object)s\" typu \"%(name)s\"." -#: contrib/admin/options.py:350 +#: contrib/admin/options.py:537 msgid "No fields changed." -msgstr "Nebyly změněny žádná pole." +msgstr "Nebyla změněna žádná pole." -#: contrib/admin/options.py:411 contrib/auth/admin.py:51 +#: contrib/admin/options.py:598 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Záznam \"%(obj)s\" typu \"%(name)s\" byl úspěšně přidán." -#: contrib/admin/options.py:415 contrib/admin/options.py:448 -#: contrib/auth/admin.py:59 +#: contrib/admin/options.py:602 contrib/admin/options.py:635 +#: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "V úpravách můžete pokračovat níže." -#: contrib/admin/options.py:425 contrib/admin/options.py:458 +#: contrib/admin/options.py:612 contrib/admin/options.py:645 #, python-format msgid "You may add another %s below." msgstr "Další záznam typu \"%s\" můžete přidat níže." -#: contrib/admin/options.py:446 +#: contrib/admin/options.py:633 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Záznam \"%(obj)s\" typu \"%(name)s\" byl úspěšně změněn." -#: contrib/admin/options.py:454 +#: contrib/admin/options.py:641 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -345,117 +375,122 @@ msgstr "" "Záznam \"%(obj)s\" typu \"%(name)s\" byl úspěšně přidán. Níže můžete v " "úpravách pokračovat." -#: contrib/admin/options.py:530 +#: contrib/admin/options.py:772 #, python-format msgid "Add %s" msgstr "%s: přidat" -#: contrib/admin/options.py:608 +#: contrib/admin/options.py:803 contrib/admin/options.py:1003 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "Objekt %(name)s s primárním klíčem %(key)r neexistuje." + +#: contrib/admin/options.py:860 #, python-format msgid "Change %s" msgstr "%s: změnit" -#: contrib/admin/options.py:640 +#: contrib/admin/options.py:904 msgid "Database error" -msgstr "Databázová chyba" +msgstr "Chyba databáze" -#: contrib/admin/options.py:690 +#: contrib/admin/options.py:940 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "Položka %(name)s byla úspěšně změněna." +msgstr[1] "%(count)s položky %(name)s byly úspěšně změněny." +msgstr[2] "%(count)s položek %(name)s bylo úspěšně změněno." + +#: contrib/admin/options.py:1018 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Záznam \"%(obj)s\" typu \"%(name)s\" byl úspěšně smazán." -#: contrib/admin/options.py:697 -msgid "Are you sure?" -msgstr "Jste si jist(á)?" - -#: contrib/admin/options.py:726 +#: contrib/admin/options.py:1054 #, python-format msgid "Change history: %s" msgstr "Historie změn: %s" -#: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:16 +#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -"Prosíme, vložte správné uživatelské jméno a heslo. Poznámka - u obou položek " -"se rozlišuje velikost písmen." +"Vložte správné uživatelské jméno a heslo (u obou položek se rozlišují malá a " +"velká písmena)." -#: contrib/admin/sites.py:242 contrib/admin/views/decorators.py:68 -msgid "" -"Please log in again, because your session has expired. Don't worry: Your " -"submission has been saved." -msgstr "" -"Prosíme, znovu se přihlaste, Vaše sezení vypršelo. Nemusíte se obávat, Vaše " -"podání je uloženo." +#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +msgid "Please log in again, because your session has expired." +msgstr "Přihlaste se znovu, vaše sezení vypršelo." -#: contrib/admin/sites.py:249 contrib/admin/views/decorators.py:75 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." msgstr "" -"Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, " -"zapněte cookies, obnovte tuto stránku a zkuste znovu." +"Vypadá to, že váš prohlížeč nepřijímá cookies. Změňte mu toto nastavení, " +"obnovte tuto stránku a zkuste znovu." -#: contrib/admin/sites.py:265 contrib/admin/sites.py:271 -#: contrib/admin/views/decorators.py:94 +#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Uživatelská jména nemohou obsahovat znak \"@\"." -#: contrib/admin/sites.py:268 contrib/admin/views/decorators.py:90 +#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" -"Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho \"%s\"." +"Vaše e-mailová adresa není vaše uživatelské jméno. Zkuste místo toho \"%s\"." -#: contrib/admin/sites.py:336 +#: contrib/admin/sites.py:360 msgid "Site administration" -msgstr "Django správa" +msgstr "Správa webu" -#: contrib/admin/sites.py:358 contrib/admin/templates/admin/login.html:27 +#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 -#: contrib/admin/views/decorators.py:30 +#: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Přihlášení" -#: contrib/admin/sites.py:406 +#: contrib/admin/sites.py:417 #, python-format msgid "%s administration" -msgstr "%s správa" +msgstr "Správa aplikace %s" -#: contrib/admin/util.py:138 +#: contrib/admin/util.py:168 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "" -"Položka \"%(fieldname)s\" pro tento záznam typu \"%(name)s\": \"%(obj)s\"" +"Jedno nebo více polí \"%(fieldname)s\" položky typu \"%(name)s\": \"%(obj)s\"" -#: contrib/admin/util.py:143 +#: contrib/admin/util.py:173 #, python-format msgid "One or more %(fieldname)s in %(name)s:" -msgstr "Položka \"%(fieldname)s\" pro tento záznam typu \"%(name)s\":" +msgstr "Jedno nebo více polí \"%(fieldname)s\" položky typu \"%(name)s\":" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Date:" msgstr "Datum:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Time:" msgstr "Čas:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Currently:" -msgstr "Momentálně:" +msgstr "Aktuálně:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Change:" msgstr "Změna:" -#: contrib/admin/widgets.py:122 +#: contrib/admin/widgets.py:124 msgid "Lookup" msgstr "Hledat" -#: contrib/admin/widgets.py:207 +#: contrib/admin/widgets.py:236 msgid "Add Another" msgstr "Přidat další" @@ -466,14 +501,15 @@ msgstr "Stránka nenalezena" #: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." -msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena." +msgstr "Požadovaná stránka nebyla bohužel nalezena." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:30 +#: contrib/admin/templates/admin/base.html:31 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:8 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 #: contrib/admin/templates/admin/object_history.html:6 #: contrib/admin/templates/admin/auth/user/change_password.html:10 @@ -505,8 +541,16 @@ msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." msgstr "" -"Nastala chyba. Byla oznámena administrátorovi serveru pomocí e-mailu a měla " -"by být brzy odstraněna. Děkujeme za trpělivost." +"Došlo k chybě. Byla oznámena administrátorovi serveru e-mailem a měla by být " +"brzy odstraněna. Děkujeme za trpělivost." + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Provést vybranou akci" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Provést" #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 @@ -514,26 +558,26 @@ msgstr "" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 msgid "Welcome," msgstr "Vítejte, uživateli" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentace" -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" msgstr "Změnit heslo" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -541,11 +585,11 @@ msgstr "Odhlásit se" #: contrib/admin/templates/admin/base_site.html:4 msgid "Django site admin" -msgstr "Django správa webu" +msgstr "Správa webu Django" #: contrib/admin/templates/admin/base_site.html:7 msgid "Django administration" -msgstr "Django správa" +msgstr "Správa systému Django" #: contrib/admin/templates/admin/change_form.html:20 #: contrib/admin/templates/admin/index.html:29 @@ -559,29 +603,30 @@ msgstr "Historie" #: contrib/admin/templates/admin/change_form.html:28 #: contrib/admin/templates/admin/edit_inline/stacked.html:13 -#: contrib/admin/templates/admin/edit_inline/tabular.html:25 +#: contrib/admin/templates/admin/edit_inline/tabular.html:27 msgid "View on site" -msgstr "Pohled na stránku" +msgstr "Zobrazení na webu" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/auth/user/change_password.html:22 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." -msgstr[0] "Prosíme, odstraňte chybu uvedenou níže." -msgstr[1] "Prosíme, odstraňte chyby uvedené níže." -msgstr[2] "Prosíme, odstraňte chyby uvedené níže." +msgstr[0] "Opravte níže uvedenou chybu." +msgstr[1] "Opravte níže uvedené chyby." +msgstr[2] "Opravte níže uvedené chyby." -#: contrib/admin/templates/admin/change_list.html:16 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" msgstr "%(name)s: přidat" -#: contrib/admin/templates/admin/change_list.html:26 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "Filtr" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 msgid "Delete" msgstr "Smazat" @@ -593,7 +638,7 @@ msgid "" "following types of objects:" msgstr "" "Smazání záznamu \"%(escaped_object)s\" typu \"%(object_name)s\" by vyústilo " -"ve vymazání souvisejících objektů, ale Váš účet nemá oprávnění pro mazání " +"ve vymazání souvisejících objektů, ale vy nemáte oprávnění k mazání " "následujících typů objektů:" #: contrib/admin/templates/admin/delete_confirmation.html:23 @@ -602,12 +647,36 @@ msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -"Jste si jist(á), že chcete smazat záznam \"%(escaped_object)s\" typu \"%" -"(object_name)s\"? Všechny následující související položky budou smazány:" +"Opravdu má být smazán záznam \"%(escaped_object)s\" typu \"%(object_name)s" +"\"? Všechny následující související položky budou smazány:" #: contrib/admin/templates/admin/delete_confirmation.html:28 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:33 msgid "Yes, I'm sure" -msgstr "Ano, jsem si jist(á)" +msgstr "Ano, jsem si jist(a)" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:9 +msgid "Delete multiple objects" +msgstr "Smazat vybrané objekty" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:15 +#, python-format +msgid "" +"Deleting the %(object_name)s would result in deleting related objects, but " +"your account doesn't have permission to delete the following types of " +"objects:" +msgstr "" +"Smazání záznamu \"%(object_name)s\" by vyústilo ve vymazání souvisejících " +"objektů, ale vy nemáte oprávnění pro mazání následujících typů objektů:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:22 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(object_name)s objects? All of " +"the following objects and it's related items will be deleted:" +msgstr "" +"Opravdu má být smazán záznam typu \"%(object_name)s\"? Všechny následující " +"související položky budou smazány:" #: contrib/admin/templates/admin/filter.html:2 #, python-format @@ -639,15 +708,19 @@ msgstr "Mé akce" msgid "None available" msgstr "Nic" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Neznámý obsah" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Něco není v pořádku s Vaší instalací databáze. Ujistěte se, že byly " -"vytvořeny odpovídající tabulky databáze a že databáze je přístupná pro čtení " -"daným databázovým uživatelem." +"Potíže s nainstalovanou databází. Ujistěte se, že byly vytvořeny " +"odpovídající tabulky a že databáze je přístupná pro čtení příslušným " +"uživatelem." #: contrib/admin/templates/admin/login.html:19 msgid "Username:" @@ -659,36 +732,37 @@ msgstr "Heslo:" #: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" -msgstr "Datum/čas" +msgstr "Datum a čas" #: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Uživatel" #: contrib/admin/templates/admin/object_history.html:24 +#: contrib/comments/templates/comments/moderation_queue.html:33 msgid "Action" msgstr "Akce" #: contrib/admin/templates/admin/object_history.html:30 -#: utils/translation/trans_real.py:404 +#: utils/translation/trans_real.py:400 msgid "DATETIME_FORMAT" -msgstr "j. n. Y, H:i" +msgstr "j. n. Y H:i" #: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -"Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes " -"administrátorské rozhraní." +"Tento objekt nemá historii změn. Pravděpodobně nebyl přidán pomocí " +"administrátorského rozhraní." #: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" -msgstr "Zobrazit všechny" +msgstr "Zobrazit vše" #: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Provést" +msgid "Search" +msgstr "Hledat" #: contrib/admin/templates/admin/search_form.html:10 #, python-format @@ -701,7 +775,7 @@ msgstr[2] "%(counter)s výsledků" #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "%(full_result_count)s total" -msgstr "%(full_result_count)s celkem" +msgstr "Celkem %(full_result_count)s" #: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" @@ -733,23 +807,23 @@ msgid "Username" msgstr "Uživatelské jméno" #: contrib/admin/templates/admin/auth/user/add_form.html:20 -#: contrib/admin/templates/admin/auth/user/change_password.html:33 -#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 msgid "Password" msgstr "Heslo" #: contrib/admin/templates/admin/auth/user/add_form.html:26 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/auth/forms.py:185 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/auth/forms.py:186 msgid "Password (again)" msgstr "Heslo (znovu)" #: contrib/admin/templates/admin/auth/user/add_form.html:27 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 msgid "Enter the same password as above, for verification." msgstr "Pro ověření vložte stejné heslo znovu." -#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "Vložte nové heslo pro uživatele %(username)s." @@ -760,11 +834,11 @@ msgstr "Smazat?" #: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." -msgstr "Děkujeme Vám za Váš strávený čas na našich webových stránkách." +msgstr "Děkujeme za čas strávený s tímto webem." #: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" -msgstr "Přihlašte se znovu" +msgstr "Přihlaste se znovu" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -787,8 +861,8 @@ msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Prosíme, vložte svoje staré heslo a poté vložte dvakrát nové heslo. Tak " -"můžeme ověřit, že jste ho napsal(a) správně." +"Vložte svoje staré heslo a poté dvakrát vložte nové heslo. Tak ověříme, že " +"bylo zadáno správně." #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -821,7 +895,7 @@ msgstr "Obnovení hesla" #: contrib/admin/templates/registration/password_reset_complete.html:6 #: contrib/admin/templates/registration/password_reset_complete.html:10 msgid "Password reset complete" -msgstr "Heslo obnoveno" +msgstr "Heslo bylo obnoveno" #: contrib/admin/templates/registration/password_reset_complete.html:12 msgid "Your password has been set. You may go ahead and log in now." @@ -829,7 +903,7 @@ msgstr "Vaše heslo bylo nastaveno. Nyní se můžete přihlásit." #: contrib/admin/templates/registration/password_reset_confirm.html:4 msgid "Password reset confirmation" -msgstr "Obnovení hesla potvrzeno" +msgstr "Potvrzení obnovy hesla" #: contrib/admin/templates/registration/password_reset_confirm.html:12 msgid "Enter new password" @@ -839,20 +913,19 @@ msgstr "Vložte nové heslo" msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." -msgstr "" -"Vložte dvakrát nové heslo. Tak můžeme ověřit, že jste ho napsal(a) správně." +msgstr "Vložte dvakrát nové heslo. Tak ověříme, že bylo zadáno správně." #: contrib/admin/templates/registration/password_reset_confirm.html:26 msgid "Password reset unsuccessful" -msgstr "Obnovení hesla nebylo úspěšné" +msgstr "Obnovení hesla bylo neúspěšné" #: contrib/admin/templates/registration/password_reset_confirm.html:28 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -"Odkaz pro obnovení hesla nebyl platný, možná již byl použit. Prosíme, " -"požádejte o obnovení hesla znovu." +"Odkaz pro obnovení hesla byl neplatný, možná již byl použit. Požádejte o " +"obnovení hesla znovu." #: contrib/admin/templates/registration/password_reset_done.html:6 #: contrib/admin/templates/registration/password_reset_done.html:10 @@ -864,25 +937,25 @@ msgid "" "We've e-mailed you instructions for setting your password to the e-mail " "address you submitted. You should be receiving it shortly." msgstr "" -"Poslali jsme Vám e-mailem pokyny pro nastavení vašeho hesla na adresu, " -"kterou jste zadal(a). Měl(a) byste je dostat během okamžiku." +"Poslali jsme vám e-mailem pokyny pro nastavení hesla na vámi zadanou e-" +"mailovou adresu. Za chvíli by mely dorazit do vaší schránky." #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" -msgstr "Dostal(a) jste tento e-mail, protože jste požádal(a) o obnovení hesla" +msgstr "Tento e-mail vám byl doručen, protože jste požádal(a) o obnovení hesla" #: contrib/admin/templates/registration/password_reset_email.html:3 #, python-format msgid "for your user account at %(site_name)s" -msgstr "pro Váš uživatelský účet na %(site_name)s" +msgstr "k vašemu uživatelskému účtu v systému %(site_name)s" #: contrib/admin/templates/registration/password_reset_email.html:5 msgid "Please go to the following page and choose a new password:" -msgstr "Prosíme, jděte na následující stránku a vyberte nové heslo:" +msgstr "Přejděte na následující stránku a zadejte nové heslo:" #: contrib/admin/templates/registration/password_reset_email.html:9 msgid "Your username, in case you've forgotten:" -msgstr "Vaše uživatelské jméno, pro případ, že jste zapomněl(a):" +msgstr "Pro jistotu vaše uživatelské jméno:" #: contrib/admin/templates/registration/password_reset_email.html:11 msgid "Thanks for using our site!" @@ -891,15 +964,15 @@ msgstr "Děkujeme za používání našeho webu!" #: contrib/admin/templates/registration/password_reset_email.html:13 #, python-format msgid "The %(site_name)s team" -msgstr "Tým %(site_name)s" +msgstr "Tým aplikace %(site_name)s" #: contrib/admin/templates/registration/password_reset_form.html:12 msgid "" "Forgotten your password? Enter your e-mail address below, and we'll e-mail " "instructions for setting a new one." msgstr "" -"Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vám e-mailem " -"zašleme pokyny pro nastavení nového." +"Zapomněl(a) jste své současné heslo? Vložte svou e-mailovou adresu a e-" +"mailem obdržíte pokyny pro nastavení nového." #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" @@ -909,168 +982,169 @@ msgstr "E-mailová adresa:" msgid "Reset my password" msgstr "Obnovit heslo" -#: contrib/admin/templatetags/admin_list.py:288 +#: contrib/admin/templatetags/admin_list.py:299 msgid "All dates" msgstr "Všechna data" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s" msgstr "%s: vybrat" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s to change" -msgstr "%s: vybrat pro změnu" +msgstr "Vyberte položku %s ke změně" -#: contrib/admin/views/template.py:36 contrib/sites/models.py:38 +#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 msgid "site" msgstr "web" -#: contrib/admin/views/template.py:38 +#: contrib/admin/views/template.py:39 msgid "template" msgstr "šablona" -#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59 -#: contrib/admindocs/views.py:61 +#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 +#: contrib/admindocs/views.py:62 msgid "tag:" msgstr "tag:" -#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92 -#: contrib/admindocs/views.py:94 +#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 +#: contrib/admindocs/views.py:95 msgid "filter:" msgstr "filtr:" -#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156 -#: contrib/admindocs/views.py:158 +#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 +#: contrib/admindocs/views.py:159 msgid "view:" msgstr "pohled (view):" -#: contrib/admindocs/views.py:186 +#: contrib/admindocs/views.py:187 #, python-format msgid "App %r not found" msgstr "Aplikace %r nenalezena" -#: contrib/admindocs/views.py:193 +#: contrib/admindocs/views.py:194 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Model %(model_name)r v aplikaci %(app_label)r nenalezen" -#: contrib/admindocs/views.py:205 +#: contrib/admindocs/views.py:206 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "související objekt `%(app_label)s.%(data_type)s`" -#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227 -#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 msgid "model:" msgstr "model:" -#: contrib/admindocs/views.py:236 +#: contrib/admindocs/views.py:237 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "související objekty `%(app_label)s.%(object_name)s`" -#: contrib/admindocs/views.py:241 +#: contrib/admindocs/views.py:242 #, python-format msgid "all %s" msgstr "Vše: %s" -#: contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:247 #, python-format msgid "number of %s" msgstr "Počet: %s" -#: contrib/admindocs/views.py:251 +#: contrib/admindocs/views.py:252 #, python-format msgid "Fields on %s objects" -msgstr "Pole na objektech %s" +msgstr "Pole na objektech %s" -#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325 -#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333 -#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 +#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 msgid "Integer" msgstr "Celé číslo" -#: contrib/admindocs/views.py:315 +#: contrib/admindocs/views.py:316 msgid "Boolean (Either True or False)" msgstr "Boolean (buď Ano (True), nebo Ne (False))" -#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335 +#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 #, python-format msgid "String (up to %(max_length)s)" -msgstr "Text (maximálně %(max_length)s znaků)" +msgstr "Řetězec (max. %(max_length)s znaků)" -#: contrib/admindocs/views.py:317 +#: contrib/admindocs/views.py:318 msgid "Comma-separated integers" msgstr "Celá čísla oddělená čárkou" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:319 msgid "Date (without time)" msgstr "Datum (bez času)" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:320 msgid "Date (with time)" msgstr "Datum (s časem)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:321 msgid "Decimal number" msgstr "Desetinné číslo" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:322 msgid "E-mail address" msgstr "E-mailová adresa" -#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323 -#: contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:327 msgid "File path" msgstr "Cesta k souboru" -#: contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:325 msgid "Floating point number" -msgstr "Desetinné číslo" +msgstr "Číslo s pohyblivou řádovou čárkou" -#: contrib/admindocs/views.py:328 contrib/comments/models.py:58 +#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 msgid "IP address" -msgstr "IP adresa" - -#: contrib/admindocs/views.py:330 -msgid "Boolean (Either True, False or None)" -msgstr "Boolean (buď Ano (True), Ne (False), nebo Nic (None))" +msgstr "Adresa IP" #: contrib/admindocs/views.py:331 -msgid "Relation to parent model" -msgstr "V relaci k rodičovskému modelu" +msgid "Boolean (Either True, False or None)" +msgstr "Boolean (buď Ano (True), Ne (False) nebo Nic (None))" #: contrib/admindocs/views.py:332 +msgid "Relation to parent model" +msgstr "Vztah k rodičovskému modelu" + +#: contrib/admindocs/views.py:333 msgid "Phone number" msgstr "Telefonní číslo" -#: contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:338 msgid "Text" msgstr "Text" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:339 msgid "Time" msgstr "Čas" -#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21 +#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:340 -msgid "U.S. state (two uppercase letters)" -msgstr "Stát US (2 velké znaky)" - #: contrib/admindocs/views.py:341 +msgid "U.S. state (two uppercase letters)" +msgstr "Stát v USA (dvě velká písmena)" + +#: contrib/admindocs/views.py:342 msgid "XML text" msgstr "XML text" -#: contrib/admindocs/views.py:367 +#: contrib/admindocs/views.py:368 #, python-format msgid "%s does not appear to be a urlpattern object" -msgstr "%s pravděpodobně není objekt urlpattern" +msgstr "%s pravděpodobně není objekt typu urlpattern" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" @@ -1091,27 +1165,27 @@ msgid "" "your computer is \"internal\").

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

        Pro nainstalování bookmarkletů, přetáhněte odkaz na Vaše " +"

        Pro nainstalování bookmarkletů, přetáhněte odkaz na vaše " "záložky (oblíbené),\n" -"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k Vašim záložkám " +"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k vašim záložkám " "(oblíbeným). Nyní můžete\n" "zvolit bookmarklet z libovolné stránky. Poznámka: Některé tyto\n" "bookmarklety vyžadují, abyste prohlížel(a) stránky z počítače, který je " "nastaven jako\n" -"\"\"interní\" (promluvte si s Vaším administrátorem, jestli si nejste " +"\"\"interní\" (promluvte si s vaším administrátorem, jestli si nejste " "jisti,\n" -"zda je Váš počítač \"interní\").

        \n" +"zda je váš počítač \"interní\").

        \n" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:18 msgid "Documentation for this page" -msgstr "Dokumentace pro tuto stránku" +msgstr "Dokumentace k této stránce" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:19 msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." msgstr "" -"Z libovolné stránky otevře dokumentaci pro pohled, který vygeneroval tuto " +"Z libovolné stránky otevře dokumentaci pohledu (view), který generoval tuto " "stránku." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:21 @@ -1123,8 +1197,7 @@ msgid "" "Shows the content-type and unique ID for pages that represent a single " "object." msgstr "" -"Ukáže content-type a unikátní ID pro stránky, které reprezentují jeden " -"objekt." +"Ukáže content-type a unikátní ID stránek, reprezentujících jediný objekt." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:24 msgid "Edit this object (current window)" @@ -1132,19 +1205,19 @@ msgstr "Upravit tento objekt (ve stávajícím okně)" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:25 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "Přepne do admin stránky pro stránky, které reprezentují jeden objekt." +msgstr "Přepne do prostředí správy pro stránky reprezentující jediný objekt." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:27 msgid "Edit this object (new window)" -msgstr "Upravit tento objekt (ve novém okně)" +msgstr "Upravit tento objekt (v novém okně)" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:28 msgid "As above, but opens the admin page in a new window." -msgstr "Jako výše, ale otevře admin stránky v novém okně." +msgstr "Jako výše, ale otevře prostředí správy v novém okně." #: contrib/auth/admin.py:21 msgid "Personal info" -msgstr "Osobní informace" +msgstr "Osobní údaje" #: contrib/auth/admin.py:22 msgid "Permissions" @@ -1158,31 +1231,31 @@ msgstr "Důležitá data" msgid "Groups" msgstr "Skupiny" -#: contrib/auth/admin.py:64 +#: contrib/auth/admin.py:80 msgid "Add user" msgstr "Uživatel: přidat" -#: contrib/auth/admin.py:90 +#: contrib/auth/admin.py:106 msgid "Password changed successfully." -msgstr "Změna hesla byla úspěšná" +msgstr "Změna hesla byla úspěšná." -#: contrib/auth/admin.py:96 +#: contrib/auth/admin.py:112 #, python-format msgid "Change password: %s" msgstr "Heslo pro uživatele %s: změnit" #: contrib/auth/forms.py:15 contrib/auth/forms.py:48 -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." msgstr "" -"Požadováno. 30 znaků nebo méně. Pouze alfanumerické znaky (znaky, čísla a " -"podtržítka)." +"Požadováno. 30 znaků nebo méně. Pouze alfanumerické znaky (písmena, číslice " +"nebo podtržítka)." #: contrib/auth/forms.py:16 contrib/auth/forms.py:49 msgid "This value must contain only letters, numbers and underscores." -msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka." +msgstr "Tato hodnota musí obsahovat pouze písmena, číslice nebo podtržítka." #: contrib/auth/forms.py:18 msgid "Password confirmation" @@ -1192,22 +1265,22 @@ msgstr "Potvrzení hesla" msgid "A user with that username already exists." msgstr "Uživatel s tímto jménem již existuje." -#: contrib/auth/forms.py:36 contrib/auth/forms.py:154 -#: contrib/auth/forms.py:196 +#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:197 msgid "The two password fields didn't match." msgstr "Hesla se neshodují." #: contrib/auth/forms.py:82 msgid "This account is inactive." -msgstr "Tento účet není aktivní." +msgstr "Tento účet je neaktivní." #: contrib/auth/forms.py:87 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -"Váš prohlížeč pravděpodobně nemá zapnuté cookies. Cookies jsou potřeba pro " -"přihlášení." +"Váš prohlížeč zřejmě nemá povoleno přijímat cookies, které jsou ale potřeba " +"pro přihlášení." #: contrib/auth/forms.py:100 msgid "E-mail" @@ -1218,150 +1291,151 @@ msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -"K této e-mailové adrese není přiřazen žádný uživatelský účet. Jste si jist" -"(a), že jste se zaregistroval(a)?" +"K této e-mailové adrese není přiřazen žádný uživatelský účet. Určitě jste " +"zde registrováni?" -#: contrib/auth/forms.py:134 +#: contrib/auth/forms.py:135 #, python-format msgid "Password reset on %s" -msgstr "Obnovení hesla na %s" +msgstr "Obnovení hesla na webu %s" -#: contrib/auth/forms.py:142 +#: contrib/auth/forms.py:143 msgid "New password" msgstr "Nové heslo" -#: contrib/auth/forms.py:143 +#: contrib/auth/forms.py:144 msgid "New password confirmation" msgstr "Potvrzení nového hesla" -#: contrib/auth/forms.py:168 +#: contrib/auth/forms.py:169 msgid "Old password" msgstr "Staré heslo" -#: contrib/auth/forms.py:176 +#: contrib/auth/forms.py:177 msgid "Your old password was entered incorrectly. Please enter it again." -msgstr "Vaše staré heslo nebylo vloženo správně. Prosíme, zkuste to znovu." +msgstr "Vaše staré heslo nebylo vloženo správně. Zkuste to znovu." -#: contrib/auth/models.py:72 contrib/auth/models.py:95 +#: contrib/auth/models.py:63 contrib/auth/models.py:86 msgid "name" -msgstr "jméno" +msgstr "název" -#: contrib/auth/models.py:74 +#: contrib/auth/models.py:65 msgid "codename" -msgstr "codename" +msgstr "kódový název" -#: contrib/auth/models.py:77 +#: contrib/auth/models.py:68 msgid "permission" msgstr "oprávnění" -#: contrib/auth/models.py:78 contrib/auth/models.py:96 +#: contrib/auth/models.py:69 contrib/auth/models.py:87 msgid "permissions" msgstr "oprávnění" -#: contrib/auth/models.py:99 +#: contrib/auth/models.py:90 msgid "group" msgstr "skupina" -#: contrib/auth/models.py:100 contrib/auth/models.py:146 +#: contrib/auth/models.py:91 contrib/auth/models.py:138 msgid "groups" msgstr "skupiny" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "username" msgstr "uživatelské jméno" -#: contrib/auth/models.py:137 +#: contrib/auth/models.py:129 msgid "first name" msgstr "křestní jméno" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:130 msgid "last name" msgstr "příjmení" -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:131 msgid "e-mail address" msgstr "e-mailová adresa" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "password" msgstr "heslo" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." msgstr "" -"Použijte formát \"[algo]$[salt]$[hexdigest]\" nebo formulář pro změnu hesla." -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "staff status" -msgstr "administrativní přístup " +msgstr "administrativní přístup" -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "Designates whether the user can log into this admin site." -msgstr "Rozhodne, zda se uživatel může přihlásit do správy webu." +msgstr "Určuje, zda se uživatel může přihlásit do správy tohoto webu." -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "active" msgstr "aktivní" -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -"Rozhodne, zda může být uživatel považován za aktivního. Nastavte toto místo " +"Určuje, zda bude uživatel považován za aktivního. Toto vypínejte místo " "mazání účtů." -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "superuser status" -msgstr "stav superuživatel" +msgstr "superuživatel" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -"Stanoví, že uživatel má veškerá oprávnění bez jejich explicitního přiřazení." +"Určuje, že uživatel má veškerá oprávnění bez jejich explicitního přiřazení." -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:136 msgid "last login" msgstr "poslední přihlášení" -#: contrib/auth/models.py:145 +#: contrib/auth/models.py:137 msgid "date joined" msgstr "datum registrace" -#: contrib/auth/models.py:147 +#: contrib/auth/models.py:139 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -"Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro " -"každou skupinu, ve které je." +"Kromě manuálně přidělených oprávnění bude uživatel mít všechna oprávnění pro " +"každou skupinu, jejímž je členem." -#: contrib/auth/models.py:148 +#: contrib/auth/models.py:140 msgid "user permissions" msgstr "uživatelská oprávnění" -#: contrib/auth/models.py:152 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "uživatel" -#: contrib/auth/models.py:153 +#: contrib/auth/models.py:145 msgid "users" msgstr "uživatelé" -#: contrib/auth/models.py:308 +#: contrib/auth/models.py:301 msgid "message" msgstr "zpráva" -#: contrib/auth/views.py:50 +#: contrib/auth/views.py:56 msgid "Logged out" msgstr "Odhlášeno" -#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428 +#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 msgid "Enter a valid e-mail address." msgstr "Vložte platnou e-mailovou adresu." @@ -1373,93 +1447,113 @@ msgstr "Obsah" msgid "Metadata" msgstr "Metadata" -#: contrib/comments/forms.py:19 +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "Komentáře z webu %(site_name)s" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Poslední komentáře na webu %(site_name)s" + +#: contrib/comments/forms.py:93 +#: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" msgstr "Jméno" -#: contrib/comments/forms.py:20 +#: contrib/comments/forms.py:94 msgid "Email address" msgstr "E-mailová adresa" -#: contrib/comments/forms.py:22 +#: contrib/comments/forms.py:96 +#: contrib/comments/templates/comments/moderation_queue.html:35 msgid "Comment" msgstr "Komentář" -#: contrib/comments/forms.py:25 -msgid "" -"If you enter anything in this field your comment will be treated as spam" -msgstr "" -"Jestliže do tohoto pole něco vyplníte, Váš komentář bude považován za spam" - -#: contrib/comments/forms.py:125 +#: contrib/comments/forms.py:173 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." -msgstr[0] "Mluvte slušně! Slovo %s zde není přípustné." -msgstr[1] "Mluvte slušně! Slova %s zde nejsou přípustná." -msgstr[2] "Mluvte slušně! Slova %s zde nejsou přípustná." +msgstr[0] "Mluvte slušně! Slovo %s je zde nepřípustné." +msgstr[1] "Mluvte slušně! Slova %s jsou zde nepřípustná." +msgstr[2] "Mluvte slušně! Slova %s jsou zde nepřípustná." -#: contrib/comments/models.py:23 +#: contrib/comments/forms.py:180 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "Jestliže do tohoto pole cokoli zadáte, bude komentář považován za spam" + +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "typ obsahu" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "ID objektu" -#: contrib/comments/models.py:50 +#: contrib/comments/models.py:52 msgid "user's name" msgstr "jméno uživatele" -#: contrib/comments/models.py:51 +#: contrib/comments/models.py:53 msgid "user's email address" msgstr "e-mailová adresa uživatele" -#: contrib/comments/models.py:52 +#: contrib/comments/models.py:54 msgid "user's URL" msgstr "URL uživatele" -#: contrib/comments/models.py:54 +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "komentář" -#: contrib/comments/models.py:57 -msgid "date/time submitted" -msgstr "datum/čas byl zaslán" - #: contrib/comments/models.py:59 -msgid "is public" -msgstr "je veřejné" +msgid "date/time submitted" +msgstr "datum a čas byly zaslané" -#: contrib/comments/models.py:60 +#: contrib/comments/models.py:61 +msgid "is public" +msgstr "je veřejný" + +#: contrib/comments/models.py:62 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "" -"Pokud zrušíte zaškrtnutí tohoto boxu, komentář se na stránce nezobrazí." +"Pokud zrušíte zaškrtnutí tohoto políčka, komentář se na stránce nezobrazí." -#: contrib/comments/models.py:62 +#: contrib/comments/models.py:64 msgid "is removed" -msgstr "je odstraněno" +msgstr "je odebrán" -#: contrib/comments/models.py:63 +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." msgstr "" -"Zaškrtněte tento box, pokud komentář není vhodný. Místo něj bude zobrazena " -"zpráva \"Tento komentář byl smazán\"." +"Zaškrtněte, pokud je komentář nevhodný. Místo něj bude zobrazena zpráva " +"\"Tento komentář byl odebrán\"." -#: contrib/comments/models.py:115 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "komentář" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." msgstr "" -"Tento komentář zaslal přihlášený uživatel, a tak jméno není možné změnit." +"Tento komentář zaslal přihlášený uživatel, jméno tedy není možné změnit." -#: contrib/comments/models.py:124 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." msgstr "" -"Tento komentář zaslal přihlášený uživatel, a tak e-mail není možné změnit." +"Tento komentář zaslal přihlášený uživatel, e-mail tedy není možné změnit." -#: contrib/comments/models.py:149 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1468,21 +1562,162 @@ msgid "" "\n" "http://%(domain)s%(url)s" msgstr "" -"Zadané %(user)s dne %(date)s\n" +"Zadal uživatel %(user)s dne %(date)s\n" "\n" "%(comment)s\n" "\n" "http://%(domain)s%(url)s" -#: contrib/contenttypes/models.py:67 +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "značka" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "datum" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "značka komentáře" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "značka komentáře" + +#: contrib/comments/templates/comments/approve.html:4 +msgid "Approve a comment" +msgstr "Schválit komentář" + +#: contrib/comments/templates/comments/approve.html:7 +msgid "Really make this comment public?" +msgstr "Opravdu chcete zveřejnit tento komentář?" + +#: contrib/comments/templates/comments/approve.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:49 +msgid "Approve" +msgstr "Schválit" + +#: contrib/comments/templates/comments/approved.html:4 +msgid "Thanks for approving" +msgstr "Děkujeme za schválení" + +#: contrib/comments/templates/comments/approved.html:7 +#: contrib/comments/templates/comments/deleted.html:7 +#: contrib/comments/templates/comments/flagged.html:7 +msgid "" +"Thanks for taking the time to improve the quality of discussion on our site" +msgstr "" +"Děkujeme za váš čas věnovaný zlepšení kvality diskuze na našich stránkách" + +#: contrib/comments/templates/comments/delete.html:4 +msgid "Remove a comment" +msgstr "Odebrat komentář" + +#: contrib/comments/templates/comments/delete.html:7 +msgid "Really remove this comment?" +msgstr "Opravdu chcete odebrat tento komentář?" + +#: contrib/comments/templates/comments/delete.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:53 +msgid "Remove" +msgstr "Odebrat" + +#: contrib/comments/templates/comments/deleted.html:4 +msgid "Thanks for removing" +msgstr "Děkujeme za odebrání" + +#: contrib/comments/templates/comments/flag.html:4 +msgid "Flag this comment" +msgstr "Označit tento komentář" + +#: contrib/comments/templates/comments/flag.html:7 +msgid "Really flag this comment?" +msgstr "Opravdu chcete označit tento komentář?" + +#: contrib/comments/templates/comments/flag.html:12 +msgid "Flag" +msgstr "Označit" + +#: contrib/comments/templates/comments/flagged.html:4 +msgid "Thanks for flagging" +msgstr "Děkujeme za označení komentáře" + +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 +msgid "Post" +msgstr "Odeslat" + +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 +msgid "Preview" +msgstr "Náhled" + +#: contrib/comments/templates/comments/moderation_queue.html:4 +#: contrib/comments/templates/comments/moderation_queue.html:19 +msgid "Comment moderation queue" +msgstr "Fronta komentářů ke schválení" + +#: contrib/comments/templates/comments/moderation_queue.html:26 +msgid "No comments to moderate" +msgstr "Žádné komentáře ke schválení" + +#: contrib/comments/templates/comments/moderation_queue.html:36 +msgid "Email" +msgstr "E-mail" + +#: contrib/comments/templates/comments/moderation_queue.html:38 +msgid "Authenticated?" +msgstr "Přihlášený?" + +#: contrib/comments/templates/comments/moderation_queue.html:39 +msgid "IP Address" +msgstr "Adresa IP" + +#: contrib/comments/templates/comments/moderation_queue.html:40 +msgid "Date posted" +msgstr "Datum vložení" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "yes" +msgstr "ano" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "no" +msgstr "ne" + +#: contrib/comments/templates/comments/posted.html:4 +msgid "Thanks for commenting" +msgstr "Děkujeme za vložení komentáře" + +#: contrib/comments/templates/comments/posted.html:7 +msgid "Thank you for your comment" +msgstr "Děkujeme za komentář" + +#: contrib/comments/templates/comments/preview.html:4 +#: contrib/comments/templates/comments/preview.html:13 +msgid "Preview your comment" +msgstr "Zobrazit náhled komentáře" + +#: contrib/comments/templates/comments/preview.html:11 +msgid "Please correct the error below" +msgid_plural "Please correct the errors below" +msgstr[0] "Opravte níže uvedenou chybu." +msgstr[1] "Opravte níže uvedené chyby." +msgstr[2] "Opravte níže uvedené chyby." + +#: contrib/comments/templates/comments/preview.html:16 +msgid "Post your comment" +msgstr "Komentář odeslat" + +#: contrib/comments/templates/comments/preview.html:16 +msgid "or make changes" +msgstr "nebo upravit" + +#: contrib/contenttypes/models.py:70 msgid "python model class name" -msgstr "jméno modelu v Pythonu" +msgstr "název třídy modelu v Pythonu" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "typ obsahu" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "typy obsahu" @@ -1497,7 +1732,7 @@ msgid "" "This value must contain only letters, numbers, underscores, dashes or " "slashes." msgstr "" -"Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka, pomlčky nebo " +"Tato hodnota musí obsahovat pouze písmena, číslice, podtržítka, pomlčky nebo " "lomítka." #: contrib/flatpages/admin.py:22 @@ -1518,15 +1753,15 @@ msgstr "povolit komentáře" #: contrib/flatpages/models.py:11 msgid "template name" -msgstr "jméno šablony" +msgstr "název šablony" #: contrib/flatpages/models.py:12 msgid "" "Example: 'flatpages/contact_page.html'. If this isn't provided, the system " "will use 'flatpages/default.html'." msgstr "" -"Příklad: \"flatpages/kontaktni_stranka.html\". Pokud toto není zadáno, " -"systém použije \"flatpages/default.html\"." +"Příklad: \"flatpages/kontaktni_stranka.html\". Pokud toto není zadáno, bude " +"použita šablona \"flatpages/default.html\"." #: contrib/flatpages/models.py:13 msgid "registration required" @@ -1534,9 +1769,7 @@ msgstr "nutná registrace" #: contrib/flatpages/models.py:13 msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Pokud je zaškrtnuto, pouze přihlášení uživatelé budou moci prohlížet tuto " -"stránku." +msgstr "Určuje, že tuto stránku uvidí pouze přihlášení uživatelé." #: contrib/flatpages/models.py:18 msgid "flat page" @@ -1551,1942 +1784,2034 @@ msgid "" "We apologize, but your form has expired. Please continue filling out the " "form from this page." msgstr "" -"Omlouváme se, ale platnost formuláře vypršela. Prosíme, pokračujte vyplněním " -"formuláře z této stránky." +"Platnost formuláře bohužel vypršela. Pokračujte vyplněním formuláře z této " +"stránky." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." -msgstr "Hodnota geometrie nedodána." +msgstr "Hodnota geometrie nezadána." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Neplatná hodnota geometrie." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Neplatný typ geometrie." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"Nastala chyba při transformaci geometrie na identifikátor SRID geometrického " +"formulářového pole." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" -msgstr "" +msgstr "." #: contrib/humanize/templatetags/humanize.py:19 msgid "st" -msgstr "" +msgstr "." #: contrib/humanize/templatetags/humanize.py:19 msgid "nd" -msgstr "" +msgstr "." #: contrib/humanize/templatetags/humanize.py:19 msgid "rd" -msgstr "" +msgstr "." #: contrib/humanize/templatetags/humanize.py:51 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(value).1f milion" +msgstr[1] "%(value).1f miliony" +msgstr[2] "%(value).1f milionů" #: contrib/humanize/templatetags/humanize.py:54 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(value).1f miliarda" +msgstr[1] "%(value).1f miliardy" +msgstr[2] "%(value).1f miliard" #: contrib/humanize/templatetags/humanize.py:57 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(value).1f bilion" +msgstr[1] "%(value).1f biliony" +msgstr[2] "%(value).1f bilionů" #: contrib/humanize/templatetags/humanize.py:73 msgid "one" -msgstr "" +msgstr "jedna" #: contrib/humanize/templatetags/humanize.py:73 msgid "two" -msgstr "" +msgstr "dvě" #: contrib/humanize/templatetags/humanize.py:73 msgid "three" -msgstr "" +msgstr "tři" #: contrib/humanize/templatetags/humanize.py:73 msgid "four" -msgstr "" +msgstr "čtyři" #: contrib/humanize/templatetags/humanize.py:73 msgid "five" -msgstr "" +msgstr "pět" #: contrib/humanize/templatetags/humanize.py:73 msgid "six" -msgstr "" +msgstr "šest" #: contrib/humanize/templatetags/humanize.py:73 msgid "seven" -msgstr "" +msgstr "sedm" #: contrib/humanize/templatetags/humanize.py:73 msgid "eight" -msgstr "" +msgstr "osm" #: contrib/humanize/templatetags/humanize.py:73 msgid "nine" -msgstr "" +msgstr "devět" #: contrib/humanize/templatetags/humanize.py:93 msgid "today" -msgstr "" +msgstr "dnes" #: contrib/humanize/templatetags/humanize.py:95 msgid "tomorrow" -msgstr "" +msgstr "zítra" #: contrib/humanize/templatetags/humanize.py:97 msgid "yesterday" -msgstr "" +msgstr "včera" #: contrib/localflavor/ar/forms.py:27 msgid "Enter a postal code in the format NNNN or ANNNNAAA." -msgstr "" +msgstr "Zadejte poštovní směrovací číslo ve formátu NNNN nebo ANNNNAAA." #: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96 #: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 #: contrib/localflavor/pe/forms.py:51 msgid "This field requires only numbers." -msgstr "" +msgstr "Toto pole musí obsahovat pouze číslice." #: contrib/localflavor/ar/forms.py:50 msgid "This field requires 7 or 8 digits." -msgstr "" +msgstr "Toto pole musí obsahovat 7 nebo 8 číslic." #: contrib/localflavor/ar/forms.py:79 msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." msgstr "" +"Zadejte platné identifikační číslo CUIT ve formátu XX-XXXXXXXX-X nebo " +"XXXXXXXXXXXX" #: contrib/localflavor/ar/forms.py:80 msgid "Invalid CUIT." -msgstr "" +msgstr "Neplatné CUIT" #: contrib/localflavor/at/at_states.py:5 msgid "Burgenland" -msgstr "" +msgstr "Hradsko" #: contrib/localflavor/at/at_states.py:6 msgid "Carinthia" -msgstr "" +msgstr "Korutany" #: contrib/localflavor/at/at_states.py:7 msgid "Lower Austria" -msgstr "" +msgstr "Dolní Rakousko" #: contrib/localflavor/at/at_states.py:8 msgid "Upper Austria" -msgstr "" +msgstr "Horní Rakousko" #: contrib/localflavor/at/at_states.py:9 msgid "Salzburg" -msgstr "" +msgstr "Salcbursko" #: contrib/localflavor/at/at_states.py:10 msgid "Styria" -msgstr "" +msgstr "Štýrsko" #: contrib/localflavor/at/at_states.py:11 msgid "Tyrol" -msgstr "" +msgstr "Tyrolsko" #: contrib/localflavor/at/at_states.py:12 msgid "Vorarlberg" -msgstr "" +msgstr "Vorarlbersko" #: contrib/localflavor/at/at_states.py:13 msgid "Vienna" -msgstr "" +msgstr "Vídeň" #: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16 #: contrib/localflavor/no/forms.py:12 msgid "Enter a zip code in the format XXXX." -msgstr "" +msgstr "Zadejte poštovní směrovací číslo ve formátu XXXX." #: contrib/localflavor/at/forms.py:48 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format." -msgstr "" +msgstr "Zadejte platné rodné číslo (ASSN) ve formátu XXXX XXXXXX." #: contrib/localflavor/au/forms.py:16 msgid "Enter a 4 digit post code." -msgstr "" +msgstr "Zadejte čtyřmístné poštovní směrovací číslo." #: contrib/localflavor/br/forms.py:21 msgid "Enter a zip code in the format XXXXX-XXX." -msgstr "" +msgstr "Zadejte poštovní směrovací číslo ve formátu XXXXXX-XXX." #: contrib/localflavor/br/forms.py:30 msgid "Phone numbers must be in XX-XXXX-XXXX format." -msgstr "" +msgstr "Telefonní číslo musí být ve formátu XX-XXXX-XXXX." #: contrib/localflavor/br/forms.py:58 msgid "" "Select a valid brazilian state. That state is not one of the available " "states." -msgstr "" +msgstr "Neplatný brazilský stát. Vyberte jeden z nabízených států." #: contrib/localflavor/br/forms.py:94 msgid "Invalid CPF number." -msgstr "" +msgstr "Neplatné číslo CPF." #: contrib/localflavor/br/forms.py:95 msgid "This field requires at most 11 digits or 14 characters." -msgstr "" +msgstr "Toto pole musí obsahovat nejvýše 11 číslic nebo 14 znaků." #: contrib/localflavor/br/forms.py:134 msgid "Invalid CNPJ number." -msgstr "" +msgstr "Neplatné číslo CNPJ." #: contrib/localflavor/br/forms.py:136 msgid "This field requires at least 14 digits" -msgstr "" +msgstr "Toto pole musí obsahovat nejméně 14 číslic." #: contrib/localflavor/ca/forms.py:17 msgid "Enter a postal code in the format XXX XXX." -msgstr "" +msgstr "Zadejte poštovní směrovací číslo ve formátu XXX XXX." #: contrib/localflavor/ca/forms.py:88 msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." msgstr "" +"Zadejte platné kanadské číslo soc. pojištění (SID) ve formátu XXX-XXX-XXX." #: contrib/localflavor/ch/ch_states.py:5 msgid "Aargau" -msgstr "" +msgstr "Aargau" #: contrib/localflavor/ch/ch_states.py:6 msgid "Appenzell Innerrhoden" -msgstr "" +msgstr "Appenzell Innerrhoden" #: contrib/localflavor/ch/ch_states.py:7 msgid "Appenzell Ausserrhoden" -msgstr "" +msgstr "Appenzell Ausserrhoden" #: contrib/localflavor/ch/ch_states.py:8 msgid "Basel-Stadt" -msgstr "" +msgstr "Basilej-město" #: contrib/localflavor/ch/ch_states.py:9 msgid "Basel-Land" -msgstr "" +msgstr "Basilej-venkov" #: contrib/localflavor/ch/ch_states.py:10 msgid "Berne" -msgstr "" +msgstr "Bern" #: contrib/localflavor/ch/ch_states.py:11 msgid "Fribourg" -msgstr "" +msgstr "Fribourg" #: contrib/localflavor/ch/ch_states.py:12 msgid "Geneva" -msgstr "" +msgstr "Ženeva" #: contrib/localflavor/ch/ch_states.py:13 msgid "Glarus" -msgstr "" +msgstr "Glarus" #: contrib/localflavor/ch/ch_states.py:14 msgid "Graubuenden" -msgstr "" +msgstr "Graubünden" #: contrib/localflavor/ch/ch_states.py:15 msgid "Jura" -msgstr "" +msgstr "Jura" #: contrib/localflavor/ch/ch_states.py:16 msgid "Lucerne" -msgstr "" +msgstr "Lucern" #: contrib/localflavor/ch/ch_states.py:17 msgid "Neuchatel" -msgstr "" +msgstr "Neuchâtel" #: contrib/localflavor/ch/ch_states.py:18 msgid "Nidwalden" -msgstr "" +msgstr "Nidwalden" #: contrib/localflavor/ch/ch_states.py:19 msgid "Obwalden" -msgstr "" +msgstr "Obwalden" #: contrib/localflavor/ch/ch_states.py:20 msgid "Schaffhausen" -msgstr "" +msgstr "Schaffhausen" #: contrib/localflavor/ch/ch_states.py:21 msgid "Schwyz" -msgstr "" +msgstr "Schwyz" #: contrib/localflavor/ch/ch_states.py:22 msgid "Solothurn" -msgstr "" +msgstr "Solothurn" #: contrib/localflavor/ch/ch_states.py:23 msgid "St. Gallen" -msgstr "" +msgstr "St. Gallen" #: contrib/localflavor/ch/ch_states.py:24 msgid "Thurgau" -msgstr "" +msgstr "Thurgau" #: contrib/localflavor/ch/ch_states.py:25 msgid "Ticino" -msgstr "" +msgstr "Ticino" #: contrib/localflavor/ch/ch_states.py:26 msgid "Uri" -msgstr "" +msgstr "Uri" #: contrib/localflavor/ch/ch_states.py:27 msgid "Valais" -msgstr "" +msgstr "Valais" #: contrib/localflavor/ch/ch_states.py:28 msgid "Vaud" -msgstr "" +msgstr "Vaud" #: contrib/localflavor/ch/ch_states.py:29 msgid "Zug" -msgstr "" +msgstr "Zug" #: contrib/localflavor/ch/ch_states.py:30 msgid "Zurich" -msgstr "" +msgstr "Curych" #: contrib/localflavor/ch/forms.py:64 msgid "" "Enter a valid Swiss identity or passport card number in X1234567<0 or " "1234567890 format." msgstr "" +"Zadejte platné švýcarské identifikační číslo nebo číslo cestovního pasu ve " +"formátu X1234567<0 nebo 1234567890." #: contrib/localflavor/cl/forms.py:29 msgid "Enter a valid Chilean RUT." -msgstr "" +msgstr "Zadejte platné chilské RUT." #: contrib/localflavor/cl/forms.py:30 msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X." -msgstr "" +msgstr "Zadejte platné chilské RUT ve formátu XX.XXX.XXX-X." #: contrib/localflavor/cl/forms.py:31 msgid "The Chilean RUT is not valid." -msgstr "" +msgstr "Neplatné RUT." + +#: contrib/localflavor/cz/cz_regions.py:8 +msgid "Prague" +msgstr "Praha" + +#: contrib/localflavor/cz/cz_regions.py:9 +msgid "Central Bohemian Region" +msgstr "Středočeský kraj" + +#: contrib/localflavor/cz/cz_regions.py:10 +msgid "South Bohemian Region" +msgstr "Jihočeský kraj" + +#: contrib/localflavor/cz/cz_regions.py:11 +msgid "Pilsen Region" +msgstr "Plzeňský kraj" + +#: contrib/localflavor/cz/cz_regions.py:12 +msgid "Carlsbad Region" +msgstr "Karlovarský kraj" + +#: contrib/localflavor/cz/cz_regions.py:13 +msgid "Usti Region" +msgstr "Ústecký kraj" + +#: contrib/localflavor/cz/cz_regions.py:14 +msgid "Liberec Region" +msgstr "Liberecký kraj" + +#: contrib/localflavor/cz/cz_regions.py:15 +msgid "Hradec Region" +msgstr "Královéhradecký kraj" + +#: contrib/localflavor/cz/cz_regions.py:16 +msgid "Pardubice Region" +msgstr "Pardubický kraj" + +#: contrib/localflavor/cz/cz_regions.py:17 +msgid "Vysocina Region" +msgstr "Vysočina" + +#: contrib/localflavor/cz/cz_regions.py:18 +msgid "South Moravian Region" +msgstr "Jihomoravský kraj" + +#: contrib/localflavor/cz/cz_regions.py:19 +msgid "Olomouc Region" +msgstr "Olomoucký kraj" + +#: contrib/localflavor/cz/cz_regions.py:20 +msgid "Zlin Region" +msgstr "Zlínský kraj" + +#: contrib/localflavor/cz/cz_regions.py:21 +msgid "Moravian-Silesian Region" +msgstr "Moravskoslezský kraj" + +#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "Zadejte poštovní směrovací číslo ve formátu XXXXX nebo XXX XX." + +#: contrib/localflavor/cz/forms.py:47 +msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." +msgstr "Zadejte rodné číslo ve formátu XXXXXX/XXXX nebo XXXXXXXXXX." + +#: contrib/localflavor/cz/forms.py:48 +msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" +msgstr "Neplatný nepovinný parametr Gender, platné hodnoty jsou 'f' a 'm'." + +#: contrib/localflavor/cz/forms.py:49 +msgid "Enter a valid birth number." +msgstr "Zadejte platné rodné číslo." + +#: contrib/localflavor/cz/forms.py:106 +msgid "Enter a valid IC number." +msgstr "Zadejte platné IČ." #: contrib/localflavor/de/de_states.py:5 msgid "Baden-Wuerttemberg" -msgstr "" +msgstr "Bádensko-Württembersko" #: contrib/localflavor/de/de_states.py:6 msgid "Bavaria" -msgstr "" +msgstr "Bavorsko" #: contrib/localflavor/de/de_states.py:7 msgid "Berlin" -msgstr "" +msgstr "Berlín" #: contrib/localflavor/de/de_states.py:8 msgid "Brandenburg" -msgstr "" +msgstr "Braniborsko" #: contrib/localflavor/de/de_states.py:9 msgid "Bremen" -msgstr "" +msgstr "Brémy" #: contrib/localflavor/de/de_states.py:10 msgid "Hamburg" -msgstr "" +msgstr "Hamburk" #: contrib/localflavor/de/de_states.py:11 msgid "Hessen" -msgstr "" +msgstr "Hesensko" #: contrib/localflavor/de/de_states.py:12 msgid "Mecklenburg-Western Pomerania" -msgstr "" +msgstr "Meklenbursko-Přední Pomořansko" #: contrib/localflavor/de/de_states.py:13 msgid "Lower Saxony" -msgstr "" +msgstr "Dolní Sasko" #: contrib/localflavor/de/de_states.py:14 msgid "North Rhine-Westphalia" -msgstr "" +msgstr "Severní Porýní-Vestfálsko" #: contrib/localflavor/de/de_states.py:15 msgid "Rhineland-Palatinate" -msgstr "" +msgstr "Porýní-Falc" #: contrib/localflavor/de/de_states.py:16 msgid "Saarland" -msgstr "" +msgstr "Sársko" #: contrib/localflavor/de/de_states.py:17 msgid "Saxony" -msgstr "" +msgstr "Sasko" #: contrib/localflavor/de/de_states.py:18 msgid "Saxony-Anhalt" -msgstr "" +msgstr "Sasko-Anhaltsko" #: contrib/localflavor/de/de_states.py:19 msgid "Schleswig-Holstein" -msgstr "" +msgstr "Šlesvicko-Holštýnsko" #: contrib/localflavor/de/de_states.py:20 msgid "Thuringia" -msgstr "" +msgstr "Durynsko" #: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 #: contrib/localflavor/fr/forms.py:15 msgid "Enter a zip code in the format XXXXX." -msgstr "" +msgstr "Zadejte poštovní směrovací číslo ve formátu XXXXX." #: contrib/localflavor/de/forms.py:41 msgid "" "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " "format." msgstr "" +"Zadejte platné německé identifikační číslo ve formátu XXXXXXXXXXX-XXXXXXX-" +"XXXXXXX-X." #: contrib/localflavor/es/es_provinces.py:5 msgid "Arava" -msgstr "" +msgstr "Araba" #: contrib/localflavor/es/es_provinces.py:6 msgid "Albacete" -msgstr "" +msgstr "Albacete" #: contrib/localflavor/es/es_provinces.py:7 msgid "Alacant" -msgstr "" +msgstr "Alacant" #: contrib/localflavor/es/es_provinces.py:8 msgid "Almeria" -msgstr "" +msgstr "Almería" #: contrib/localflavor/es/es_provinces.py:9 msgid "Avila" -msgstr "" +msgstr "Ávila" #: contrib/localflavor/es/es_provinces.py:10 msgid "Badajoz" -msgstr "" +msgstr "Badajoz" #: contrib/localflavor/es/es_provinces.py:11 msgid "Illes Balears" -msgstr "" +msgstr "Baleáry" #: contrib/localflavor/es/es_provinces.py:12 msgid "Barcelona" -msgstr "" +msgstr "Barcelona" #: contrib/localflavor/es/es_provinces.py:13 msgid "Burgos" -msgstr "" +msgstr "Burgos" #: contrib/localflavor/es/es_provinces.py:14 msgid "Caceres" -msgstr "" +msgstr "Caceres" #: contrib/localflavor/es/es_provinces.py:15 msgid "Cadiz" -msgstr "" +msgstr "Cádiz" #: contrib/localflavor/es/es_provinces.py:16 msgid "Castello" -msgstr "" +msgstr "Castellón" #: contrib/localflavor/es/es_provinces.py:17 msgid "Ciudad Real" -msgstr "" +msgstr "Ciudad Real" #: contrib/localflavor/es/es_provinces.py:18 msgid "Cordoba" -msgstr "" +msgstr "Córdoba" #: contrib/localflavor/es/es_provinces.py:19 msgid "A Coruna" -msgstr "" +msgstr "A Coruña" #: contrib/localflavor/es/es_provinces.py:20 msgid "Cuenca" -msgstr "" +msgstr "Cuenca" #: contrib/localflavor/es/es_provinces.py:21 msgid "Girona" -msgstr "" +msgstr "Girona" #: contrib/localflavor/es/es_provinces.py:22 msgid "Granada" -msgstr "" +msgstr "Granada" #: contrib/localflavor/es/es_provinces.py:23 msgid "Guadalajara" -msgstr "" +msgstr "Guadalajara" #: contrib/localflavor/es/es_provinces.py:24 msgid "Guipuzkoa" -msgstr "" +msgstr "Guipúzcoa" #: contrib/localflavor/es/es_provinces.py:25 msgid "Huelva" -msgstr "" +msgstr "Huelva" #: contrib/localflavor/es/es_provinces.py:26 msgid "Huesca" -msgstr "" +msgstr "Huesca" #: contrib/localflavor/es/es_provinces.py:27 msgid "Jaen" -msgstr "" +msgstr "Jaén" #: contrib/localflavor/es/es_provinces.py:28 msgid "Leon" -msgstr "" +msgstr "León" #: contrib/localflavor/es/es_provinces.py:29 msgid "Lleida" -msgstr "" +msgstr "Lérida" #: contrib/localflavor/es/es_provinces.py:30 #: contrib/localflavor/es/es_regions.py:17 msgid "La Rioja" -msgstr "" +msgstr "La Rioja" #: contrib/localflavor/es/es_provinces.py:31 msgid "Lugo" -msgstr "" +msgstr "Lugo" #: contrib/localflavor/es/es_provinces.py:32 #: contrib/localflavor/es/es_regions.py:18 msgid "Madrid" -msgstr "" +msgstr "Madrid" #: contrib/localflavor/es/es_provinces.py:33 msgid "Malaga" -msgstr "" +msgstr "Málaga" #: contrib/localflavor/es/es_provinces.py:34 msgid "Murcia" -msgstr "" +msgstr "Murcie" #: contrib/localflavor/es/es_provinces.py:35 msgid "Navarre" -msgstr "" +msgstr "Navarra" #: contrib/localflavor/es/es_provinces.py:36 msgid "Ourense" -msgstr "" +msgstr "Orense" #: contrib/localflavor/es/es_provinces.py:37 msgid "Asturias" -msgstr "" +msgstr "Asturie" #: contrib/localflavor/es/es_provinces.py:38 msgid "Palencia" -msgstr "" +msgstr "Palencia" #: contrib/localflavor/es/es_provinces.py:39 msgid "Las Palmas" -msgstr "" +msgstr "Las Palmas" #: contrib/localflavor/es/es_provinces.py:40 msgid "Pontevedra" -msgstr "" +msgstr "Pontevedra" #: contrib/localflavor/es/es_provinces.py:41 msgid "Salamanca" -msgstr "" +msgstr "Salamanca" #: contrib/localflavor/es/es_provinces.py:42 msgid "Santa Cruz de Tenerife" -msgstr "" +msgstr "Santa Cruz de Tenerife" #: contrib/localflavor/es/es_provinces.py:43 #: contrib/localflavor/es/es_regions.py:11 msgid "Cantabria" -msgstr "" +msgstr "Kantábrie" #: contrib/localflavor/es/es_provinces.py:44 msgid "Segovia" -msgstr "" +msgstr "Segovia" #: contrib/localflavor/es/es_provinces.py:45 msgid "Seville" -msgstr "" +msgstr "Sevilla" #: contrib/localflavor/es/es_provinces.py:46 msgid "Soria" -msgstr "" +msgstr "Soria" #: contrib/localflavor/es/es_provinces.py:47 msgid "Tarragona" -msgstr "" +msgstr "Tarragona" #: contrib/localflavor/es/es_provinces.py:48 msgid "Teruel" -msgstr "" +msgstr "Teruel" #: contrib/localflavor/es/es_provinces.py:49 msgid "Toledo" -msgstr "" +msgstr "Toledo" #: contrib/localflavor/es/es_provinces.py:50 msgid "Valencia" -msgstr "" +msgstr "Valencie" #: contrib/localflavor/es/es_provinces.py:51 msgid "Valladolid" -msgstr "" +msgstr "Valladolid" #: contrib/localflavor/es/es_provinces.py:52 msgid "Bizkaia" -msgstr "" +msgstr "Biskajsko" #: contrib/localflavor/es/es_provinces.py:53 msgid "Zamora" -msgstr "" +msgstr "Zamora" #: contrib/localflavor/es/es_provinces.py:54 msgid "Zaragoza" -msgstr "" +msgstr "Zaragoza" #: contrib/localflavor/es/es_provinces.py:55 msgid "Ceuta" -msgstr "" +msgstr "Ceuta" #: contrib/localflavor/es/es_provinces.py:56 msgid "Melilla" -msgstr "" +msgstr "Melilla" #: contrib/localflavor/es/es_regions.py:5 msgid "Andalusia" -msgstr "" +msgstr "Andalusie" #: contrib/localflavor/es/es_regions.py:6 msgid "Aragon" -msgstr "" +msgstr "Aragonie" #: contrib/localflavor/es/es_regions.py:7 msgid "Principality of Asturias" -msgstr "" +msgstr "Asturské knížectví" #: contrib/localflavor/es/es_regions.py:8 msgid "Balearic Islands" -msgstr "" +msgstr "Baleáry" #: contrib/localflavor/es/es_regions.py:9 msgid "Basque Country" -msgstr "" +msgstr "Baskicko" #: contrib/localflavor/es/es_regions.py:10 msgid "Canary Islands" -msgstr "" +msgstr "Kanárské ostrovy" #: contrib/localflavor/es/es_regions.py:12 msgid "Castile-La Mancha" -msgstr "" +msgstr "Kastilie-La Mancha" #: contrib/localflavor/es/es_regions.py:13 msgid "Castile and Leon" -msgstr "" +msgstr "Kastilie a León" #: contrib/localflavor/es/es_regions.py:14 msgid "Catalonia" -msgstr "" +msgstr "Katalánsko" #: contrib/localflavor/es/es_regions.py:15 msgid "Extremadura" -msgstr "" +msgstr "Extremadura" #: contrib/localflavor/es/es_regions.py:16 msgid "Galicia" -msgstr "" +msgstr "Galicie" #: contrib/localflavor/es/es_regions.py:19 msgid "Region of Murcia" -msgstr "" +msgstr "Murcie" #: contrib/localflavor/es/es_regions.py:20 msgid "Foral Community of Navarre" -msgstr "" +msgstr "Navarra" #: contrib/localflavor/es/es_regions.py:21 msgid "Valencian Community" -msgstr "" +msgstr "Valencie" #: contrib/localflavor/es/forms.py:19 msgid "Enter a valid postal code in the range and format 01XXX - 52XXX." -msgstr "" +msgstr "Zadejte platné poštovní směrovací číslo ve formátu 01XXX - 52XXX." #: contrib/localflavor/es/forms.py:39 msgid "" "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or " "9XXXXXXXX." msgstr "" +"Zadejte platné telefonní číslo v jednom z formátů: 6XXXXXXXX, 8XXXXXXXX nebo " +"9XXXXXXXX." #: contrib/localflavor/es/forms.py:66 msgid "Please enter a valid NIF, NIE, or CIF." -msgstr "" +msgstr "Zadejte platné hodnoty NIF, NIE nebo CIF." #: contrib/localflavor/es/forms.py:67 msgid "Please enter a valid NIF or NIE." -msgstr "" +msgstr "Zadejte platné hodnoty NIF nebo NIE." #: contrib/localflavor/es/forms.py:68 msgid "Invalid checksum for NIF." -msgstr "" +msgstr "Neplatný kontrolní součet pro NIF." #: contrib/localflavor/es/forms.py:69 msgid "Invalid checksum for NIE." -msgstr "" +msgstr "Neplatný kontrolní součet pro NIE." #: contrib/localflavor/es/forms.py:70 msgid "Invalid checksum for CIF." -msgstr "" +msgstr "Neplatný kontrolní součet pro CIF." #: contrib/localflavor/es/forms.py:142 msgid "" "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." msgstr "" +"Zadejte platné číslo bankovního účtu ve formátu XXXX-XXXX-XX-XXXXXXXXXX." #: contrib/localflavor/es/forms.py:143 msgid "Invalid checksum for bank account number." -msgstr "" +msgstr "Neplatný kontrolní součet pro číslo bankovního účtu." #: contrib/localflavor/fi/forms.py:28 msgid "Enter a valid Finnish social security number." -msgstr "" +msgstr "Zadejte platné finské rodné číslo." #: contrib/localflavor/in_/forms.py:14 msgid "Enter a zip code in the format XXXXXXX." -msgstr "" +msgstr "Zadejte poštovní směrovací číslo ve formátu XXXXXXX." #: contrib/localflavor/is_/forms.py:17 msgid "" "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." -msgstr "" +msgstr "Zadejte platné islandské identifikační číslo ve formátu XXXXXX-XXXX." #: contrib/localflavor/is_/forms.py:18 msgid "The Icelandic identification number is not valid." -msgstr "" +msgstr "Neplatné islandské identifikační číslo." #: contrib/localflavor/it/forms.py:14 msgid "Enter a valid zip code." -msgstr "" +msgstr "Zadejte platné poštovní směrovací číslo." #: contrib/localflavor/it/forms.py:43 msgid "Enter a valid Social Security number." -msgstr "" +msgstr "Zadejte platné číslo SSN." #: contrib/localflavor/it/forms.py:68 msgid "Enter a valid VAT number." -msgstr "" +msgstr "Zadejte platné daňové identifikační číslo." #: contrib/localflavor/jp/forms.py:16 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX." -msgstr "" +msgstr "Zadejte poštovní směrovací číslo ve formátu XXXXXXX nebo XXX-XXXX." #: contrib/localflavor/jp/jp_prefectures.py:4 msgid "Hokkaido" -msgstr "" +msgstr "Hokkaidó" #: contrib/localflavor/jp/jp_prefectures.py:5 msgid "Aomori" -msgstr "" +msgstr "Aomori" #: contrib/localflavor/jp/jp_prefectures.py:6 msgid "Iwate" -msgstr "" +msgstr "Iwate" #: contrib/localflavor/jp/jp_prefectures.py:7 msgid "Miyagi" -msgstr "" +msgstr "Mijagi" #: contrib/localflavor/jp/jp_prefectures.py:8 msgid "Akita" -msgstr "" +msgstr "Akita" #: contrib/localflavor/jp/jp_prefectures.py:9 msgid "Yamagata" -msgstr "" +msgstr "Jamagata" #: contrib/localflavor/jp/jp_prefectures.py:10 msgid "Fukushima" -msgstr "" +msgstr "Fukušima" #: contrib/localflavor/jp/jp_prefectures.py:11 msgid "Ibaraki" -msgstr "" +msgstr "Ibaraki" #: contrib/localflavor/jp/jp_prefectures.py:12 msgid "Tochigi" -msgstr "" +msgstr "Točigi" #: contrib/localflavor/jp/jp_prefectures.py:13 msgid "Gunma" -msgstr "" +msgstr "Gunma" #: contrib/localflavor/jp/jp_prefectures.py:14 msgid "Saitama" -msgstr "" +msgstr "Saitama" #: contrib/localflavor/jp/jp_prefectures.py:15 msgid "Chiba" -msgstr "" +msgstr "Čiba" #: contrib/localflavor/jp/jp_prefectures.py:16 msgid "Tokyo" -msgstr "" +msgstr "Tokio" #: contrib/localflavor/jp/jp_prefectures.py:17 msgid "Kanagawa" -msgstr "" +msgstr "Kanagawa" #: contrib/localflavor/jp/jp_prefectures.py:18 msgid "Yamanashi" -msgstr "" +msgstr "Jamanaši" #: contrib/localflavor/jp/jp_prefectures.py:19 msgid "Nagano" -msgstr "" +msgstr "Nagano" #: contrib/localflavor/jp/jp_prefectures.py:20 msgid "Niigata" -msgstr "" +msgstr "Niigata" #: contrib/localflavor/jp/jp_prefectures.py:21 msgid "Toyama" -msgstr "" +msgstr "Tojama" #: contrib/localflavor/jp/jp_prefectures.py:22 msgid "Ishikawa" -msgstr "" +msgstr "Išikawa" #: contrib/localflavor/jp/jp_prefectures.py:23 msgid "Fukui" -msgstr "" +msgstr "Fukui" #: contrib/localflavor/jp/jp_prefectures.py:24 msgid "Gifu" -msgstr "" +msgstr "Gifu" #: contrib/localflavor/jp/jp_prefectures.py:25 msgid "Shizuoka" -msgstr "" +msgstr "Šizuoka" #: contrib/localflavor/jp/jp_prefectures.py:26 msgid "Aichi" -msgstr "" +msgstr "Aiči" #: contrib/localflavor/jp/jp_prefectures.py:27 msgid "Mie" -msgstr "" +msgstr "Mie" #: contrib/localflavor/jp/jp_prefectures.py:28 msgid "Shiga" -msgstr "" +msgstr "Šiga" #: contrib/localflavor/jp/jp_prefectures.py:29 msgid "Kyoto" -msgstr "" +msgstr "Kjóto" #: contrib/localflavor/jp/jp_prefectures.py:30 msgid "Osaka" -msgstr "" +msgstr "Ósaka" #: contrib/localflavor/jp/jp_prefectures.py:31 msgid "Hyogo" -msgstr "" +msgstr "Hjógo" #: contrib/localflavor/jp/jp_prefectures.py:32 msgid "Nara" -msgstr "" +msgstr "Nara" #: contrib/localflavor/jp/jp_prefectures.py:33 msgid "Wakayama" -msgstr "" +msgstr "Wakajama" #: contrib/localflavor/jp/jp_prefectures.py:34 msgid "Tottori" -msgstr "" +msgstr "Tottori" #: contrib/localflavor/jp/jp_prefectures.py:35 msgid "Shimane" -msgstr "" +msgstr "Šimane" #: contrib/localflavor/jp/jp_prefectures.py:36 msgid "Okayama" -msgstr "" +msgstr "Okajama" #: contrib/localflavor/jp/jp_prefectures.py:37 msgid "Hiroshima" -msgstr "" +msgstr "Hirošima" #: contrib/localflavor/jp/jp_prefectures.py:38 msgid "Yamaguchi" -msgstr "" +msgstr "Jamaguči" #: contrib/localflavor/jp/jp_prefectures.py:39 msgid "Tokushima" -msgstr "" +msgstr "Tokušima" #: contrib/localflavor/jp/jp_prefectures.py:40 msgid "Kagawa" -msgstr "" +msgstr "Kagawa" #: contrib/localflavor/jp/jp_prefectures.py:41 msgid "Ehime" -msgstr "" +msgstr "Ehime" #: contrib/localflavor/jp/jp_prefectures.py:42 msgid "Kochi" -msgstr "" +msgstr "Kóči" #: contrib/localflavor/jp/jp_prefectures.py:43 msgid "Fukuoka" -msgstr "" +msgstr "Fukuoka" #: contrib/localflavor/jp/jp_prefectures.py:44 msgid "Saga" -msgstr "" +msgstr "Saga" #: contrib/localflavor/jp/jp_prefectures.py:45 msgid "Nagasaki" -msgstr "" +msgstr "Nagasaki" #: contrib/localflavor/jp/jp_prefectures.py:46 msgid "Kumamoto" -msgstr "" +msgstr "Kumamoto" #: contrib/localflavor/jp/jp_prefectures.py:47 msgid "Oita" -msgstr "" +msgstr "Óita" #: contrib/localflavor/jp/jp_prefectures.py:48 msgid "Miyazaki" -msgstr "" +msgstr "Mijazaki" #: contrib/localflavor/jp/jp_prefectures.py:49 msgid "Kagoshima" -msgstr "" +msgstr "Kagošima" #: contrib/localflavor/jp/jp_prefectures.py:50 msgid "Okinawa" -msgstr "" +msgstr "Okinawa" #: contrib/localflavor/mx/mx_states.py:12 msgid "Aguascalientes" -msgstr "" +msgstr "Aguascalientes" #: contrib/localflavor/mx/mx_states.py:13 msgid "Baja California" -msgstr "" +msgstr "Baja California" #: contrib/localflavor/mx/mx_states.py:14 msgid "Baja California Sur" -msgstr "" +msgstr "Baja California Sur" #: contrib/localflavor/mx/mx_states.py:15 msgid "Campeche" -msgstr "" +msgstr "Campeche" #: contrib/localflavor/mx/mx_states.py:16 msgid "Chihuahua" -msgstr "" +msgstr "Chihuahua" #: contrib/localflavor/mx/mx_states.py:17 msgid "Chiapas" -msgstr "" +msgstr "Chiapas" #: contrib/localflavor/mx/mx_states.py:18 msgid "Coahuila" -msgstr "" +msgstr "Coahuila" #: contrib/localflavor/mx/mx_states.py:19 msgid "Colima" -msgstr "" +msgstr "Colima" #: contrib/localflavor/mx/mx_states.py:20 msgid "Distrito Federal" -msgstr "" +msgstr "Distrito Federal" #: contrib/localflavor/mx/mx_states.py:21 msgid "Durango" -msgstr "" +msgstr "Durango" #: contrib/localflavor/mx/mx_states.py:22 msgid "Guerrero" -msgstr "" +msgstr "Guerrero" #: contrib/localflavor/mx/mx_states.py:23 msgid "Guanajuato" -msgstr "" +msgstr "Guanajuato" #: contrib/localflavor/mx/mx_states.py:24 msgid "Hidalgo" -msgstr "" +msgstr "Hidalgo" #: contrib/localflavor/mx/mx_states.py:25 msgid "Jalisco" -msgstr "" +msgstr "Jalisco" #: contrib/localflavor/mx/mx_states.py:26 msgid "Estado de México" -msgstr "" +msgstr "México" #: contrib/localflavor/mx/mx_states.py:27 msgid "Michoacán" -msgstr "" +msgstr "Michoacán" #: contrib/localflavor/mx/mx_states.py:28 msgid "Morelos" -msgstr "" +msgstr "Morelos" #: contrib/localflavor/mx/mx_states.py:29 msgid "Nayarit" -msgstr "" +msgstr "Nayarit" #: contrib/localflavor/mx/mx_states.py:30 msgid "Nuevo León" -msgstr "" +msgstr "Nuevo León" #: contrib/localflavor/mx/mx_states.py:31 msgid "Oaxaca" -msgstr "" +msgstr "Oaxaca" #: contrib/localflavor/mx/mx_states.py:32 msgid "Puebla" -msgstr "" +msgstr "Puebla" #: contrib/localflavor/mx/mx_states.py:33 msgid "Querétaro" -msgstr "" +msgstr "Querétaro" #: contrib/localflavor/mx/mx_states.py:34 msgid "Quintana Roo" -msgstr "" +msgstr "Quintana Roo" #: contrib/localflavor/mx/mx_states.py:35 msgid "Sinaloa" -msgstr "" +msgstr "Sinaloa" #: contrib/localflavor/mx/mx_states.py:36 msgid "San Luis Potosí" -msgstr "" +msgstr "San Luis Potosí" #: contrib/localflavor/mx/mx_states.py:37 msgid "Sonora" -msgstr "" +msgstr "Sonora" #: contrib/localflavor/mx/mx_states.py:38 msgid "Tabasco" -msgstr "" +msgstr "Tabasco" #: contrib/localflavor/mx/mx_states.py:39 msgid "Tamaulipas" -msgstr "" +msgstr "Tamaulipas" #: contrib/localflavor/mx/mx_states.py:40 msgid "Tlaxcala" -msgstr "" +msgstr "Tlaxcala" #: contrib/localflavor/mx/mx_states.py:41 msgid "Veracruz" -msgstr "" +msgstr "Veracruz" #: contrib/localflavor/mx/mx_states.py:42 msgid "Yucatán" -msgstr "" +msgstr "Yucatán" #: contrib/localflavor/mx/mx_states.py:43 msgid "Zacatecas" -msgstr "" +msgstr "Zacatecas" #: contrib/localflavor/nl/forms.py:21 msgid "Enter a valid postal code" -msgstr "" +msgstr "Zadejte platné poštovní směrovací číslo" #: contrib/localflavor/nl/forms.py:52 msgid "Enter a valid phone number" -msgstr "" +msgstr "Zadejte platné telefonní číslo" #: contrib/localflavor/nl/forms.py:78 msgid "Enter a valid SoFi number" -msgstr "" +msgstr "Zadejte platné číslo SoFi" #: contrib/localflavor/nl/nl_provinces.py:4 msgid "Drenthe" -msgstr "" +msgstr "Drenthe" #: contrib/localflavor/nl/nl_provinces.py:5 msgid "Flevoland" -msgstr "" +msgstr "Flevoland" #: contrib/localflavor/nl/nl_provinces.py:6 msgid "Friesland" -msgstr "" +msgstr "Friesland" #: contrib/localflavor/nl/nl_provinces.py:7 msgid "Gelderland" -msgstr "" +msgstr "Gelderland" #: contrib/localflavor/nl/nl_provinces.py:8 msgid "Groningen" -msgstr "" +msgstr "Groningen" #: contrib/localflavor/nl/nl_provinces.py:9 msgid "Limburg" -msgstr "" +msgstr "Limburk" #: contrib/localflavor/nl/nl_provinces.py:10 msgid "Noord-Brabant" -msgstr "" +msgstr "Severní Brabantsko" #: contrib/localflavor/nl/nl_provinces.py:11 msgid "Noord-Holland" -msgstr "" +msgstr "Severní Holandsko" #: contrib/localflavor/nl/nl_provinces.py:12 msgid "Overijssel" -msgstr "" +msgstr "Overijssel" #: contrib/localflavor/nl/nl_provinces.py:13 msgid "Utrecht" -msgstr "" +msgstr "Utrecht" #: contrib/localflavor/nl/nl_provinces.py:14 msgid "Zeeland" -msgstr "" +msgstr "Zeeland" #: contrib/localflavor/nl/nl_provinces.py:15 msgid "Zuid-Holland" -msgstr "" +msgstr "Jižní Holandsko" #: contrib/localflavor/no/forms.py:33 msgid "Enter a valid Norwegian social security number." -msgstr "" +msgstr "Zadejte platné norské číslo sociálního pojištěni (SSN)." #: contrib/localflavor/pe/forms.py:24 msgid "This field requires 8 digits." -msgstr "" +msgstr "Toto pole musí obsahovat 8 číslic." #: contrib/localflavor/pe/forms.py:52 msgid "This field requires 11 digits." -msgstr "" +msgstr "Toto pole musí obsahovat 11 číslic." #: contrib/localflavor/pl/forms.py:38 msgid "National Identification Number consists of 11 digits." -msgstr "" +msgstr "Národní identifikační číslo obsahuje 11 číslic." #: contrib/localflavor/pl/forms.py:39 msgid "Wrong checksum for the National Identification Number." -msgstr "" +msgstr "Neplatný kontrolní součet pro Národní identifikační číslo." #: contrib/localflavor/pl/forms.py:71 msgid "" "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." msgstr "" +"Zadejte daňové identifikační číslo (NIP) ve formátu XXX-XXX-XX-XX nebo XX-XX-" +"XXX-XXX." #: contrib/localflavor/pl/forms.py:72 msgid "Wrong checksum for the Tax Number (NIP)." -msgstr "" +msgstr "Neplatný kontrolní součet pro daňové identifikační číslo." -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." -msgstr "" +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." +msgstr "Identifikační číslo podnikatele (REGON) obsahuje 9 až 14 číslic." -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." -msgstr "" +msgstr "Neplatný kontrolní součet pro identifikační číslo podnikatele (REGON)." -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." -msgstr "" +msgstr "Zadejte poštovní směrovací číslo ve formátu XX-XXX." #: contrib/localflavor/pl/pl_voivodeships.py:8 msgid "Lower Silesia" -msgstr "" +msgstr "Dolnoslezské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:9 msgid "Kuyavia-Pomerania" -msgstr "" +msgstr "Kujavsko-pomořské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:10 msgid "Lublin" -msgstr "" +msgstr "Lublinské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:11 msgid "Lubusz" -msgstr "" +msgstr "Lubušské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:12 msgid "Lodz" -msgstr "" +msgstr "Lodžské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:13 msgid "Lesser Poland" -msgstr "" +msgstr "Malopolské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:14 msgid "Masovia" -msgstr "" +msgstr "Mazovské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:15 msgid "Opole" -msgstr "" +msgstr "Opolské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:16 msgid "Subcarpatia" -msgstr "" +msgstr "Podkarpatské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:17 msgid "Podlasie" -msgstr "" +msgstr "Podleské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:18 msgid "Pomerania" -msgstr "" +msgstr "Pomořské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:19 msgid "Silesia" -msgstr "" +msgstr "Slezské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:20 msgid "Swietokrzyskie" -msgstr "" +msgstr "Svatokřížské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:21 msgid "Warmia-Masuria" -msgstr "" +msgstr "Varmijsko-mazurské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:22 msgid "Greater Poland" -msgstr "" +msgstr "Velkopolské vojvodství" #: contrib/localflavor/pl/pl_voivodeships.py:23 msgid "West Pomerania" -msgstr "" +msgstr "Západopomořanské vojvodství" #: contrib/localflavor/ro/forms.py:19 msgid "Enter a valid CIF." -msgstr "" +msgstr "Zadejte platné CIF." #: contrib/localflavor/ro/forms.py:56 msgid "Enter a valid CNP." -msgstr "" +msgstr "Zadejte platné CNP." #: contrib/localflavor/ro/forms.py:141 msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format" -msgstr "" +msgstr "Zadejte platné IBAN ve formátu ROXX-XXXX-XXXX-XXXX-XXXX-XXXX." #: contrib/localflavor/ro/forms.py:171 msgid "Phone numbers must be in XXXX-XXXXXX format." -msgstr "" +msgstr "Telefonní číslo musí být ve formátu XXXX-XXXXXX." #: contrib/localflavor/ro/forms.py:194 msgid "Enter a valid postal code in the format XXXXXX" -msgstr "" - -#: contrib/localflavor/sk/forms.py:30 -msgid "Enter a postal code in the format XXXXX or XXX XX." -msgstr "" +msgstr "Zadejte platné poštovní směrovací číslo ve formátu XXXXXX." #: contrib/localflavor/sk/sk_districts.py:8 msgid "Banska Bystrica" -msgstr "" +msgstr "Banská Bystrica" #: contrib/localflavor/sk/sk_districts.py:9 msgid "Banska Stiavnica" -msgstr "" +msgstr "Banská Štiavnica" #: contrib/localflavor/sk/sk_districts.py:10 msgid "Bardejov" -msgstr "" +msgstr "Bardejov" #: contrib/localflavor/sk/sk_districts.py:11 msgid "Banovce nad Bebravou" -msgstr "" +msgstr "Bánovce nad Bebravou" #: contrib/localflavor/sk/sk_districts.py:12 msgid "Brezno" -msgstr "" +msgstr "Brezno" #: contrib/localflavor/sk/sk_districts.py:13 msgid "Bratislava I" -msgstr "" +msgstr "Bratislava I" #: contrib/localflavor/sk/sk_districts.py:14 msgid "Bratislava II" -msgstr "" +msgstr "Bratislava II" #: contrib/localflavor/sk/sk_districts.py:15 msgid "Bratislava III" -msgstr "" +msgstr "Bratislava III" #: contrib/localflavor/sk/sk_districts.py:16 msgid "Bratislava IV" -msgstr "" +msgstr "Bratislava IV" #: contrib/localflavor/sk/sk_districts.py:17 msgid "Bratislava V" -msgstr "" +msgstr "Bratislava V" #: contrib/localflavor/sk/sk_districts.py:18 msgid "Bytca" -msgstr "" +msgstr "Bytča" #: contrib/localflavor/sk/sk_districts.py:19 msgid "Cadca" -msgstr "" +msgstr "Čadca" #: contrib/localflavor/sk/sk_districts.py:20 msgid "Detva" -msgstr "" +msgstr "Detva" #: contrib/localflavor/sk/sk_districts.py:21 msgid "Dolny Kubin" -msgstr "" +msgstr "Dolný Kubín" #: contrib/localflavor/sk/sk_districts.py:22 msgid "Dunajska Streda" -msgstr "" +msgstr "Dunajská Streda" #: contrib/localflavor/sk/sk_districts.py:23 msgid "Galanta" -msgstr "" +msgstr "Galanta" #: contrib/localflavor/sk/sk_districts.py:24 msgid "Gelnica" -msgstr "" +msgstr "Gelnica" #: contrib/localflavor/sk/sk_districts.py:25 msgid "Hlohovec" -msgstr "" +msgstr "Hlohovec" #: contrib/localflavor/sk/sk_districts.py:26 msgid "Humenne" -msgstr "" +msgstr "Humenné" #: contrib/localflavor/sk/sk_districts.py:27 msgid "Ilava" -msgstr "" +msgstr "Ilava" #: contrib/localflavor/sk/sk_districts.py:28 msgid "Kezmarok" -msgstr "" +msgstr "Kežmarok" #: contrib/localflavor/sk/sk_districts.py:29 msgid "Komarno" -msgstr "" +msgstr "Komárno" #: contrib/localflavor/sk/sk_districts.py:30 msgid "Kosice I" -msgstr "" +msgstr "Košice I" #: contrib/localflavor/sk/sk_districts.py:31 msgid "Kosice II" -msgstr "" +msgstr "Košice II" #: contrib/localflavor/sk/sk_districts.py:32 msgid "Kosice III" -msgstr "" +msgstr "Košice III" #: contrib/localflavor/sk/sk_districts.py:33 msgid "Kosice IV" -msgstr "" +msgstr "Košice IV" #: contrib/localflavor/sk/sk_districts.py:34 msgid "Kosice - okolie" -msgstr "" +msgstr "Košice-okolie" #: contrib/localflavor/sk/sk_districts.py:35 msgid "Krupina" -msgstr "" +msgstr "Krupina" #: contrib/localflavor/sk/sk_districts.py:36 msgid "Kysucke Nove Mesto" -msgstr "" +msgstr "Kysucké Nové Mesto" #: contrib/localflavor/sk/sk_districts.py:37 msgid "Levice" -msgstr "" +msgstr "Levice" #: contrib/localflavor/sk/sk_districts.py:38 msgid "Levoca" -msgstr "" +msgstr "Levoča" #: contrib/localflavor/sk/sk_districts.py:39 msgid "Liptovsky Mikulas" -msgstr "" +msgstr "Liptovský Mikuláš" #: contrib/localflavor/sk/sk_districts.py:40 msgid "Lucenec" -msgstr "" +msgstr "Lučenec" #: contrib/localflavor/sk/sk_districts.py:41 msgid "Malacky" -msgstr "" +msgstr "Malacky" #: contrib/localflavor/sk/sk_districts.py:42 msgid "Martin" -msgstr "" +msgstr "Martin" #: contrib/localflavor/sk/sk_districts.py:43 msgid "Medzilaborce" -msgstr "" +msgstr "Medzilaborce" #: contrib/localflavor/sk/sk_districts.py:44 msgid "Michalovce" -msgstr "" +msgstr "Michalovce" #: contrib/localflavor/sk/sk_districts.py:45 msgid "Myjava" -msgstr "" +msgstr "Myjava" #: contrib/localflavor/sk/sk_districts.py:46 msgid "Namestovo" -msgstr "" +msgstr "Námestovo" #: contrib/localflavor/sk/sk_districts.py:47 msgid "Nitra" -msgstr "" +msgstr "Nitra" #: contrib/localflavor/sk/sk_districts.py:48 msgid "Nove Mesto nad Vahom" -msgstr "" +msgstr "Nové Mesto nad Váhom" #: contrib/localflavor/sk/sk_districts.py:49 msgid "Nove Zamky" -msgstr "" +msgstr "Nové Zámky" #: contrib/localflavor/sk/sk_districts.py:50 msgid "Partizanske" -msgstr "" +msgstr "Partizánske" #: contrib/localflavor/sk/sk_districts.py:51 msgid "Pezinok" -msgstr "" +msgstr "Pezinok" #: contrib/localflavor/sk/sk_districts.py:52 msgid "Piestany" -msgstr "" +msgstr "Piešťany" #: contrib/localflavor/sk/sk_districts.py:53 msgid "Poltar" -msgstr "" +msgstr "Poltár" #: contrib/localflavor/sk/sk_districts.py:54 msgid "Poprad" -msgstr "" +msgstr "Poprad" #: contrib/localflavor/sk/sk_districts.py:55 msgid "Povazska Bystrica" -msgstr "" +msgstr "Považská Bystrica" #: contrib/localflavor/sk/sk_districts.py:56 msgid "Presov" -msgstr "" +msgstr "Prešov" #: contrib/localflavor/sk/sk_districts.py:57 msgid "Prievidza" -msgstr "" +msgstr "Prievidza" #: contrib/localflavor/sk/sk_districts.py:58 msgid "Puchov" -msgstr "" +msgstr "Púchov" #: contrib/localflavor/sk/sk_districts.py:59 msgid "Revuca" -msgstr "" +msgstr "Revúca" #: contrib/localflavor/sk/sk_districts.py:60 msgid "Rimavska Sobota" -msgstr "" +msgstr "Rimavská Sobota" #: contrib/localflavor/sk/sk_districts.py:61 msgid "Roznava" -msgstr "" +msgstr "Rožňava" #: contrib/localflavor/sk/sk_districts.py:62 msgid "Ruzomberok" -msgstr "" +msgstr "Ružomberok" #: contrib/localflavor/sk/sk_districts.py:63 msgid "Sabinov" -msgstr "" +msgstr "Sabinov" #: contrib/localflavor/sk/sk_districts.py:64 msgid "Senec" -msgstr "" +msgstr "Senec" #: contrib/localflavor/sk/sk_districts.py:65 msgid "Senica" -msgstr "" +msgstr "Senica" #: contrib/localflavor/sk/sk_districts.py:66 msgid "Skalica" -msgstr "" +msgstr "Skalica" #: contrib/localflavor/sk/sk_districts.py:67 msgid "Snina" -msgstr "" +msgstr "Snina" #: contrib/localflavor/sk/sk_districts.py:68 msgid "Sobrance" -msgstr "" +msgstr "Sobrance" #: contrib/localflavor/sk/sk_districts.py:69 msgid "Spisska Nova Ves" -msgstr "" +msgstr "Spišská Nová Ves" #: contrib/localflavor/sk/sk_districts.py:70 msgid "Stara Lubovna" -msgstr "" +msgstr "Stará Ľubovňa" #: contrib/localflavor/sk/sk_districts.py:71 msgid "Stropkov" -msgstr "" +msgstr "Stropkov" #: contrib/localflavor/sk/sk_districts.py:72 msgid "Svidnik" -msgstr "" +msgstr "Svidník" #: contrib/localflavor/sk/sk_districts.py:73 msgid "Sala" -msgstr "" +msgstr "Šaľa" #: contrib/localflavor/sk/sk_districts.py:74 msgid "Topolcany" -msgstr "" +msgstr "Topoľčany" #: contrib/localflavor/sk/sk_districts.py:75 msgid "Trebisov" -msgstr "" +msgstr "Trebišov" #: contrib/localflavor/sk/sk_districts.py:76 msgid "Trencin" -msgstr "" +msgstr "Trenčín" #: contrib/localflavor/sk/sk_districts.py:77 msgid "Trnava" -msgstr "" +msgstr "Trnava" #: contrib/localflavor/sk/sk_districts.py:78 msgid "Turcianske Teplice" -msgstr "" +msgstr "Turčianske Teplice" #: contrib/localflavor/sk/sk_districts.py:79 msgid "Tvrdosin" -msgstr "" +msgstr "Tvrdošín" #: contrib/localflavor/sk/sk_districts.py:80 msgid "Velky Krtis" -msgstr "" +msgstr "Veľký Krtíš" #: contrib/localflavor/sk/sk_districts.py:81 msgid "Vranov nad Toplou" -msgstr "" +msgstr "Vranov nad Topľou" #: contrib/localflavor/sk/sk_districts.py:82 msgid "Zlate Moravce" -msgstr "" +msgstr "Zlaté Moravce" #: contrib/localflavor/sk/sk_districts.py:83 msgid "Zvolen" -msgstr "" +msgstr "Zvolen" #: contrib/localflavor/sk/sk_districts.py:84 msgid "Zarnovica" -msgstr "" +msgstr "Žarnovica" #: contrib/localflavor/sk/sk_districts.py:85 msgid "Ziar nad Hronom" -msgstr "" +msgstr "Žiar nad Hronom" #: contrib/localflavor/sk/sk_districts.py:86 msgid "Zilina" -msgstr "" +msgstr "Žilina" #: contrib/localflavor/sk/sk_regions.py:8 msgid "Banska Bystrica region" -msgstr "" +msgstr "Banskobystrický kraj" #: contrib/localflavor/sk/sk_regions.py:9 msgid "Bratislava region" -msgstr "" +msgstr "Bratislavský kraj" #: contrib/localflavor/sk/sk_regions.py:10 msgid "Kosice region" -msgstr "" +msgstr "Košický kraj" #: contrib/localflavor/sk/sk_regions.py:11 msgid "Nitra region" -msgstr "" +msgstr "Nitranský kraj" #: contrib/localflavor/sk/sk_regions.py:12 msgid "Presov region" -msgstr "" +msgstr "Prešovský kraj" #: contrib/localflavor/sk/sk_regions.py:13 msgid "Trencin region" -msgstr "" +msgstr "Trenčínský kraj" #: contrib/localflavor/sk/sk_regions.py:14 msgid "Trnava region" -msgstr "" +msgstr "Trnavský kraj" #: contrib/localflavor/sk/sk_regions.py:15 msgid "Zilina region" -msgstr "" +msgstr "Žilinský kraj" #: contrib/localflavor/uk/forms.py:21 msgid "Enter a valid postcode." -msgstr "" +msgstr "Zadejte platné poštovní směrovací číslo." #: contrib/localflavor/uk/uk_regions.py:11 msgid "Bedfordshire" -msgstr "" +msgstr "Bedfordshire" #: contrib/localflavor/uk/uk_regions.py:12 msgid "Buckinghamshire" -msgstr "" +msgstr "Buckinghamshire" #: contrib/localflavor/uk/uk_regions.py:14 msgid "Cheshire" -msgstr "" +msgstr "Cheshire" #: contrib/localflavor/uk/uk_regions.py:15 msgid "Cornwall and Isles of Scilly" -msgstr "" +msgstr "Cornwall" #: contrib/localflavor/uk/uk_regions.py:16 msgid "Cumbria" -msgstr "" +msgstr "Cumbria" #: contrib/localflavor/uk/uk_regions.py:17 msgid "Derbyshire" -msgstr "" +msgstr "Derbyshire" #: contrib/localflavor/uk/uk_regions.py:18 msgid "Devon" -msgstr "" +msgstr "Devon" #: contrib/localflavor/uk/uk_regions.py:19 msgid "Dorset" -msgstr "" +msgstr "Dorset" #: contrib/localflavor/uk/uk_regions.py:20 msgid "Durham" -msgstr "" +msgstr "Durham" #: contrib/localflavor/uk/uk_regions.py:21 msgid "East Sussex" -msgstr "" +msgstr "East Sussex" #: contrib/localflavor/uk/uk_regions.py:22 msgid "Essex" -msgstr "" +msgstr "Essex" #: contrib/localflavor/uk/uk_regions.py:23 msgid "Gloucestershire" -msgstr "" +msgstr "Gloucestershire" #: contrib/localflavor/uk/uk_regions.py:24 msgid "Greater London" -msgstr "" +msgstr "Velký Londýn" #: contrib/localflavor/uk/uk_regions.py:25 msgid "Greater Manchester" -msgstr "" +msgstr "Velký Manchester" #: contrib/localflavor/uk/uk_regions.py:26 msgid "Hampshire" -msgstr "" +msgstr "Hampshire" #: contrib/localflavor/uk/uk_regions.py:27 msgid "Hertfordshire" -msgstr "" +msgstr "Hertfordshire" #: contrib/localflavor/uk/uk_regions.py:28 msgid "Kent" -msgstr "" +msgstr "Kent" #: contrib/localflavor/uk/uk_regions.py:29 msgid "Lancashire" -msgstr "" +msgstr "Lancashire" #: contrib/localflavor/uk/uk_regions.py:30 msgid "Leicestershire" -msgstr "" +msgstr "Leicestershire" #: contrib/localflavor/uk/uk_regions.py:31 msgid "Lincolnshire" -msgstr "" +msgstr "Lincolnshire" #: contrib/localflavor/uk/uk_regions.py:32 msgid "Merseyside" -msgstr "" +msgstr "Merseyside" #: contrib/localflavor/uk/uk_regions.py:33 msgid "Norfolk" -msgstr "" +msgstr "Norfolk" #: contrib/localflavor/uk/uk_regions.py:34 msgid "North Yorkshire" -msgstr "" +msgstr "North Yorkshire" #: contrib/localflavor/uk/uk_regions.py:35 msgid "Northamptonshire" -msgstr "" +msgstr "Northamptonshire" #: contrib/localflavor/uk/uk_regions.py:36 msgid "Northumberland" -msgstr "" +msgstr "Northumberland" #: contrib/localflavor/uk/uk_regions.py:37 msgid "Nottinghamshire" -msgstr "" +msgstr "Nottinghamshire" #: contrib/localflavor/uk/uk_regions.py:38 msgid "Oxfordshire" -msgstr "" +msgstr "Oxfordshire" #: contrib/localflavor/uk/uk_regions.py:39 msgid "Shropshire" -msgstr "" +msgstr "Shropshire" #: contrib/localflavor/uk/uk_regions.py:40 msgid "Somerset" -msgstr "" +msgstr "Somerset" #: contrib/localflavor/uk/uk_regions.py:41 msgid "South Yorkshire" -msgstr "" +msgstr "South Yorkshire" #: contrib/localflavor/uk/uk_regions.py:42 msgid "Staffordshire" -msgstr "" +msgstr "Staffordshire" #: contrib/localflavor/uk/uk_regions.py:43 msgid "Suffolk" -msgstr "" +msgstr "Suffolk" #: contrib/localflavor/uk/uk_regions.py:44 msgid "Surrey" -msgstr "" +msgstr "Surrey" #: contrib/localflavor/uk/uk_regions.py:45 msgid "Tyne and Wear" -msgstr "" +msgstr "Tyne a Wear" #: contrib/localflavor/uk/uk_regions.py:46 msgid "Warwickshire" -msgstr "" +msgstr "Warwickshire" #: contrib/localflavor/uk/uk_regions.py:47 msgid "West Midlands" -msgstr "" +msgstr "West Midlands" #: contrib/localflavor/uk/uk_regions.py:48 msgid "West Sussex" -msgstr "" +msgstr "West Sussex" #: contrib/localflavor/uk/uk_regions.py:49 msgid "West Yorkshire" -msgstr "" +msgstr "West Yorkshire" #: contrib/localflavor/uk/uk_regions.py:50 msgid "Wiltshire" -msgstr "" +msgstr "Wiltshire" #: contrib/localflavor/uk/uk_regions.py:51 msgid "Worcestershire" -msgstr "" +msgstr "Worcestershire" #: contrib/localflavor/uk/uk_regions.py:55 msgid "County Antrim" -msgstr "" +msgstr "County Antrim" #: contrib/localflavor/uk/uk_regions.py:56 msgid "County Armagh" -msgstr "" +msgstr "County Armagh" #: contrib/localflavor/uk/uk_regions.py:57 msgid "County Down" -msgstr "" +msgstr "County Down" #: contrib/localflavor/uk/uk_regions.py:58 msgid "County Fermanagh" -msgstr "" +msgstr "County Fermanagh" #: contrib/localflavor/uk/uk_regions.py:59 msgid "County Londonderry" -msgstr "" +msgstr "County Londonderry" #: contrib/localflavor/uk/uk_regions.py:60 msgid "County Tyrone" -msgstr "" +msgstr "County Tyrone" #: contrib/localflavor/uk/uk_regions.py:64 msgid "Clwyd" -msgstr "" +msgstr "Clwyd" #: contrib/localflavor/uk/uk_regions.py:65 msgid "Dyfed" -msgstr "" +msgstr "Dyfed" #: contrib/localflavor/uk/uk_regions.py:66 msgid "Gwent" -msgstr "" +msgstr "Gwent" #: contrib/localflavor/uk/uk_regions.py:67 msgid "Gwynedd" -msgstr "" +msgstr "Gwynedd" #: contrib/localflavor/uk/uk_regions.py:68 msgid "Mid Glamorgan" -msgstr "" +msgstr "Mid Glamorgan" #: contrib/localflavor/uk/uk_regions.py:69 msgid "Powys" -msgstr "" +msgstr "Powys" #: contrib/localflavor/uk/uk_regions.py:70 msgid "South Glamorgan" -msgstr "" +msgstr "South Glamorgan" #: contrib/localflavor/uk/uk_regions.py:71 msgid "West Glamorgan" -msgstr "" +msgstr "West Glamorgan" #: contrib/localflavor/uk/uk_regions.py:75 msgid "Borders" -msgstr "" +msgstr "Borders" #: contrib/localflavor/uk/uk_regions.py:76 msgid "Central Scotland" -msgstr "" +msgstr "Střední Skotsko" #: contrib/localflavor/uk/uk_regions.py:77 msgid "Dumfries and Galloway" -msgstr "" +msgstr "Dumfries a Galloway" #: contrib/localflavor/uk/uk_regions.py:78 msgid "Fife" -msgstr "" +msgstr "Fife" #: contrib/localflavor/uk/uk_regions.py:79 msgid "Grampian" -msgstr "" +msgstr "Grampian" #: contrib/localflavor/uk/uk_regions.py:80 msgid "Highland" -msgstr "" +msgstr "Highland" #: contrib/localflavor/uk/uk_regions.py:81 msgid "Lothian" -msgstr "" +msgstr "Lothian" #: contrib/localflavor/uk/uk_regions.py:82 msgid "Orkney Islands" -msgstr "" +msgstr "Orkneje" #: contrib/localflavor/uk/uk_regions.py:83 msgid "Shetland Islands" -msgstr "" +msgstr "Shetlandy" #: contrib/localflavor/uk/uk_regions.py:84 msgid "Strathclyde" -msgstr "" +msgstr "Strathclyde" #: contrib/localflavor/uk/uk_regions.py:85 msgid "Tayside" -msgstr "" +msgstr "Tayside" #: contrib/localflavor/uk/uk_regions.py:86 msgid "Western Isles" -msgstr "" +msgstr "Západní ostrovy" #: contrib/localflavor/uk/uk_regions.py:90 msgid "England" -msgstr "" +msgstr "Anglie" #: contrib/localflavor/uk/uk_regions.py:91 msgid "Northern Ireland" -msgstr "" +msgstr "Severní Irsko" #: contrib/localflavor/uk/uk_regions.py:92 msgid "Scotland" -msgstr "" +msgstr "Skotsko" #: contrib/localflavor/uk/uk_regions.py:93 msgid "Wales" -msgstr "" +msgstr "Wales" #: contrib/localflavor/us/forms.py:16 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." -msgstr "" +msgstr "Zadejte poštovní směrovací číslo ve formátu XXXXX nebo XXXXX-XXXX." #: contrib/localflavor/us/forms.py:54 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." -msgstr "" +msgstr "Zadejte platné osobní číslo (U.S. SSN) ve formátu XXX-XX-XXXX." #: contrib/localflavor/za/forms.py:20 msgid "Enter a valid South African ID number" -msgstr "" +msgstr "Zadejte platné jihoafrické identifikační číslo" #: contrib/localflavor/za/forms.py:54 msgid "Enter a valid South African postal code" -msgstr "" +msgstr "Zadejte platné jihoafrické poštovní směrovací číslo" #: contrib/localflavor/za/za_provinces.py:4 msgid "Eastern Cape" -msgstr "" +msgstr "Východní Kapsko" #: contrib/localflavor/za/za_provinces.py:5 msgid "Free State" -msgstr "" +msgstr "Svobodný stát" #: contrib/localflavor/za/za_provinces.py:6 msgid "Gauteng" -msgstr "" +msgstr "Gauteng" #: contrib/localflavor/za/za_provinces.py:7 msgid "KwaZulu-Natal" -msgstr "" +msgstr "KwaZulu-Natal" #: contrib/localflavor/za/za_provinces.py:8 msgid "Limpopo" -msgstr "" +msgstr "Limpopo" #: contrib/localflavor/za/za_provinces.py:9 msgid "Mpumalanga" -msgstr "" +msgstr "Mpumalanga" #: contrib/localflavor/za/za_provinces.py:10 msgid "Northern Cape" -msgstr "" +msgstr "Severní Kapsko" #: contrib/localflavor/za/za_provinces.py:11 msgid "North West" -msgstr "" +msgstr "Severozápadní provincie" #: contrib/localflavor/za/za_provinces.py:12 msgid "Western Cape" -msgstr "" +msgstr "Západní Kapsko" #: contrib/redirects/models.py:7 msgid "redirect from" @@ -3497,7 +3822,7 @@ msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -"Toto by měla být absolutní cesta, bez domény. Příklad: \"/udalosti/hledat/\"." +"Toto by měla být absolutní cesta bez domény. Příklad: \"/udalosti/hledat/\"." #: contrib/redirects/models.py:9 msgid "redirect to" @@ -3541,74 +3866,76 @@ msgstr "sezení" #: contrib/sites/models.py:32 msgid "domain name" -msgstr "jméno domény" +msgstr "název domény" #: contrib/sites/models.py:33 msgid "display name" -msgstr "zobrazené jméno" +msgstr "zobrazený název" #: contrib/sites/models.py:39 msgid "sites" msgstr "weby" -#: db/models/fields/__init__.py:348 db/models/fields/__init__.py:683 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "Tato hodnota musí být celé číslo." -#: db/models/fields/__init__.py:379 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." msgstr "Tato hodnota musí být buď Ano (True), nebo Ne (False)." -#: db/models/fields/__init__.py:412 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Toto pole nemůže být prázdné (null)." -#: db/models/fields/__init__.py:428 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." -msgstr "Vložte pouze cifry oddělené čárkami." +msgstr "Vložte pouze číslice oddělené čárkami." -#: db/models/fields/__init__.py:459 +#: db/models/fields/__init__.py:474 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Vložte platné datum ve formátu RRRR-MM-DD." -#: db/models/fields/__init__.py:468 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Neplatné datum: %s" -#: db/models/fields/__init__.py:532 db/models/fields/__init__.py:550 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format." msgstr "Vložte platné datum a čas ve formátu RRRR-MM-DD HH:MM[:ss[.uuuuuu]]." -#: db/models/fields/__init__.py:586 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." -msgstr "Tato hodnota musí být celé číslo." +msgstr "Tato hodnota musí být desetinné číslo." -#: db/models/fields/__init__.py:719 +#: db/models/fields/__init__.py:686 +msgid "This value must be a float." +msgstr "Tato hodnota musí být desetinné číslo." + +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." msgstr "Tato hodnota musí být buď Nic (None), Ano (True) nebo Ne (False)." -#: db/models/fields/__init__.py:817 db/models/fields/__init__.py:831 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." msgstr "Vložte platný čas ve formátu HH:MM[:ss[.uuuuuu]]" -#: db/models/fields/related.py:763 +#: db/models/fields/related.py:792 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" -"Podržte \"Control\" (nebo \"Command\" na Macu) pro vybrání více jak jedné " -"položky." +"Výběr více než jedné položky je možný přidržením klávesy \"Control\" (nebo " +"\"Command\" na Macu)." -#: db/models/fields/related.py:840 +#: db/models/fields/related.py:870 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" "Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr[0] "Prosíme, vložte platná %(self)s ID. Hodnota %(value)r není platná." -msgstr[1] "" -"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné." -msgstr[2] "" -"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné." +msgstr[0] "Vložte platné ID objektu %(self)s. Hodnota %(value)r je neplatná." +msgstr[1] "Vložte platné ID objektu %(self)s. Hodnoty %(value)r jsou neplatné." +msgstr[2] "Vložte platné ID objektu %(self)s. Hodnoty %(value)r jsou neplatné." #: forms/fields.py:54 msgid "This field is required." @@ -3621,12 +3948,14 @@ msgstr "Vložte platnou hodnotu." #: forms/fields.py:138 #, python-format msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." -msgstr "Tato hodnota musí mít nejvíce %(max)d znaků (nyní jich má %(length)d)." +msgstr "" +"Délka této hodnoty má být nejvýše %(max)d znaků, ale nyní je %(length)d." #: forms/fields.py:139 #, python-format msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." -msgstr "Tato hodnota musí mít nejméně %(min)d znaků (nyní jich má %(length)d)." +msgstr "" +"Délka této hodnoty má být nejméně %(min)d znaků, ale nyní je %(length)d." #: forms/fields.py:166 msgid "Enter a whole number." @@ -3635,12 +3964,12 @@ msgstr "Vložte celé číslo." #: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225 #, python-format msgid "Ensure this value is less than or equal to %s." -msgstr "Tato hodnota musí být menší nebo rovná %s." +msgstr "Tato hodnota musí být menší nebo rovna %s." #: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226 #, python-format msgid "Ensure this value is greater than or equal to %s." -msgstr "Tato hodnota musí být větší nebo rovná %s." +msgstr "Tato hodnota musí být větší nebo rovna %s." #: forms/fields.py:195 forms/fields.py:224 msgid "Enter a number." @@ -3649,144 +3978,191 @@ msgstr "Vložte číslo." #: forms/fields.py:227 #, python-format msgid "Ensure that there are no more than %s digits in total." -msgstr "Tato hodnota nesmí mít celkem více než %s cifer." +msgstr "Tato hodnota nesmí celkem mít více než %s cifer." #: forms/fields.py:228 #, python-format msgid "Ensure that there are no more than %s decimal places." -msgstr "Tato hodnota nesmí mít za desetinou čárkou více než %s cifer." +msgstr "Tato hodnota nesmí mít za desetinnou čárkou více než %s cifer." #: forms/fields.py:229 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Tato hodnota nesmí mít před desetinnou čárkou více než %s cifer." -#: forms/fields.py:287 forms/fields.py:848 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Vložte platné datum." -#: forms/fields.py:321 forms/fields.py:849 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Vložte platný čas." -#: forms/fields.py:360 +#: forms/fields.py:361 msgid "Enter a valid date/time." -msgstr "Vložte platný datum a čas." - -#: forms/fields.py:446 -msgid "No file was submitted. Check the encoding type on the form." -msgstr "Soubor nebyl odeslán. Zkontrolujte \"encoding type\" formuláře." +msgstr "Vložte platné datum a čas." #: forms/fields.py:447 -msgid "No file was submitted." -msgstr "Žádný soubor nebyl poslán." +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:448 -msgid "The submitted file is empty." -msgstr "Poslaný soubor je prázdný." +msgid "No file was submitted." +msgstr "Žádný soubor nebyl odeslán." -#: forms/fields.py:477 +#: forms/fields.py:449 +msgid "The submitted file is empty." +msgstr "Odeslaný soubor je prázdný." + +#: forms/fields.py:450 +#, 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:483 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -"Nahrajte na server platný obrázek. Poslaný soubor nebyl obrázkem nebo byl " -"poškozen." +"Nahrajte platný obrázek. Odeslaný soubor buď nebyl obrázek nebo byl poškozen." -#: forms/fields.py:538 +#: forms/fields.py:544 msgid "Enter a valid URL." -msgstr "Vložte platnou URL." +msgstr "Vložte platnou adresu URL." -#: forms/fields.py:539 +#: forms/fields.py:545 msgid "This URL appears to be a broken link." -msgstr "Tento odkaz nefunguje." +msgstr "Tato adresa URL je zřejmě neplatný odkaz." -#: forms/fields.py:618 forms/fields.py:696 +#: forms/fields.py:625 forms/fields.py:703 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "Vyberte platnou možnost. Volba %(value)s není dostupná." +msgstr "Vyberte platnou možnost, \"%(value)s\" není k dispozici." -#: forms/fields.py:697 forms/fields.py:758 forms/models.py:644 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:988 msgid "Enter a list of values." msgstr "Vložte seznam hodnot." -#: forms/fields.py:877 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." -msgstr "Vložte platnou IPv4 adresu." +msgstr "Vložte platnou adresu typu IPv4." -#: forms/fields.py:887 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -"Vložte platnou hodnotu obsahující pouze znaky, čísla, podtržítka nebo čárky." +"Vložte platný identifikátor složený pouze z písmen, čísel, podtržítek a " +"pomlček." -#: forms/formsets.py:242 forms/formsets.py:244 +#: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Pořadí" -#: forms/models.py:258 forms/models.py:267 +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "" -"%(model_name)s s touto hodnotou v poli \"%(field_label)s\" již existuje." +"Položka %(model_name)s s touto hodnotou v poli %(field_label)s již existuje." -#: forms/models.py:574 +#: forms/models.py:581 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Opravte duplicitní data v poli %(field)s." + +#: forms/models.py:585 +#, 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:591 +#, 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 "" +"Opravte duplicitní data v poli %(field_name)s, které musí být unikátní " +"testem %(lookup)s pole %(date_field)s." + +#: forms/models.py:599 +msgid "Please correct the duplicate values below." +msgstr "Odstraňte duplicitní hodnoty níže." + +#: forms/models.py:852 +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:915 msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "Vyberte platnou možnost. Tato není dostupná." +msgstr "Vyberte platnou možnost. Tato není k dispozici." -#: forms/models.py:645 +#: forms/models.py:989 #, python-format msgid "Select a valid choice. %s is not one of the available choices." -msgstr "Vyberte platnou možnost. Volba %s není dostupná." +msgstr "Vyberte platnou možnost, \"%s\" není k dispozici." -#: template/defaultfilters.py:706 +#: forms/models.py:991 +#, python-format +msgid "\"%s\" is not a valid value for a primary key." +msgstr "Hodnota \"%s\" není platný primární klíč." + +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "ano, ne, možná" -#: template/defaultfilters.py:737 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" -msgstr[0] "%(size)d byte" -msgstr[1] "%(size)d byty" -msgstr[2] "%(size)d bytů" +msgstr[0] "%(size)d bajt" +msgstr[1] "%(size)d bajty" +msgstr[2] "%(size)d bajtů" -#: template/defaultfilters.py:739 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:741 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:742 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "odp." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "dop." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "odp." -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "dop." -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "půlnoc" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "poledne" @@ -4016,52 +4392,47 @@ msgstr[0] "minuta" msgstr[1] "minuty" msgstr[2] "minut" -#: utils/timesince.py:43 +#: utils/timesince.py:45 msgid "minutes" msgstr "minuty" -#: utils/timesince.py:48 +#: utils/timesince.py:50 #, python-format msgid "%(number)d %(type)s" msgstr "%(number)d %(type)s" -#: utils/timesince.py:54 +#: utils/timesince.py:56 #, python-format msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" -#: utils/translation/trans_real.py:403 +#: utils/translation/trans_real.py:399 msgid "DATE_FORMAT" msgstr "j. n. Y" -#: utils/translation/trans_real.py:405 +#: utils/translation/trans_real.py:401 msgid "TIME_FORMAT" msgstr "H:i" -#: utils/translation/trans_real.py:421 +#: utils/translation/trans_real.py:417 msgid "YEAR_MONTH_FORMAT" msgstr "F Y" -#: utils/translation/trans_real.py:422 +#: utils/translation/trans_real.py:418 msgid "MONTH_DAY_FORMAT" msgstr "j. F" #: views/generic/create_update.py:114 #, python-format msgid "The %(verbose_name)s was created successfully." -msgstr "Záznam typu \"%(verbose_name)s\" byl úspěšně vytvořen." +msgstr "Záznam typu %(verbose_name)s byl úspěšně vytvořen." #: views/generic/create_update.py:156 #, python-format msgid "The %(verbose_name)s was updated successfully." -msgstr "Záznam typu \"%(verbose_name)s\" byl úspěšně změněn." +msgstr "Záznam typu %(verbose_name)s byl úspěšně aktualizován." #: views/generic/create_update.py:198 #, python-format msgid "The %(verbose_name)s was deleted." -msgstr "Záznam typu \"%(verbose_name)s\" byl smazán." - -#~ msgid "%(model_name)s with this %(field_labels)s already exists." -#~ msgstr "" -#~ "%(model_name)s s těmito hodnotami v polích \"%(field_labels)s\" již " -#~ "existuje." +msgstr "Záznam typu %(verbose_name)s byl smazán." diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo index 1de523dd36..67d6facc42 100644 Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po index f1f6c9734f..51918c82ec 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.po +++ b/django/conf/locale/da/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-16 20:27+0100\n" +"POT-Creation-Date: 2009-07-26 21:43+0200\n" "PO-Revision-Date: 2008-11-07 20:41+0200\n" "Last-Translator: Finn Gruwier Larsen\n" "Language-Team: \n" @@ -218,6 +218,20 @@ msgstr "Forenklet kinesisk" msgid "Traditional Chinese" msgstr "Traditionelt kinesisk" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "%(count)d %(items)s blev slettet." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 +msgid "Are you sure?" +msgstr "Er du sikker?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Slet valgte %(verbose_name_plural)s" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" @@ -227,43 +241,47 @@ msgstr "" "

        Efter %s:

        \n" "
          \n" -#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91 -#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172 +#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 msgid "All" msgstr "Alle" -#: contrib/admin/filterspecs.py:112 +#: contrib/admin/filterspecs.py:113 msgid "Any date" msgstr "Når som helst" -#: contrib/admin/filterspecs.py:113 +#: contrib/admin/filterspecs.py:114 msgid "Today" msgstr "I dag" -#: contrib/admin/filterspecs.py:116 +#: contrib/admin/filterspecs.py:117 msgid "Past 7 days" msgstr "De sidste 7 dage" -#: contrib/admin/filterspecs.py:118 +#: contrib/admin/filterspecs.py:119 msgid "This month" msgstr "Denne måned" -#: contrib/admin/filterspecs.py:120 +#: contrib/admin/filterspecs.py:121 msgid "This year" msgstr "Dette år" -#: contrib/admin/filterspecs.py:146 forms/widgets.py:390 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Ja" -#: contrib/admin/filterspecs.py:146 forms/widgets.py:390 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Nej" -#: contrib/admin/filterspecs.py:153 forms/widgets.py:390 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Ukendt" +#: contrib/admin/helpers.py:14 +msgid "Action:" +msgstr "Handling" + #: contrib/admin/models.py:19 msgid "action time" msgstr "handlingstid" @@ -292,99 +310,103 @@ msgstr "logmeddelelse" msgid "log entries" msgstr "logmeddelelser" -#: contrib/admin/options.py:60 contrib/admin/options.py:121 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" msgstr "Ingen" -#: contrib/admin/options.py:338 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Ændrede %s." -#: contrib/admin/options.py:338 contrib/admin/options.py:348 -#: contrib/comments/templates/comments/preview.html:15 forms/models.py:288 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "og" -#: contrib/admin/options.py:343 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Tilføjede %(name)s \"%(object)s\"." -#: contrib/admin/options.py:347 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Ændrede %(list)s for %(name)s \"%(object)s\"." -#: contrib/admin/options.py:352 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Slettede %(name)s \"%(object)s\"." -#: contrib/admin/options.py:356 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Ingen felter ændret." -#: contrib/admin/options.py:417 contrib/auth/admin.py:51 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" blev tilføjet i databasen." -#: contrib/admin/options.py:421 contrib/admin/options.py:454 -#: contrib/auth/admin.py:59 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 +#: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Du kan redigere det igen herunder." -#: contrib/admin/options.py:431 contrib/admin/options.py:464 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Du kan tilføje endnu en %s herunder." -#: contrib/admin/options.py:452 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" blev ændret." -#: contrib/admin/options.py:460 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" blev tilføjet. Du kan redigere det igen herunder." -#: contrib/admin/options.py:528 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Tilføj %s" -#: contrib/admin/options.py:559 contrib/admin/options.py:673 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Der findes ikke et %(name)s-objekt med primærnøgle %(key)r." -#: contrib/admin/options.py:606 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Ret %s" -#: contrib/admin/options.py:638 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "databasefejl" -#: contrib/admin/options.py:688 +#: contrib/admin/options.py:941 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s %(name)s blev ændret." +msgstr[1] "%(count)s %(name)s blev ændret." + +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" blev slettet." -#: contrib/admin/options.py:695 -msgid "Are you sure?" -msgstr "Er du sikker?" - -#: contrib/admin/options.py:724 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Ændringshistorik: %s" -#: contrib/admin/sites.py:16 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -393,11 +415,11 @@ msgstr "" "Indtast venligst et korrekt brugernavn og adgangskode. Bemærk, at begge " "felter er versalfølsomme." -#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Log venligst ind igen, da din session er udløbet." -#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -405,62 +427,62 @@ msgstr "" "Det ser ud til din browser ikke er indstillet til at acceptere cookies. Slå " "venligst cookies til, genindlæs denne side og prøv igen." -#: contrib/admin/sites.py:249 contrib/admin/sites.py:255 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Brugernavne kan ikke indeholde tegnet '@'." -#: contrib/admin/sites.py:252 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Din e-mail-adresse er ikke dit brugernavn. Prøv '%s' i stedet." -#: contrib/admin/sites.py:312 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Website-administration" -#: contrib/admin/sites.py:325 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Log ind" -#: contrib/admin/sites.py:372 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "Administration af %s" -#: contrib/admin/util.py:138 +#: contrib/admin/util.py:168 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Et eller flere %(fieldname)s i %(name)s: %(obj)s" -#: contrib/admin/util.py:143 +#: contrib/admin/util.py:173 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Et eller flere %(fieldname)s i %(name)s:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Date:" msgstr "Dato:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Time:" msgstr "Tid:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Currently:" msgstr "Nuværende:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Change:" msgstr "Ret:" -#: contrib/admin/widgets.py:123 +#: contrib/admin/widgets.py:124 msgid "Lookup" msgstr "Slå op" -#: contrib/admin/widgets.py:230 +#: contrib/admin/widgets.py:236 msgid "Add Another" msgstr "Tilføj endnu en" @@ -475,10 +497,11 @@ msgstr "Vi beklager, men den ønskede side kunne ikke findes" #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:8 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 #: contrib/admin/templates/admin/object_history.html:6 #: contrib/admin/templates/admin/auth/user/change_password.html:10 @@ -513,32 +536,40 @@ msgstr "" "Der opstod en fejl. Fejlen er rapporteret til website-administratoren via e-" "mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed." +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Udfør den valgte handling" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Kør" + #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 -#, fuzzy, python-format +#, python-format msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Velkommen," -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentation" -#: contrib/admin/templates/admin/base.html:28 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/admin/base.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" msgstr "Skift adgangskode" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -569,23 +600,24 @@ msgid "View on site" msgstr "Se på website" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/auth/user/change_password.html:22 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Ret venligst fejlen herunder." msgstr[1] "Ret venligst fejlene herunder." -#: contrib/admin/templates/admin/change_list.html:16 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" msgstr "Tilføj %(name)s" -#: contrib/admin/templates/admin/change_list.html:26 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "Filtrer" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 msgid "Delete" msgstr "Slet" @@ -610,9 +642,33 @@ msgstr "" "de følgende relaterede objekter vil blive slettet:" #: contrib/admin/templates/admin/delete_confirmation.html:28 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:33 msgid "Yes, I'm sure" msgstr "Ja, jeg er sikker" +#: contrib/admin/templates/admin/delete_selected_confirmation.html:9 +msgid "Delete multiple objects" +msgstr "Slet flere objekter" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:15 +#, python-format +msgid "" +"Deleting the %(object_name)s would result in deleting related objects, but " +"your account doesn't have permission to delete the following types of " +"objects:" +msgstr "" +"Hvis du sletter %(object_name)s, vil du også slette relaterede objekter, " +"men din konto har ikke rettigheder til at slette følgende objekttyper:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:22 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(object_name)s objects? All of " +"the following objects and it's related items will be deleted:" +msgstr "" +"Er du sikker på du vil slette de valgte %(object_name)s-objekter? Alle " +"de følgende relaterede objekter vil blive slettet:" + #: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " @@ -643,6 +699,10 @@ msgstr "Mine handlinger" msgid "None available" msgstr "Ingen tilgængelige" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Ukendt indhold" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -675,7 +735,7 @@ msgid "Action" msgstr "Funktion" #: contrib/admin/templates/admin/object_history.html:30 -#: utils/translation/trans_real.py:404 +#: utils/translation/trans_real.py:400 msgid "DATETIME_FORMAT" msgstr "j. F Y H:i" @@ -691,9 +751,14 @@ msgstr "" msgid "Show all" msgstr "Vis alle" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Gem" + #: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Kør" +msgid "Search" +msgstr "Søg" #: contrib/admin/templates/admin/search_form.html:10 #, python-format @@ -707,10 +772,6 @@ msgstr[1] "%(counter)s resultater" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s i alt" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Gem" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Gem som ny" @@ -737,23 +798,23 @@ msgid "Username" msgstr "Brugernavn" #: contrib/admin/templates/admin/auth/user/add_form.html:20 -#: contrib/admin/templates/admin/auth/user/change_password.html:33 -#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 msgid "Password" msgstr "Adgangskode" #: contrib/admin/templates/admin/auth/user/add_form.html:26 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/auth/forms.py:185 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/auth/forms.py:186 msgid "Password (again)" msgstr "Adgangskode (igen)" #: contrib/admin/templates/admin/auth/user/add_form.html:27 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 msgid "Enter the same password as above, for verification." msgstr "Indtast den samme adgangskode som ovenfor for verifikation." -#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "Indtast en ny adgangskode for brugeren %(username)s." @@ -917,166 +978,167 @@ msgstr "E-mail-adresse:" msgid "Reset my password" msgstr "Nulstil min adgangskode" -#: contrib/admin/templatetags/admin_list.py:284 +#: contrib/admin/templatetags/admin_list.py:299 msgid "All dates" msgstr "Alle datoer" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s" msgstr "Vælg %s" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s to change" msgstr "Vælg %s, der skal ændres" -#: contrib/admin/views/template.py:36 contrib/sites/models.py:38 +#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 msgid "site" msgstr "website" -#: contrib/admin/views/template.py:38 +#: contrib/admin/views/template.py:39 msgid "template" msgstr "skabelon" -#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59 -#: contrib/admindocs/views.py:61 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "tag:" -#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92 -#: contrib/admindocs/views.py:94 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "filter:" -#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156 -#: contrib/admindocs/views.py:158 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "view:" -#: contrib/admindocs/views.py:186 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Applikationen %r blev ikke fundet" -#: contrib/admindocs/views.py:193 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Modellen %(model_name)r ikke fundet i applikationen %(app_label)r" -#: contrib/admindocs/views.py:205 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "det relaterede `%(app_label)s.%(data_type)s`-objekt" -#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227 -#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "model:" -#: contrib/admindocs/views.py:236 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "relaterede `%(app_label)s.%(object_name)s`-objekter" -#: contrib/admindocs/views.py:241 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "alle %s" -#: contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "antal %s" -#: contrib/admindocs/views.py:251 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Felter på %s-objekter" -#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325 -#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333 -#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Heltal" -#: contrib/admindocs/views.py:315 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Boolsk (enten True eller False)" -#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "Streng (op til %(max_length)s)" -#: contrib/admindocs/views.py:317 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Kommaseparerede heltal" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Dato (uden tid)" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Dato (med tid)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Decimaltal" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "E-mail-adresse" -#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323 -#: contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Sti" -#: contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Flydende-komma-tal" -#: contrib/admindocs/views.py:328 contrib/comments/models.py:58 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "IP-adresse" -#: contrib/admindocs/views.py:330 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Boolsk (True, False eller None)" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Relation til forældermodel" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Telefonnummer" -#: contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Tekst" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Tid" -#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:340 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "Stat (i USA, to store bogstaver)" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "XML-tekst" -#: contrib/admindocs/views.py:367 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s ser ikke ud til at være et urlpattern-objekt" @@ -1168,21 +1230,21 @@ msgstr "Vigtige datoer" msgid "Groups" msgstr "Grupper" -#: contrib/auth/admin.py:64 +#: contrib/auth/admin.py:80 msgid "Add user" msgstr "Tilføj bruger" -#: contrib/auth/admin.py:90 +#: contrib/auth/admin.py:106 msgid "Password changed successfully." msgstr "Adgangskoden blev ændret." -#: contrib/auth/admin.py:96 +#: contrib/auth/admin.py:112 #, python-format msgid "Change password: %s" msgstr "Skift adgangskode: %s" #: contrib/auth/forms.py:15 contrib/auth/forms.py:48 -#: contrib/auth/models.py:127 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." @@ -1202,8 +1264,8 @@ msgstr "Bekræftelse af adgangskode" msgid "A user with that username already exists." msgstr "En bruger med dette brugernavn findes allerede." -#: contrib/auth/forms.py:36 contrib/auth/forms.py:154 -#: contrib/auth/forms.py:196 +#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:197 msgid "The two password fields didn't match." msgstr "De to adgangskoder var ikke identiske." @@ -1231,24 +1293,24 @@ msgstr "" "Den e-mail-adresse er ikke tilknyttet en konto. Er du sikker på at du har " "registreret dig?" -#: contrib/auth/forms.py:134 +#: contrib/auth/forms.py:135 #, python-format msgid "Password reset on %s" msgstr "Adgangskode nulstillet på %s" -#: contrib/auth/forms.py:142 +#: contrib/auth/forms.py:143 msgid "New password" msgstr "Ny adgangskode" -#: contrib/auth/forms.py:143 +#: contrib/auth/forms.py:144 msgid "New password confirmation" msgstr "Bekræftelse af ny adgangskode" -#: contrib/auth/forms.py:168 +#: contrib/auth/forms.py:169 msgid "Old password" msgstr "Gammel adgangskode" -#: contrib/auth/forms.py:176 +#: contrib/auth/forms.py:177 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Din gamle adgangskode blev ikke indtastet korrekt. Indtast den venligst igen." @@ -1273,31 +1335,31 @@ msgstr "rettigheder" msgid "group" msgstr "gruppe" -#: contrib/auth/models.py:91 contrib/auth/models.py:137 +#: contrib/auth/models.py:91 contrib/auth/models.py:138 msgid "groups" msgstr "grupper" -#: contrib/auth/models.py:127 +#: contrib/auth/models.py:128 msgid "username" msgstr "brugernavn" -#: contrib/auth/models.py:128 +#: contrib/auth/models.py:129 msgid "first name" msgstr "fornavn" -#: contrib/auth/models.py:129 +#: contrib/auth/models.py:130 msgid "last name" msgstr "efternavn" -#: contrib/auth/models.py:130 +#: contrib/auth/models.py:131 msgid "e-mail address" msgstr "e-mail-adresse" -#: contrib/auth/models.py:131 +#: contrib/auth/models.py:132 msgid "password" msgstr "adgangskode" -#: contrib/auth/models.py:131 +#: contrib/auth/models.py:132 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." @@ -1305,19 +1367,19 @@ msgstr "" "Brug '[algo]$[salt]$[hexdigest]' eller brug formularen " "til skift af adgangskode." -#: contrib/auth/models.py:132 +#: contrib/auth/models.py:133 msgid "staff status" msgstr "admin-status" -#: contrib/auth/models.py:132 +#: contrib/auth/models.py:133 msgid "Designates whether the user can log into this admin site." msgstr "Bestemmer om brugeren kan logge ind på dette administrationswebsite." -#: contrib/auth/models.py:133 +#: contrib/auth/models.py:134 msgid "active" msgstr "aktiv" -#: contrib/auth/models.py:133 +#: contrib/auth/models.py:134 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -1325,26 +1387,26 @@ msgstr "" "Bestemmer om brugeren skal behandles som aktiv. Fravælg dette frem for at " "slette en konto." -#: contrib/auth/models.py:134 +#: contrib/auth/models.py:135 msgid "superuser status" msgstr "superbrugerstatus" -#: contrib/auth/models.py:134 +#: contrib/auth/models.py:135 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Bestemmer at denne bruger har alle rettigheder uden at tildele dem eksplicit." -#: contrib/auth/models.py:135 +#: contrib/auth/models.py:136 msgid "last login" msgstr "sidst logget ind" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:137 msgid "date joined" msgstr "dato for registrering" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:139 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." @@ -1352,27 +1414,28 @@ msgstr "" "Udover de rettigheder, der manuelt er tildelt brugeren, vil denne også få " "alle rettigheder, der er tildelt hver gruppe, brugeren er medlem af." -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:140 msgid "user permissions" msgstr "Rettigheder" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "bruger" -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:145 msgid "users" msgstr "brugere" -#: contrib/auth/models.py:300 +#: contrib/auth/models.py:301 msgid "message" msgstr "meddelelse" -#: contrib/auth/views.py:50 +#: contrib/auth/views.py:56 msgid "Logged out" msgstr "Logget ud" -#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428 +#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 msgid "Enter a valid e-mail address." msgstr "Indtast en gyldig e-mail-adresse." @@ -1384,73 +1447,88 @@ msgstr "Indhold" msgid "Metadata" msgstr "Metadata" -#: contrib/comments/forms.py:19 +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "kommentarer på %(site_name)s" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Seneste kommentarer på %(site_name)s" + +#: contrib/comments/forms.py:93 #: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" msgstr "Navn" -#: contrib/comments/forms.py:20 +#: contrib/comments/forms.py:94 msgid "Email address" msgstr "E-mail-adresse" -#: contrib/comments/forms.py:22 +#: contrib/comments/forms.py:96 #: contrib/comments/templates/comments/moderation_queue.html:35 msgid "Comment" msgstr "Kommentar" -#: contrib/comments/forms.py:25 -msgid "" -"If you enter anything in this field your comment will be treated as spam" -msgstr "" -"Hvis du indtaster noget i dette felt, vil din kommentar blive betragtet som " -"spam." - -#: contrib/comments/forms.py:125 +#: contrib/comments/forms.py:173 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Var din mund! Ordet %s er ikke tilladt her." msgstr[1] "Var din mund! Ordene %s er ikke tilladt her." -#: contrib/comments/models.py:23 +#: contrib/comments/forms.py:180 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "" +"Hvis du indtaster noget i dette felt, vil din kommentar blive betragtet som " +"spam." + +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "indholdstype" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "objekt-ID" -#: contrib/comments/models.py:50 +#: contrib/comments/models.py:52 msgid "user's name" msgstr "brugerens navn" -#: contrib/comments/models.py:51 +#: contrib/comments/models.py:53 msgid "user's email address" msgstr "brugerens e-mail-adresse" -#: contrib/comments/models.py:52 +#: contrib/comments/models.py:54 msgid "user's URL" msgstr "brugerens URL" -#: contrib/comments/models.py:54 +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "kommentar" -#: contrib/comments/models.py:57 +#: contrib/comments/models.py:59 msgid "date/time submitted" msgstr "dato/tidspunkt for oprettelse" -#: contrib/comments/models.py:59 +#: contrib/comments/models.py:61 msgid "is public" msgstr "er offentlig" -#: contrib/comments/models.py:60 +#: contrib/comments/models.py:62 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "" "Hvis du fjerner afkrydsningen her, bliver din kommentar slettet fra sitet." -#: contrib/comments/models.py:62 +#: contrib/comments/models.py:64 msgid "is removed" msgstr "er fjernet" -#: contrib/comments/models.py:63 +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." @@ -1458,7 +1536,11 @@ msgstr "" "Afkryds denne boks, hvis kommentaren er upassende. Beskeden \"Denne " "kommentar er blevet fjernet\" vil blive vist i stedet." -#: contrib/comments/models.py:115 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "kommentarer" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." @@ -1466,7 +1548,7 @@ msgstr "" "Denne kommentar blev indsendt af en autenticeret bruger; derfor er navnet " "skrivebeskyttet." -#: contrib/comments/models.py:124 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." @@ -1474,7 +1556,7 @@ msgstr "" "Denne kommentar blev indsendt af en autenticeret bruger; derfor er e-mail-" "adressen skrivebeskyttet." -#: contrib/comments/models.py:149 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1489,6 +1571,22 @@ msgstr "" "\n" "http://%(domain)s%(url)s" +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "Flag" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "dato" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "kommentarflag" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "kommentarflag" + #: contrib/comments/templates/comments/approve.html:4 msgid "Approve a comment" msgstr "Godkend en kommentar" @@ -1548,13 +1646,13 @@ msgstr "Flag" msgid "Thanks for flagging" msgstr "Tak for flagningen" -#: contrib/comments/templates/comments/form.html:16 -#: contrib/comments/templates/comments/preview.html:31 +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 msgid "Post" msgstr "Indsend" -#: contrib/comments/templates/comments/form.html:17 -#: contrib/comments/templates/comments/preview.html:32 +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 msgid "Preview" msgstr "Forhåndsvis" @@ -1600,33 +1698,29 @@ msgid "Thank you for your comment" msgstr "Tak for kommentaren" #: contrib/comments/templates/comments/preview.html:4 -#: contrib/comments/templates/comments/preview.html:12 +#: contrib/comments/templates/comments/preview.html:13 msgid "Preview your comment" msgstr "Forhåndsvis kommentar" -#: contrib/comments/templates/comments/preview.html:10 +#: contrib/comments/templates/comments/preview.html:11 msgid "Please correct the error below" msgid_plural "Please correct the errors below" msgstr[0] "Ret venligst fejlen herunder." msgstr[1] "Ret venligst fejlene herunder." -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "Post your comment" msgstr "Indsend din kommentar" -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "or make changes" msgstr "eller gennemfør ændringer" -#: contrib/contenttypes/models.py:67 +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "klassenavn i Python-model" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "indholdstype" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "indholdstyper" @@ -1699,18 +1793,24 @@ msgstr "" "Tiden er udløbet - vi beklager. Vær venlig at fortsætte med at udfylde " "formularen på denne side." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Ingen værdi givet for geometri." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Ugyldig geometriværdi." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Ugyldig gemometritype." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "." @@ -2029,6 +2129,82 @@ msgstr "Indtast en gyldig chilensk RUT. Formatet er XX.XXX.XXX-X." msgid "The Chilean RUT is not valid." msgstr "Den chilenske RUT er ugyldig." +#: contrib/localflavor/cz/cz_regions.py:8 +msgid "Prague" +msgstr "Prag" + +#: contrib/localflavor/cz/cz_regions.py:9 +msgid "Central Bohemian Region" +msgstr "Centrale Böhmen" + +#: contrib/localflavor/cz/cz_regions.py:10 +msgid "South Bohemian Region" +msgstr "Sydlige Böhmen" + +#: contrib/localflavor/cz/cz_regions.py:11 +msgid "Pilsen Region" +msgstr "Pilsen-regionen" + +#: contrib/localflavor/cz/cz_regions.py:12 +msgid "Carlsbad Region" +msgstr "Carlsbad-regionen" + +#: contrib/localflavor/cz/cz_regions.py:13 +msgid "Usti Region" +msgstr "Usti-regionen" + +#: contrib/localflavor/cz/cz_regions.py:14 +msgid "Liberec Region" +msgstr "Liberec-regionen" + +#: contrib/localflavor/cz/cz_regions.py:15 +msgid "Hradec Region" +msgstr "Hradec-regionen" + +#: contrib/localflavor/cz/cz_regions.py:16 +msgid "Pardubice Region" +msgstr "Pardubice-region" + +#: contrib/localflavor/cz/cz_regions.py:17 +msgid "Vysocina Region" +msgstr "Vysocina region" + +#: contrib/localflavor/cz/cz_regions.py:18 +msgid "South Moravian Region" +msgstr "Sydmoravien" + +#: contrib/localflavor/cz/cz_regions.py:19 +msgid "Olomouc Region" +msgstr "Olomuc-regionen" + +#: contrib/localflavor/cz/cz_regions.py:20 +msgid "Zlin Region" +msgstr "Zlin-regionen" + +#: contrib/localflavor/cz/cz_regions.py:21 +msgid "Moravian-Silesian Region" +msgstr "Moravien-Silesien" + +#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "Indtast et postnr. i format XXXXX eller XXX XX." + +#: contrib/localflavor/cz/forms.py:47 +msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." +msgstr "Indtast et fødselsnr. i formatet XXXXXX/XXXX or XXXXXXXXXX." + +#: contrib/localflavor/cz/forms.py:48 +msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" +msgstr "Ugyldig værdi for køn. Gyldige værdier er 'f' og 'm'." + +#: contrib/localflavor/cz/forms.py:49 +msgid "Enter a valid birth number." +msgstr "Indtast et gyldigt fødselsnummer." + +#: contrib/localflavor/cz/forms.py:106 +msgid "Enter a valid IC number." +msgstr "Indtast et IC-nummer." + #: contrib/localflavor/de/de_states.py:5 msgid "Baden-Wuerttemberg" msgstr "Baden-Wuerttemberg" @@ -2096,7 +2272,7 @@ msgstr "Thuringia" #: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 #: contrib/localflavor/fr/forms.py:15 msgid "Enter a zip code in the format XXXXX." -msgstr "" +msgstr "Indtast et postnummer i formatet XXXXX" #: contrib/localflavor/de/forms.py:41 msgid "" @@ -2766,15 +2942,15 @@ msgstr "Zacatecas" #: contrib/localflavor/nl/forms.py:21 msgid "Enter a valid postal code" -msgstr "" +msgstr "Indtast et gyldigt postnummer" #: contrib/localflavor/nl/forms.py:52 msgid "Enter a valid phone number" -msgstr "" +msgstr "Indtast et gyldigt telefonnummer" #: contrib/localflavor/nl/forms.py:78 msgid "Enter a valid SoFi number" -msgstr "" +msgstr "Indtast et gyldigt SoFi-nummer" #: contrib/localflavor/nl/nl_provinces.py:4 msgid "Drenthe" @@ -2853,15 +3029,15 @@ msgstr "Indtast et NIP i formatet XXX-XXX-XX-XX or XX-XX-XXX-XXX." msgid "Wrong checksum for the Tax Number (NIP)." msgstr "Forkert kontrolsum for NIP. " -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." -msgstr "REGON skal består af 7 eller 9 cifre." +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." +msgstr "National Business Register Number (REGON) består af 9 eller 14 cifre." -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." -msgstr "Foerkert kontrolsum for REGON." +msgstr "Forkert kontrolsum for REGON-nr." -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." msgstr "Indtast et postnummer i formatet XX-XXX." @@ -2949,10 +3125,6 @@ msgstr "Telefinnumre skal være i formatet XXXX-XXXXXX." msgid "Enter a valid postal code in the format XXXXXX" msgstr "Indtast et gyldigt postnummer i formatet XXXXXX" -#: contrib/localflavor/sk/forms.py:30 -msgid "Enter a postal code in the format XXXXX or XXX XX." -msgstr "Indtast et postnr. i format XXXXX eller XXX XX." - #: contrib/localflavor/sk/sk_districts.py:8 msgid "Banska Bystrica" msgstr "Banska Bystrica" @@ -3639,7 +3811,7 @@ msgstr "Western Cape" #: contrib/redirects/models.py:7 msgid "redirect from" -msgstr "" +msgstr "rediriger fra" #: contrib/redirects/models.py:8 msgid "" @@ -3651,7 +3823,7 @@ msgstr "" #: contrib/redirects/models.py:9 msgid "redirect to" -msgstr "omadresser til" +msgstr "rediriger til" #: contrib/redirects/models.py:10 msgid "" @@ -3663,11 +3835,11 @@ msgstr "" #: contrib/redirects/models.py:13 msgid "redirect" -msgstr "omadresser" +msgstr "rediriger" #: contrib/redirects/models.py:14 msgid "redirects" -msgstr "omaddresseringer" +msgstr "redirigeringer" #: contrib/sessions/models.py:45 msgid "session key" @@ -3701,55 +3873,59 @@ msgstr "vist navn" msgid "sites" msgstr "websites" -#: db/models/fields/__init__.py:348 db/models/fields/__init__.py:683 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "Denne værdi skal et heltal." -#: db/models/fields/__init__.py:379 +#: db/models/fields/__init__.py:388 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:412 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Dette felt kan ikke være null." -#: db/models/fields/__init__.py:428 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "Indtast kun cifre adskilt af kommaer." -#: db/models/fields/__init__.py:459 +#: db/models/fields/__init__.py:474 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Indtast en gyldig dato i formatet ÅÅÅÅ-MM-DD." -#: db/models/fields/__init__.py:468 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Ugyldig dato: %s" -#: db/models/fields/__init__.py:532 db/models/fields/__init__.py:550 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 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:586 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." msgstr "Denne værdi skal et decimaltal." -#: db/models/fields/__init__.py:719 +#: db/models/fields/__init__.py:686 +msgid "This value must be a float." +msgstr "Denne værdi skal være et kommatal." + +#: db/models/fields/__init__.py:746 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:817 db/models/fields/__init__.py:831 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 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/related.py:761 +#: db/models/fields/related.py:816 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." -#: db/models/fields/related.py:838 -#, fuzzy, python-format +#: db/models/fields/related.py:894 +#, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" "Please enter valid %(self)s IDs. The values %(value)r are invalid." @@ -3810,31 +3986,37 @@ msgstr "Der må højst være %s decimalpladser." 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:287 forms/fields.py:849 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Indtast en gyldig dato." -#: forms/fields.py:321 forms/fields.py:850 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Indtast en gyldig tid." -#: forms/fields.py:360 +#: forms/fields.py:361 msgid "Enter a valid date/time." msgstr "Indtast gyldig dato/tid." -#: forms/fields.py:446 +#: forms/fields.py:447 msgid "No file was submitted. Check the encoding type on the form." msgstr "Ingen fil blev indsendt. Kontroller kodningstypen i formularen." -#: forms/fields.py:447 +#: forms/fields.py:448 msgid "No file was submitted." msgstr "Ingen fil blev indsendt." -#: forms/fields.py:448 +#: forms/fields.py:449 msgid "The submitted file is empty." msgstr "Den indsendte fil er tom." -#: forms/fields.py:477 +#: forms/fields.py:450 +#, 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:483 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -3842,107 +4024,141 @@ msgstr "" "Indsend en billedfil. Filen, du indsendte, var enten ikke et billede eller " "en defekt billedfil." -#: forms/fields.py:538 +#: forms/fields.py:544 msgid "Enter a valid URL." msgstr "Indtast en gyldig URL." -#: forms/fields.py:539 +#: forms/fields.py:545 msgid "This URL appears to be a broken link." msgstr "Denne URL henviser ikke til en gyldig side eller fil." -#: forms/fields.py:618 forms/fields.py:696 +#: forms/fields.py:625 forms/fields.py:703 #, 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:697 forms/fields.py:758 forms/models.py:714 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Indtast en liste af værdier." -#: forms/fields.py:878 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Indtast en gyldig IPv4-adresse." -#: forms/fields.py:888 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Dette felt må kun indeholde bogstaver, cifre, understreger og bindestreger." -#: forms/formsets.py:242 forms/formsets.py:244 +#: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Rækkefølge" -#: forms/models.py:281 forms/models.py:290 +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s med dette %(field_label)s eksisterer allerede." -#: forms/models.py:581 -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:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Ret venligst duplikerede data for %(field)s." -#: forms/models.py:644 +#: forms/models.py:598 +#, 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:604 +#, 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." + +#: forms/models.py:612 +msgid "Please correct the duplicate values below." +msgstr "Ret venligst de duplikerede data herunder." + +#: forms/models.py:867 +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:930 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:715 +#: forms/models.py:1004 #, 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." -#: template/defaultfilters.py:743 +#: forms/models.py:1006 +#, 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." + +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "ja,nej,måske" -#: template/defaultfilters.py:774 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d byte" msgstr[1] "%(size)d bytes" -#: template/defaultfilters.py:776 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:778 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:779 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "p.m." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "a.m." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "PM" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "AM" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "midnat" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "middag" @@ -4166,33 +4382,33 @@ msgid_plural "minutes" msgstr[0] "minut" msgstr[1] "minutter" -#: utils/timesince.py:43 +#: utils/timesince.py:45 msgid "minutes" msgstr "minutter" -#: utils/timesince.py:48 +#: utils/timesince.py:50 #, python-format msgid "%(number)d %(type)s" msgstr "%(number)d %(type)s" -#: utils/timesince.py:54 +#: utils/timesince.py:56 #, python-format msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" -#: utils/translation/trans_real.py:403 +#: utils/translation/trans_real.py:399 msgid "DATE_FORMAT" msgstr "j. F Y" -#: utils/translation/trans_real.py:405 +#: utils/translation/trans_real.py:401 msgid "TIME_FORMAT" msgstr "H:i" -#: utils/translation/trans_real.py:421 +#: utils/translation/trans_real.py:417 msgid "YEAR_MONTH_FORMAT" msgstr "F Y" -#: utils/translation/trans_real.py:422 +#: utils/translation/trans_real.py:418 msgid "MONTH_DAY_FORMAT" msgstr "j. F" @@ -4211,404 +4427,3 @@ msgstr "%(verbose_name)s blev opdateret." msgid "The %(verbose_name)s was deleted." msgstr "%(verbose_name)s blev slettet." -#~ msgid "headline" -#~ msgstr "overskrift" - -#~ msgid "rating #1" -#~ msgstr "bedømmelse: 1" - -#~ msgid "rating #2" -#~ msgstr "bedømmelse: 2" - -#~ msgid "rating #3" -#~ msgstr "bedømmelse: 3" - -#~ msgid "rating #4" -#~ msgstr "bedømmelse: 4" - -#~ msgid "rating #5" -#~ msgstr "bedømmelse: 5" - -#~ msgid "rating #6" -#~ msgstr "bedømmelse: 6" - -#~ msgid "rating #7" -#~ msgstr "bedømmelse: 7" - -#~ msgid "rating #8" -#~ msgstr "bedømmelse: 8" - -#~ msgid "is valid rating" -#~ msgstr "er en gyldig bedømmelse" - -#~ msgid "comments" -#~ msgstr "kommentarer" - -#~ msgid "Content object" -#~ msgstr "Indholdsobjekt" - -#~ msgid "person's name" -#~ msgstr "personens navn" - -#~ msgid "ip address" -#~ msgstr "IP-adresse" - -#~ msgid "approved by staff" -#~ msgstr "godkendt af personale" - -#~ msgid "free comments" -#~ msgstr "frie kommentarer" - -#~ msgid "score" -#~ msgstr "score" - -#~ msgid "score date" -#~ msgstr "scoringsdato" - -#~ msgid "karma score" -#~ msgstr "karma-score" - -#~ msgid "karma scores" -#~ msgstr "karma-scores" - -#~ msgid "%(score)d rating by %(user)s" -#~ msgstr "%(score)d bedømmelse efter %(user)s" - -#~ msgid "" -#~ "This comment was flagged by %(user)s:\n" -#~ "\n" -#~ "%(text)s" -#~ msgstr "" -#~ "Denne kommentar blev mærket af %(user)s:\n" -#~ "\n" -#~ "%(text)s" - -#~ msgid "flag date" -#~ msgstr "mærkningsdato" - -#~ msgid "user flag" -#~ msgstr "brugermærke" - -#~ msgid "user flags" -#~ msgstr "brugermærker" - -#~ msgid "Flag by %r" -#~ msgstr "Mærket af %r" - -#~ msgid "deletion date" -#~ msgstr "sletningsdato" - -#~ msgid "moderator deletion" -#~ msgstr "moderatorsletning" - -#~ msgid "moderator deletions" -#~ msgstr "moderatorsletninger" - -#~ msgid "Moderator deletion by %r" -#~ msgstr "Moderatorsletning af %r" - -#~ msgid "Forgotten your password?" -#~ msgstr "Har du glemt din adgangskode?" - -#~ msgid "Ratings" -#~ msgstr "Bedømmelser" - -#~ msgid "Required" -#~ msgstr "Påkrævet" - -#~ msgid "Optional" -#~ msgstr "Valgfri" - -#~ msgid "Post a photo" -#~ msgstr "Indsend et foto" - -#~ msgid "Your name:" -#~ msgstr "Dit navn:" - -#~ msgid "" -#~ "This rating is required because you've entered at least one other rating." -#~ msgstr "" -#~ "Denne bedømmelse er påkrævet fordi du har indtastet mindst en anden " -#~ "bedømmelse." - -#~ msgid "" -#~ "This comment was posted by a user who has posted fewer than %(count)s " -#~ "comment:\n" -#~ "\n" -#~ "%(text)sThis comment was posted by a user who has posted fewer than %" -#~ "(count)s comments:\n" -#~ "\n" -#~ "%(text)s" -#~ msgstr "" -#~ "Denne kommentar blev indsendt af en bruger, som har indsendt færre end %" -#~ "(count)s kommentar:\n" -#~ "\n" -#~ "%(text)sDenne kommentar blev indsendt af en bruger som har indsendt færre " -#~ "end %(count)s kommentarer:\n" -#~ "\n" -#~ "%(text)s" - -#~ msgid "Only POSTs are allowed" -#~ msgstr "Kun POST er tilladt" - -#~ msgid "One or more of the required fields wasn't submitted" -#~ msgstr "Et eller flere af de påkrævede felter blev ikke indsendt" - -#~ msgid "Somebody tampered with the comment form (security violation)" -#~ msgstr "Nogen har misbrugt kommentarformularen (sikkerhedsovertrædelse)" - -#~ msgid "" -#~ "The comment form had an invalid 'target' parameter -- the object ID was " -#~ "invalid" -#~ msgstr "" -#~ "Kommentarformularen havde en ugyldigt 'target'-parameter - objekt-ID'et " -#~ "var ugyldigt" - -#~ msgid "The comment form didn't provide either 'preview' or 'post'" -#~ msgstr "" -#~ "Kommentarformularen tilbød ikke hverken 'forhåndsvis' eller 'indsend'" - -#~ msgid "Anonymous users cannot vote" -#~ msgstr "Anonyme brugere kan ikke stemme" - -#~ msgid "Invalid comment ID" -#~ msgstr "Ugyldigt kommentar-ID" - -#~ msgid "No voting for yourself" -#~ msgstr "Du kan ikke selv stemme" - -#~ msgid "Uppercase letters are not allowed here." -#~ msgstr "Store bogstaver er ikke tilladt her." - -#~ msgid "Lowercase letters are not allowed here." -#~ msgstr "Små bogstaver er ikke tilladt her." - -#~ msgid "Enter valid e-mail addresses separated by commas." -#~ msgstr "Indtast gyldige e-mail-adresser adskilt af kommaer." - -#~ msgid "Please enter a valid IP address." -#~ msgstr "Indtast venligst en gyldig IP-adresse." - -#~ msgid "Empty values are not allowed here." -#~ msgstr "Dette felt må ikke være tomt." - -#~ msgid "Non-numeric characters aren't allowed here." -#~ msgstr "Ikke-numeriske tegn er ikke tilladt her." - -#~ msgid "This value can't be comprised solely of digits." -#~ msgstr "Denne værdi kan ikke udelukkende bestå af cifre." - -#~ msgid "Only alphabetical characters are allowed here." -#~ msgstr "Her er kun bogstaver tilladt." - -#~ msgid "Enter a valid time in HH:MM format." -#~ msgstr "Indtast en gyldig tid i formatet TT:MM." - -#~ msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -#~ msgstr "Indtast dato og tidspunkt i formatet ÅÅÅÅ-MM-DD TT:MM." - -#~ msgid "The URL %s does not point to a valid image." -#~ msgstr "URL'en %s henviser ikke til en gyldig billedfil." - -#~ msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -#~ msgstr "Telefonnumre skal være i formatet XXX-XXX-XXXX. \"%s\" er ugyldigt." - -#~ msgid "The URL %s does not point to a valid QuickTime video." -#~ msgstr "URL'en %s henviser ikke til en gyldig QuickTime-video." - -#~ msgid "A valid URL is required." -#~ msgstr "En gyldig URL er påkrævet." - -#~ msgid "" -#~ "Valid HTML is required. Specific errors are:\n" -#~ "%s" -#~ msgstr "" -#~ "Gyldig HTML er påkrævet. Specifikke fejl:\n" -#~ "%s" - -#~ msgid "Badly formed XML: %s" -#~ msgstr "Ugyldig XML: %s" - -#~ msgid "Invalid URL: %s" -#~ msgstr "Ugyldig URL: %s" - -#~ msgid "The URL %s is a broken link." -#~ msgstr "Denne URL %s henviser ikke til en gyldig side eller fil." - -#~ msgid "Enter a valid U.S. state abbreviation." -#~ msgstr "Indtast en gyldig amerikansk statsforkortelse." - -#~ msgid "This field must match the '%s' field." -#~ msgstr "Dette felt skal matche feltet '%s'." - -#~ msgid "Please enter something for at least one field." -#~ msgstr "Indtast venligst noget i mindst ét felt" - -#~ msgid "Please enter both fields or leave them both empty." -#~ msgstr "Udfyld venligst begge felter eller lad dem begge være tomme." - -#~ msgid "This field must be given if %(field)s is %(value)s" -#~ msgstr "Dette felt skal udfyldes, hvis %(field)s er lig %(value)s." - -#~ msgid "This field must be given if %(field)s is not %(value)s" -#~ msgstr "" -#~ "Dette felt skal udfyldes, hvis %(field)s er forskellig fra %(value)s." - -#~ msgid "Duplicate values are not allowed." -#~ msgstr "Identiske værdier er ikke tilladt." - -#~ msgid "This value must be between %(lower)s and %(upper)s." -#~ msgstr "Denne værdi skal være mellem %(lower)s og %(upper)s." - -#~ msgid "This value must be at least %s." -#~ msgstr "Denne værdi skal være en mindst %s." - -#~ msgid "This value must be no more than %s." -#~ msgstr "Denne værdi må højst være %s." - -#~ msgid "This value must be a power of %s." -#~ msgstr "Denne værdi skal være en potens af %s." - -#~ msgid "Please enter a valid decimal number." -#~ msgstr "Indtast venligst et gyldigt decimaltal." - -#~ msgid "" -#~ "Please enter a valid decimal number with at most %s total digit.Please " -#~ "enter a valid decimal number with at most %s total digits." -#~ msgstr "" -#~ "Indtast venligst et gyldigt decimaltal med %s ciffer.Indtast venligst et " -#~ "gyldigt decimaltal med maksimalt %s cifre i alt." - -#~ msgid "" -#~ "Please enter a valid decimal number with a whole part of at most %s digit." -#~ "Please enter a valid decimal number with a whole part of at most %s " -#~ "digits." -#~ msgstr "" -#~ "Indtast venligst et gyldigt decimaltal med en heltalsdel på %s cifre." -#~ "Indtast venligst et gyldigt decimaltal med en heltalsdel på maksimalt %s " -#~ "cifre." - -#~ msgid "" -#~ "Please enter a valid decimal number with at most %s decimal place. Please " -#~ "enter a valid decimal number with at most %s decimal places." -#~ msgstr "" -#~ "Indtast venligst et gyldigt decimaltal med %s cifre efter kommaet. " -#~ "Indtast venligst et gyldigt decimaltal med maksimalt %s cifre efter " -#~ "kommaet." - -#~ msgid "Please enter a valid floating point number." -#~ msgstr "Indtast venligst et gyldigt flydende-komma-tal." - -#~ msgid "Make sure your uploaded file is at least %s bytes big." -#~ msgstr "Kontroller, at den fil, du uploader, er på mindst %s bytes." - -#~ msgid "Make sure your uploaded file is at most %s bytes big." -#~ msgstr "Kontroller, at den fil, du uploader, er på maksimalt %s bytes." - -#~ msgid "The format for this field is wrong." -#~ msgstr "Formatet i dette felt er forkert." - -#~ msgid "This field is invalid." -#~ msgstr "Dette felt er ugyldigt." - -#~ msgid "Could not retrieve anything from %s." -#~ msgstr "Kunne ikke finde noget i %s." - -#~ msgid "" -#~ "The URL %(url)s returned the invalid Content-Type header '%(contenttype)" -#~ "s'." -#~ msgstr "" -#~ "URL'en %(url)s returnerede det ugyldige indholdstypehoved '%(contenttype)" -#~ "s'." - -#~ msgid "" -#~ "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts " -#~ "with \"%(start)s\".)" -#~ msgstr "" -#~ "Luk venligst det uafsluttede tag %(tag)s fra linje %(line)s. (Linjen " -#~ "starter med \"%(start)s\".)" - -#~ msgid "" -#~ "Some text starting on line %(line)s is not allowed in that context. (Line " -#~ "starts with \"%(start)s\".)" -#~ msgstr "" -#~ "Noget tekst, som starter på linje %(line)s, er ikke tilladt i den givne " -#~ "sammenhæng. (Linjen starter med \"%(start)s\".)" - -#~ msgid "" -#~ "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with " -#~ "\"%(start)s\".)" -#~ msgstr "" -#~ "\"%(attr)s\" på linje %(line)s er ikke en gyldig attribut. (Linjen " -#~ "starter med \"%(start)s\".)" - -#~ msgid "" -#~ "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" -#~ "(start)s\".)" -#~ msgstr "" -#~ "\"<%(tag)s>\" på linje %(line)s er et ugyldigt tag. (Linjen starter med " -#~ "\"%(start)s\".)" - -#~ msgid "" -#~ "A tag on line %(line)s is missing one or more required attributes. (Line " -#~ "starts with \"%(start)s\".)" -#~ msgstr "" -#~ "Et tag på linje %(line)s mangler en eller flere påkrævede attributter. " -#~ "(Linjen starter med \"%(start)s\".)" - -#~ msgid "" -#~ "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " -#~ "starts with \"%(start)s\".)" -#~ msgstr "" -#~ "Attributten \"%(attr)s\" på linje %(line)s har en ugyldig værdi. (Linjen " -#~ "starter med \"%(start)s\".)" - -#~ msgid "" -#~ "%(object)s with this %(type)s already exists for the given %(field)s." -#~ msgstr "" -#~ "%(object)s med denne %(type)s eksisterer allerede for den givne %(field)s." - -#~ msgid "Enter a valid filename." -#~ msgstr "Indtast et gyldigt filnavn." - -#~ msgid "Please enter a valid %s." -#~ msgstr "Indtast venligst en gyldig %s." - -#~ msgid "Ensure your text is less than %s character." -#~ msgstr "Sørg for din tekst er kortere end %s tegn." - -#~ msgid "Line breaks are not allowed here." -#~ msgstr "Linjeskift er ikke tilladt her." - -#~ msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -#~ msgstr "Markér et gyldigt valg; '%(data)s' er ikke i %(choices)s." - -#~ msgid "Enter a whole number between -32,768 and 32,767." -#~ msgstr "Indtast et heltal mellem -32,768 og 32,767." - -#~ msgid "Enter a positive number." -#~ msgstr "Indtast et positivt tal." - -#~ msgid "Enter a whole number between 0 and 32,767." -#~ msgstr "Indtast et heltal mellem 0 og 32,767." - -#~ msgid "Added %s." -#~ msgstr "Tilføjede %s." - -#~ msgid "Deleted %s." -#~ msgstr "Slettede %s." - -#~ msgid "Have you forgotten your password?" -#~ msgstr "Har du glemt din adgangskode?" - -#~ msgid "Your new password is: %(new_password)s" -#~ msgstr "Din nye adgangskode er: %(new_password)s" - -#~ msgid "Feel free to change this password by going to this page:" -#~ msgstr "Du kan ændre din adgangskode ved at gå til denne side:" - -#~ msgid "Use '[algo]$[salt]$[hexdigest]'" -#~ msgstr "Brug '[algo]$[salt]$[hexdigest]'" - -#~ msgid "Separate multiple IDs with commas." -#~ msgstr "Adskil flere ID'er med kommaer." diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 7c3805ffe1..a0e99faa21 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index fb896fb3c3..199fab4b1d 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -1,13 +1,13 @@ # Translation of django.po to German # -# Copyright (C) 2005-2008, +# Copyright (C) 2005-2009, # This file is distributed under the same license as the django package. # msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-28 09:32+0200\n" +"POT-Creation-Date: 2009-07-23 18:58+0200\n" "PO-Revision-Date: 2008-08-28 22:58+0100\n" "Last-Translator: Jannis Leidel \n" "Language-Team: \n" @@ -223,16 +223,16 @@ msgstr "Vereinfachtes Chinesisch" msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" -#: contrib/admin/actions.py:56 +#: contrib/admin/actions.py:60 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Erfolgreich %(count)d %(items)s gelöscht." -#: contrib/admin/actions.py:63 contrib/admin/options.py:1025 +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: contrib/admin/actions.py:81 +#: contrib/admin/actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Ausgewählte %(verbose_name_plural)s löschen" @@ -271,15 +271,15 @@ msgstr "Diesen Monat" msgid "This year" msgstr "Dieses Jahr" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Ja" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Nein" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Unbekannt" @@ -325,7 +325,8 @@ msgid "Changed %s." msgstr "%s geändert." #: contrib/admin/options.py:519 contrib/admin/options.py:529 -#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "und" @@ -348,27 +349,27 @@ msgstr "%(name)s \"%(object)s\" gelöscht." msgid "No fields changed." msgstr "Keine Felder geändert." -#: contrib/admin/options.py:598 contrib/auth/admin.py:67 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt." -#: contrib/admin/options.py:602 contrib/admin/options.py:635 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Das Element kann jetzt erneut bearbeitet werden." -#: contrib/admin/options.py:612 contrib/admin/options.py:645 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Es kann ein weiteres Element des Typs %s angelegt werden." -#: contrib/admin/options.py:633 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert." -#: contrib/admin/options.py:641 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -376,44 +377,44 @@ msgstr "" "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt " "geändert werden." -#: contrib/admin/options.py:772 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "%s hinzufügen" -#: contrib/admin/options.py:803 contrib/admin/options.py:1003 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" "Das %(name)s-Objekt mit dem Primärschlüssel %(key)r ist nicht vorhanden." -#: contrib/admin/options.py:860 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "%s ändern" -#: contrib/admin/options.py:904 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "Datenbankfehler" -#: contrib/admin/options.py:940 +#: contrib/admin/options.py:941 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s \"%(name)s\" wurde erfolgreich geändert." msgstr[1] "%(count)s \"%(name)s\" wurden erfolgreich geändert." -#: contrib/admin/options.py:1018 +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht." -#: contrib/admin/options.py:1054 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Änderungsgeschichte: %s" -#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -422,11 +423,11 @@ msgstr "" "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder " "berücksichtigen die Groß-/Kleinschreibung." -#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Bitte melden Sie sich erneut an, da Ihre Sitzung abgelaufen ist." -#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -434,29 +435,29 @@ msgstr "" "Ihr Browser scheint keine Cookies zu akzeptieren. Bitte aktivieren Sie diese " "und laden Sie die Seite neu." -#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten." -#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" "Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen '%" "s' versuchen." -#: contrib/admin/sites.py:360 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Website-Verwaltung" -#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Anmelden" -#: contrib/admin/sites.py:417 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "%s-Verwaltung" @@ -507,7 +508,7 @@ msgstr "" #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:31 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -552,7 +553,6 @@ msgid "Run the selected action" msgstr "Ausgewählte Aktion ausführen" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Los" @@ -562,18 +562,18 @@ msgstr "Los" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Willkommen," -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentation" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:40 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -581,7 +581,7 @@ msgstr "Dokumentation" msgid "Change password" msgstr "Passwort ändern" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -712,6 +712,10 @@ msgstr "Meine Aktionen" msgid "None available" msgstr "Keine vorhanden" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Unbekannter Inhalt" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -760,6 +764,15 @@ msgstr "" msgid "Show all" msgstr "Zeige alle" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Sichern" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "Suchen" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -772,10 +785,6 @@ msgstr[1] "%(counter)s Ergebnisse" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s gesamt" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Sichern" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Als neu sichern" @@ -1005,144 +1014,145 @@ msgstr "Site" msgid "template" msgstr "Template" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 -#: contrib/admindocs/views.py:62 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "Schlagwort:" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 -#: contrib/admindocs/views.py:95 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "Filter:" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 -#: contrib/admindocs/views.py:159 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "Ansicht:" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Anwendung %r nicht gefunden" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Modell %(model_name)r wurde nicht in Anwendung %(app_label)r gefunden" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "Das verknüpfte `%(app_label)s.%(data_type)s` Objekt" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "Modell:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "verknüpftes `%(app_label)s.%(object_name)s` Objekt" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "Alle %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "Anzahl von %s" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Felder am %s Objekt" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Ganzzahl" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Boolescher Wert (True oder False)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Kommaseparierte Liste von Ganzzahlen" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Datum (ohne Uhrzeit)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Datum (mit Uhrzeit)" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Dezimalzahl" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "E-Mail-Adresse" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Dateipfad" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Gleitkommazahl" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "IP-Adresse" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Boolescher Wert (True, False oder None)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Beziehung zum Eltern-Modell" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Telefonnummer" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Text" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Zeit" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "Adresse (URL)" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "U.S.-Bundesstaat (zwei Großbuchstaben)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "XML-Text" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s ist scheinbar kein urlpattern-Objekt" @@ -1815,7 +1825,7 @@ msgstr "Ungültiger geometrischer Typ." #: contrib/gis/forms/fields.py:20 msgid "" -"An error occurred when transforming the geometryto the SRID of the geometry " +"An error occurred when transforming the geometry to the SRID of the geometry " "form field." msgstr "" "Ein Fehler ist beim Umwandeln der Geometrie-Werte in die SRID des Geometrie-" @@ -3948,14 +3958,14 @@ msgstr "Dieser Wert muss None, True oder False sein." 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/related.py:792 +#: db/models/fields/related.py:816 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." -#: db/models/fields/related.py:870 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -4020,11 +4030,11 @@ msgstr "Bitte geben Sie nicht mehr als %s Dezimalstellen ein." msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Bitte geben Sie nicht mehr als %s Ziffern vor dem Komma ein." -#: forms/fields.py:288 forms/fields.py:862 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Bitte ein gültiges Datum eingeben." -#: forms/fields.py:322 forms/fields.py:863 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Bitte eine gültige Uhrzeit eingeben." @@ -4069,21 +4079,21 @@ msgstr "Bitte eine gültige Adresse eingeben." msgid "This URL appears to be a broken link." msgstr "Diese Adresse scheint nicht gültig zu sein." -#: forms/fields.py:624 forms/fields.py:702 +#: forms/fields.py:625 forms/fields.py:703 #, 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:703 forms/fields.py:764 forms/models.py:798 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Bitte eine Liste mit Werten eingeben." -#: forms/fields.py:891 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Bitte eine gültige IPv4-Adresse eingeben." -#: forms/fields.py:901 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" @@ -4094,27 +4104,55 @@ msgstr "" msgid "Order" msgstr "Reihenfolge" -#: forms/models.py:299 forms/models.py:308 +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s mit diesem %(field_label)s existiert bereits." -#: forms/models.py:673 +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Bitte die doppelten Daten für %(field)s korrigieren." + +#: forms/models.py:598 +#, 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:604 +#, 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." + +#: forms/models.py:612 +msgid "Please correct the duplicate values below." +msgstr "Bitte die unten aufgeführten doppelten Werte korrigieren." + +#: forms/models.py:867 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:728 +#: forms/models.py:930 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:799 +#: forms/models.py:1004 #, 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:801 +#: forms/models.py:1006 #, 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." @@ -4145,27 +4183,27 @@ msgstr "%.1f MB" msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "nachm." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "vorm." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "nachm." -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "vorm." -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "Mitternacht" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "Mittag" diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index 831964a5ae..a8bd5f985d 100644 Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index b02ab9b7ff..fb5eec0c43 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-03-24 13:00+0100\n" -"PO-Revision-Date: 2009-03-24 13:26+0100\n" +"POT-Creation-Date: 2009-07-07 15:15+0200\n" +"PO-Revision-Date: 2009-07-07 15:22+0200\n" "Last-Translator: Django Spanish Team Language-" "Team: Django Spanish Team MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -217,6 +217,20 @@ msgstr "chino simplificado" msgid "Traditional Chinese" msgstr "chino tradicional" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Eliminado/s %(count)d %(items)s satisfactoriamente." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 +msgid "Are you sure?" +msgstr "¿Está seguro?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Eliminar %(verbose_name_plural)s seleccionado/s" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" @@ -251,15 +265,15 @@ msgstr "Este mes" msgid "This year" msgstr "Este año" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Sí" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "No" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Desconocido" @@ -295,117 +309,104 @@ msgstr "entrada de registro" msgid "log entries" msgstr "entradas de registro" -#: contrib/admin/options.py:131 contrib/admin/options.py:145 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" msgstr "Ninguno" -#: contrib/admin/options.py:498 -#, python-format -msgid "Successfully deleted %(count)d %(items)s." -msgstr "Eliminado/s %(count)d %(items)s satisfactoriamente." - -#: contrib/admin/options.py:505 contrib/admin/options.py:1012 -msgid "Are you sure?" -msgstr "¿Está seguro?" - -#: contrib/admin/options.py:523 -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "Eliminar %(verbose_name_plural)s seleccionado/s" - -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Modificado/a %s." -#: contrib/admin/options.py:531 contrib/admin/options.py:541 -#: contrib/comments/templates/comments/preview.html:15 forms/models.py:296 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "y" -#: contrib/admin/options.py:536 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Añadido/a \"%(object)s\" %(name)s." -#: contrib/admin/options.py:540 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificados %(list)s para \"%(object)s\" %(name)s." -#: contrib/admin/options.py:545 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Eliminado/a \"%(object)s\" %(name)s." -#: contrib/admin/options.py:549 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "No ha cambiado ningún campo." -#: contrib/admin/options.py:610 contrib/auth/admin.py:67 +#: contrib/admin/options.py:598 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"." -#: contrib/admin/options.py:614 contrib/admin/options.py:647 +#: contrib/admin/options.py:602 contrib/admin/options.py:635 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Puede editarlo de nuevo abajo." -#: contrib/admin/options.py:624 contrib/admin/options.py:657 +#: contrib/admin/options.py:612 contrib/admin/options.py:645 #, python-format msgid "You may add another %s below." msgstr "Puede añadir otro %s abajo." -#: contrib/admin/options.py:645 +#: contrib/admin/options.py:633 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Se modificó con éxito el %(name)s \"%(obj)s\"." -#: contrib/admin/options.py:653 +#: contrib/admin/options.py:641 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "Se añadió con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo." -#: contrib/admin/options.py:774 +#: contrib/admin/options.py:772 #, python-format msgid "Add %s" msgstr "Añadir %s" -#: contrib/admin/options.py:805 contrib/admin/options.py:990 +#: contrib/admin/options.py:803 contrib/admin/options.py:1003 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "No existe ningún objeto %(name)s con la clave primaria %(key)r." -#: contrib/admin/options.py:862 +#: contrib/admin/options.py:860 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: contrib/admin/options.py:894 +#: contrib/admin/options.py:904 msgid "Database error" msgstr "Error en la base de datos" -#: contrib/admin/options.py:930 +#: contrib/admin/options.py:940 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s fué modificado con éxito." msgstr[1] "%(count)s %(name)s fueron modificados con éxito." -#: contrib/admin/options.py:1005 +#: contrib/admin/options.py:1018 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"." -#: contrib/admin/options.py:1041 +#: contrib/admin/options.py:1054 #, python-format msgid "Change history: %s" msgstr "Histórico de modificaciones: %s" -#: contrib/admin/sites.py:15 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -414,11 +415,11 @@ msgstr "" "Por favor, introduzca un nombre de usuario y contraseña correctos. Note que " "ambos campos son sensibles a mayúsculas/minúsculas." -#: contrib/admin/sites.py:250 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Por favor, inicie sesión de nuevo, ya que su sesión ha caducado." -#: contrib/admin/sites.py:257 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -426,29 +427,29 @@ msgstr "" "Parece que su navegador no está configurado para aceptar cookies. " "Actívelas , recargue esta página, e inténtelo de nuevo." -#: contrib/admin/sites.py:273 contrib/admin/sites.py:279 +#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Los nombres de usuario no pueden contener el carácter '@'." -#: contrib/admin/sites.py:276 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" "Su dirección de correo no es su nombre de usuario. Pruebe con '%s' en su " "lugar." -#: contrib/admin/sites.py:336 +#: contrib/admin/sites.py:360 msgid "Site administration" msgstr "Sitio administrativo" -#: contrib/admin/sites.py:349 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Iniciar sesión" -#: contrib/admin/sites.py:396 +#: contrib/admin/sites.py:417 #, python-format msgid "%s administration" msgstr "Administración de %s" @@ -463,33 +464,27 @@ msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s" msgid "One or more %(fieldname)s in %(name)s:" msgstr "Uno o más %(fieldname)s en %(name)s:" -#: contrib/admin/util.py:222 -msgid "verbose_name" -msgid_plural "verbose_name_plural" -msgstr[0] "verbose_name" -msgstr[1] "verbose_name_plural" - -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Date:" msgstr "Fecha:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Time:" msgstr "Hora:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Currently:" msgstr "Actualmente:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Change:" msgstr "Modificar:" -#: contrib/admin/widgets.py:123 +#: contrib/admin/widgets.py:124 msgid "Lookup" msgstr "Buscar" -#: contrib/admin/widgets.py:230 +#: contrib/admin/widgets.py:236 msgid "Add Another" msgstr "Añadir otro" @@ -504,9 +499,9 @@ msgstr "Lo sentimos, pero no se encuentra la página solicitada." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:31 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:20 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 #: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 @@ -549,7 +544,6 @@ msgid "Run the selected action" msgstr "Ejecutar la acción seleccionada" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Ir" @@ -559,26 +553,26 @@ msgstr "Ir" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 msgid "Welcome," msgstr "Bienvenido/a," -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentación" -#: contrib/admin/templates/admin/base.html:28 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" msgstr "Cambiar contraseña" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -609,24 +603,24 @@ msgid "View on site" msgstr "Ver en el sitio" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/change_list.html:49 -#: contrib/admin/templates/admin/auth/user/change_password.html:22 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Por favor, corrija el siguiente error." msgstr[1] "Por favor, corrija los siguientes errores." -#: contrib/admin/templates/admin/change_list.html:41 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" msgstr "Añadir %(name)s" -#: contrib/admin/templates/admin/change_list.html:60 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "Filtro" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:251 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 msgid "Delete" msgstr "Eliminar" @@ -666,9 +660,9 @@ msgid "" "your account doesn't have permission to delete the following types of " "objects:" msgstr "" -"Eliminar el %(object_name)s provocaría la eliminación " -"de objetos relacionados, pero su cuenta no tiene permiso para borrar los " -"siguientes tipos de objetos:" +"Eliminar el %(object_name)s provocaría la eliminación de objetos " +"relacionados, pero su cuenta no tiene permiso para borrar los siguientes " +"tipos de objetos:" #: contrib/admin/templates/admin/delete_selected_confirmation.html:22 #, python-format @@ -676,8 +670,8 @@ msgid "" "Are you sure you want to delete the selected %(object_name)s objects? All of " "the following objects and it's related items will be deleted:" msgstr "" -"¿Está seguro de que quiere borrar los %(object_name)s? " -"Los siguientes objetos y sus elementos relacionados serán eliminados:" +"¿Está seguro de que quiere borrar los %(object_name)s? Los siguientes " +"objetos y sus elementos relacionados serán eliminados:" #: contrib/admin/templates/admin/filter.html:2 #, python-format @@ -709,6 +703,10 @@ msgstr "Mis acciones" msgid "None available" msgstr "Ninguno disponible" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Contenido desconocido" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -757,6 +755,15 @@ msgstr "" msgid "Show all" msgstr "Mostrar todo" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Grabar" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "Buscar" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -769,10 +776,6 @@ msgstr[1] "%(counter)s resultados" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s total" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Grabar" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Grabar como nuevo" @@ -799,23 +802,23 @@ msgid "Username" msgstr "Nombre de usuario" #: contrib/admin/templates/admin/auth/user/add_form.html:20 -#: contrib/admin/templates/admin/auth/user/change_password.html:33 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 #: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 msgid "Password" msgstr "Contraseña" #: contrib/admin/templates/admin/auth/user/add_form.html:26 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 #: contrib/auth/forms.py:186 msgid "Password (again)" msgstr "Contraseña (de nuevo)" #: contrib/admin/templates/admin/auth/user/add_form.html:27 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 msgid "Enter the same password as above, for verification." msgstr "Introduzca la misma contraseña que arriba, para verificación." -#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "" @@ -1037,114 +1040,115 @@ msgstr "" msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "el objeto relacionado `%(app_label)s.%(data_type)s`" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:225 +#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244 +#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263 msgid "model:" msgstr "modelo:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "los objetos relacionados `%(app_label)s.%(object_name)s`" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258 #, python-format msgid "all %s" msgstr "todo %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263 #, python-format msgid "number of %s" msgstr "número de %s" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:268 #, python-format msgid "Fields on %s objects" msgstr "Campos en %s objetos" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:331 contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:344 contrib/admindocs/views.py:350 +#: contrib/admindocs/views.py:351 contrib/admindocs/views.py:353 msgid "Integer" msgstr "Entero" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:332 msgid "Boolean (Either True or False)" msgstr "Booleano (Verdadero o Falso)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:333 contrib/admindocs/views.py:352 #, python-format msgid "String (up to %(max_length)s)" msgstr "Cadena (máximo %(max_length)s)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:334 msgid "Comma-separated integers" msgstr "Enteros separados por comas" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:335 msgid "Date (without time)" msgstr "Fecha (sin hora)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:336 msgid "Date (with time)" msgstr "Fecha (con hora)" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:337 msgid "Decimal number" msgstr "Número decimal" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:338 msgid "E-mail address" msgstr "Dirección de correo electrónico" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:339 contrib/admindocs/views.py:340 +#: contrib/admindocs/views.py:343 msgid "File path" msgstr "Ruta de fichero" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:341 msgid "Floating point number" msgstr "Número en coma flotante" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:58 +#: contrib/admindocs/views.py:345 contrib/comments/models.py:60 msgid "IP address" msgstr "Dirección IP" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:347 msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadero, Falso o Nulo)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:348 msgid "Relation to parent model" msgstr "Relación con el modelo padre" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:349 msgid "Phone number" msgstr "Número de teléfono" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:354 msgid "Text" msgstr "Texto" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:355 msgid "Time" msgstr "Hora" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:356 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:357 msgid "U.S. state (two uppercase letters)" msgstr "Estado de los EEUU (dos letras mayúsculas)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:358 msgid "XML text" msgstr "Texto XML" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:384 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s no parece ser un objeto urlpattern" @@ -1248,7 +1252,7 @@ msgid "Change password: %s" msgstr "Cambiar contraseña: %s" #: contrib/auth/forms.py:15 contrib/auth/forms.py:48 -#: contrib/auth/models.py:127 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." @@ -1340,31 +1344,31 @@ msgstr "permisos" msgid "group" msgstr "grupo" -#: contrib/auth/models.py:91 contrib/auth/models.py:137 +#: contrib/auth/models.py:91 contrib/auth/models.py:138 msgid "groups" msgstr "grupos" -#: contrib/auth/models.py:127 +#: contrib/auth/models.py:128 msgid "username" msgstr "nombre de usuario" -#: contrib/auth/models.py:128 +#: contrib/auth/models.py:129 msgid "first name" msgstr "nombre propio" -#: contrib/auth/models.py:129 +#: contrib/auth/models.py:130 msgid "last name" msgstr "apellidos" -#: contrib/auth/models.py:130 +#: contrib/auth/models.py:131 msgid "e-mail address" msgstr "dirección de correo electrónico" -#: contrib/auth/models.py:131 +#: contrib/auth/models.py:132 msgid "password" msgstr "contraseña" -#: contrib/auth/models.py:131 +#: contrib/auth/models.py:132 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." @@ -1372,19 +1376,19 @@ msgstr "" "Use'[algo]$[sal]$[hash hexadecimal]' o use el " "formulario para cambiar la contraseña." -#: contrib/auth/models.py:132 +#: contrib/auth/models.py:133 msgid "staff status" msgstr "es staff" -#: contrib/auth/models.py:132 +#: contrib/auth/models.py:133 msgid "Designates whether the user can log into this admin site." msgstr "Indica si el usuario puede entrar en este sitio de administración." -#: contrib/auth/models.py:133 +#: contrib/auth/models.py:134 msgid "active" msgstr "activo" -#: contrib/auth/models.py:133 +#: contrib/auth/models.py:134 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -1392,11 +1396,11 @@ msgstr "" "Indica si el usuario puede ser tratado como activo. Desmarque esta opción en " "lugar de borrar la cuenta." -#: contrib/auth/models.py:134 +#: contrib/auth/models.py:135 msgid "superuser status" msgstr "es superusuario" -#: contrib/auth/models.py:134 +#: contrib/auth/models.py:135 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -1404,15 +1408,15 @@ msgstr "" "Indica que este usuario tiene todos los permisos sin asignárselos " "explícitamente." -#: contrib/auth/models.py:135 +#: contrib/auth/models.py:136 msgid "last login" msgstr "último inicio de sesión" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:137 msgid "date joined" msgstr "fecha de alta" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:139 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." @@ -1420,23 +1424,24 @@ msgstr "" "Además de los permisos asignados manualmente, este usuario también tendrá " "todos los permisos de los grupos en los que esté." -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:140 msgid "user permissions" msgstr "permisos de usuario" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "usuario" -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:145 msgid "users" msgstr "usuarios" -#: contrib/auth/models.py:300 +#: contrib/auth/models.py:301 msgid "message" msgstr "mensaje" -#: contrib/auth/views.py:50 +#: contrib/auth/views.py:56 msgid "Logged out" msgstr "Sesión terminada" @@ -1452,10 +1457,20 @@ msgstr "contenido" msgid "Metadata" msgstr "metadatos" +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "comentarios de %(site_name)s" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Últimos comentarios en %(site_name)s" + #: contrib/comments/forms.py:93 #: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" -msgstr "nombre" +msgstr "Nombre" #: contrib/comments/forms.py:94 msgid "Email address" @@ -1464,7 +1479,7 @@ msgstr "dirección de correo electrónico" #: contrib/comments/forms.py:96 #: contrib/comments/templates/comments/moderation_queue.html:35 msgid "Comment" -msgstr "comentario" +msgstr "Comentario" #: contrib/comments/forms.py:173 #, python-format @@ -1478,46 +1493,51 @@ msgid "" "If you enter anything in this field your comment will be treated as spam" msgstr "Si introduce algo en este campo su comentario será tratado como spam" -#: contrib/comments/models.py:23 +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "tipo de contenido" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "ID de objeto" -#: contrib/comments/models.py:50 +#: contrib/comments/models.py:52 msgid "user's name" msgstr "nombre del usuario" -#: contrib/comments/models.py:51 +#: contrib/comments/models.py:53 msgid "user's email address" msgstr "dirección de correo electrónico del usuario" -#: contrib/comments/models.py:52 +#: contrib/comments/models.py:54 msgid "user's URL" msgstr "URL del usuario" -#: contrib/comments/models.py:54 +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "comentario" -#: contrib/comments/models.py:57 +#: contrib/comments/models.py:59 msgid "date/time submitted" msgstr "fecha/hora de envío" -#: contrib/comments/models.py:59 +#: contrib/comments/models.py:61 msgid "is public" msgstr "es público" -#: contrib/comments/models.py:60 +#: contrib/comments/models.py:62 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "" "Desmarque esta casilla para hacer desaparecer el comentario del sitio web de " "forma efectiva." -#: contrib/comments/models.py:62 +#: contrib/comments/models.py:64 msgid "is removed" msgstr "está eliminado" -#: contrib/comments/models.py:63 +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." @@ -1525,7 +1545,11 @@ msgstr "" "Marque esta opción si el comentario es inapropiado. En su lugar se mostrará " "el mensaje \"Este comentario ha sido eliminado\"." -#: contrib/comments/models.py:115 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "comentarios" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." @@ -1533,7 +1557,7 @@ msgstr "" "Este comentario ha sido enviado por un usuario autentificado: de modo que su " "nombre no es modificable." -#: contrib/comments/models.py:124 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." @@ -1541,7 +1565,7 @@ msgstr "" "Este comentario ha sido colocado por un usuario autentificado: de modo que " "su dirección de correo electrónico no es modificable." -#: contrib/comments/models.py:149 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1556,6 +1580,22 @@ msgstr "" "\n" "http://%(domain)s%(url)s" +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "marcar" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "fecha" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "marca de comentario" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "marcas de comentario" + #: contrib/comments/templates/comments/approve.html:4 msgid "Approve a comment" msgstr "Aprovar un comentario" @@ -1615,13 +1655,13 @@ msgstr "Marcar" msgid "Thanks for flagging" msgstr "Graciar por marcar" -#: contrib/comments/templates/comments/form.html:16 -#: contrib/comments/templates/comments/preview.html:31 +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 msgid "Post" msgstr "Enviar" -#: contrib/comments/templates/comments/form.html:17 -#: contrib/comments/templates/comments/preview.html:32 +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 msgid "Preview" msgstr "Previsualizar" @@ -1667,33 +1707,29 @@ msgid "Thank you for your comment" msgstr "Gracias por su comentario" #: contrib/comments/templates/comments/preview.html:4 -#: contrib/comments/templates/comments/preview.html:12 +#: contrib/comments/templates/comments/preview.html:13 msgid "Preview your comment" msgstr "Previsualizar su comentario" -#: contrib/comments/templates/comments/preview.html:10 +#: contrib/comments/templates/comments/preview.html:11 msgid "Please correct the error below" msgid_plural "Please correct the errors below" msgstr[0] "Por favor, corrija el siguiente error." msgstr[1] "Por favor, corrija los siguientes errores." -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "Post your comment" msgstr "Envie su comentario" -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "or make changes" msgstr "o haga cambios" -#: contrib/contenttypes/models.py:67 +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "nombre de la clase modelo de python" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "tipo de contenido" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "tipos de contenido" @@ -1762,18 +1798,26 @@ msgstr "" "Lo sentimos, pero su formulario ha expirado. Por favor, continue rellenando " "el formulario en esta página." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "No se indico ningún valor de geometría." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Valor de geometría inválido." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Tipo de geometría inválido." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"Ocurrió un error al transformar la geometria al SRID de la geometria " +"del campo de formulario." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "º" @@ -1891,11 +1935,11 @@ msgstr "Carinthia" #: contrib/localflavor/at/at_states.py:7 msgid "Lower Austria" -msgstr "" +msgstr "Australia Baja" #: contrib/localflavor/at/at_states.py:8 msgid "Upper Austria" -msgstr "" +msgstr "Australia Alta" #: contrib/localflavor/at/at_states.py:9 msgid "Salzburg" @@ -2112,47 +2156,47 @@ msgstr "Región Bohemia Sur" #: contrib/localflavor/cz/cz_regions.py:11 msgid "Pilsen Region" -msgstr "" +msgstr "Región Pilsen" #: contrib/localflavor/cz/cz_regions.py:12 msgid "Carlsbad Region" -msgstr "" +msgstr "Región Carlsbad" #: contrib/localflavor/cz/cz_regions.py:13 msgid "Usti Region" -msgstr "" +msgstr "Región Usti" #: contrib/localflavor/cz/cz_regions.py:14 msgid "Liberec Region" -msgstr "" +msgstr "Región Liberec" #: contrib/localflavor/cz/cz_regions.py:15 msgid "Hradec Region" -msgstr "" +msgstr "Región Hradec" #: contrib/localflavor/cz/cz_regions.py:16 msgid "Pardubice Region" -msgstr "" +msgstr "Región Pardubice" #: contrib/localflavor/cz/cz_regions.py:17 msgid "Vysocina Region" -msgstr "" +msgstr "Región Vysocina" #: contrib/localflavor/cz/cz_regions.py:18 msgid "South Moravian Region" -msgstr "" +msgstr "Región Moravia Sur" #: contrib/localflavor/cz/cz_regions.py:19 msgid "Olomouc Region" -msgstr "" +msgstr "Región Olomouc" #: contrib/localflavor/cz/cz_regions.py:20 msgid "Zlin Region" -msgstr "" +msgstr "Región Zlin" #: contrib/localflavor/cz/cz_regions.py:21 msgid "Moravian-Silesian Region" -msgstr "" +msgstr "Región Moravia-Silesiana" #: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 msgid "Enter a postal code in the format XXXXX or XXX XX." @@ -2165,7 +2209,8 @@ msgstr "" #: contrib/localflavor/cz/forms.py:48 msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" -msgstr "El parámetro opcional 'Género' es inválido, los valores válidos son 'f' y 'm'" +msgstr "" +"El parámetro opcional 'Género' es inválido, los valores válidos son 'f' y 'm'" #: contrib/localflavor/cz/forms.py:49 msgid "Enter a valid birth number." @@ -3004,16 +3049,16 @@ msgstr "" msgid "Wrong checksum for the Tax Number (NIP)." msgstr "El Número de Identificación Tributaria (NIP) es incorrecto." -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." msgstr "" -"El Número Nacional de Registro de Negocios (REGON) consiste en 7 o 9 dígitos." +"El Número Nacional de Registro de Negocios (REGON) consiste en 9 o 14 dígitos." -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." msgstr "El Número Nacional de Registro de Negocios (REGON) es incorrecto." -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." msgstr "Introduzca un código postal en el formato XX-XXX." @@ -3850,60 +3895,60 @@ msgstr "nombre para mostrar" msgid "sites" msgstr "sitios" -#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "Este valor debe ser un entero." -#: db/models/fields/__init__.py:387 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." msgstr "Este valor debe ser Verdadero o Falso." -#: db/models/fields/__init__.py:420 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Este campo no puede estar vacío." -#: db/models/fields/__init__.py:436 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "Introduzca sólo dígitos separados por comas." -#: db/models/fields/__init__.py:467 +#: db/models/fields/__init__.py:474 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:476 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Fecha no válida: %s" -#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format." msgstr "" "Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM[:ss[.uuuuuu]]." -#: db/models/fields/__init__.py:594 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." msgstr "Este valor debe ser un entero." -#: db/models/fields/__init__.py:676 +#: db/models/fields/__init__.py:686 msgid "This value must be a float." msgstr "Este valor debe ser un número con coma flotante." -#: db/models/fields/__init__.py:736 +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." msgstr "Este valor debe ser Verdadero, Falso o Ninguno." -#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 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/related.py:779 +#: db/models/fields/related.py:816 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." -#: db/models/fields/related.py:857 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3970,11 +4015,11 @@ msgstr "Asegúrese de que no hay más de %s decimales." 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:288 forms/fields.py:850 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Introduzca una fecha válida." -#: forms/fields.py:322 forms/fields.py:851 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Introduzca una hora válida." @@ -3996,7 +4041,15 @@ msgstr "No se ha enviado ningún fichero" msgid "The submitted file is empty." msgstr "El fichero enviado está vacío." -#: forms/fields.py:478 +#: forms/fields.py:450 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "" +"Asegúrese de que su texto tiene no más de %(max)d caracteres (actualmente " +"tiene %(length)d)." + +#: forms/fields.py:483 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -4004,106 +4057,140 @@ 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:539 +#: forms/fields.py:544 msgid "Enter a valid URL." msgstr "Introduzca una URL válida." -#: forms/fields.py:540 +#: forms/fields.py:545 msgid "This URL appears to be a broken link." msgstr "La URL parece ser un enlace roto." -#: forms/fields.py:619 forms/fields.py:697 +#: forms/fields.py:625 forms/fields.py:703 #, 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:698 forms/fields.py:759 forms/models.py:729 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Introduzca una lista de valores." -#: forms/fields.py:879 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Introduzca una dirección IPv4 válida." -#: forms/fields.py:889 +#: forms/fields.py:902 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." -#: forms/formsets.py:247 forms/formsets.py:249 +#: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Orden" -#: forms/models.py:289 forms/models.py:298 +#: forms/models.py:367 +#, 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" + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "Ya existe %(model_name)s con este %(field_label)s." -#: forms/models.py:602 +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Por favor, corrija el dato duplicado para %(field)s." + +#: forms/models.py:598 +#, 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:604 +#, python-format +msgid "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." +msgstr "" +"Por favor corriga los datos duplicados para %(field_name)s el cual debe ser " +"único para %(lookup)s en %(date_field)s." + +#: forms/models.py:612 +msgid "Please correct the duplicate values below." +msgstr "Por favor, corrija los valores duplicados abajo." + +#: forms/models.py:867 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:659 +#: forms/models.py:930 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:730 +#: forms/models.py:1004 #, 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." -#: template/defaultfilters.py:751 +#: forms/models.py:1006 +#, 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." + +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "sí,no,tal vez" -#: template/defaultfilters.py:782 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d byte" msgstr[1] "%(size)d bytes" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:786 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:787 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "p.m." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "a.m." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "PM" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "AM" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "media noche" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "medio día" @@ -4327,16 +4414,16 @@ msgid_plural "minutes" msgstr[0] "minuto" msgstr[1] "minutos" -#: utils/timesince.py:43 +#: utils/timesince.py:45 msgid "minutes" msgstr "minutos" -#: utils/timesince.py:48 +#: utils/timesince.py:50 #, python-format msgid "%(number)d %(type)s" msgstr "%(number)d %(type)s" -#: utils/timesince.py:54 +#: utils/timesince.py:56 #, python-format msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" @@ -4372,6 +4459,11 @@ msgstr "Se actualizó con éxito el %(verbose_name)s." msgid "The %(verbose_name)s was deleted." msgstr "El/La %(verbose_name)s ha sido borrado." +#~ msgid "verbose_name" +#~ msgid_plural "verbose_name_plural" +#~ msgstr[0] "verbose_name" +#~ msgstr[1] "verbose_name_plural" + #~ msgid "DATE_WITH_TIME_FULL" #~ msgstr "j M Y P" @@ -4411,9 +4503,6 @@ msgstr "El/La %(verbose_name)s ha sido borrado." #~ msgid "is valid rating" #~ msgstr "puntuación válida" -#~ msgid "comments" -#~ msgstr "comentarios" - #~ msgid "Content object" #~ msgstr "Objeto contenido" @@ -4610,9 +4699,6 @@ msgstr "El/La %(verbose_name)s ha sido borrado." #~ msgid "Please enter both fields or leave them both empty." #~ msgstr "Por favor, rellene ambos campos o deje ambos vacíos." -#~ msgid "This field must be given if %(field)s is %(value)s" -#~ msgstr "Se debe proporcionar este campo si %(field)s es %(value)s" - #~ msgid "This field must be given if %(field)s is not %(value)s" #~ msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s" diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo index 57349e8d9b..176709e3f6 100644 Binary files a/django/conf/locale/es_AR/LC_MESSAGES/django.mo and b/django/conf/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po index d6726ab57b..902fb5bec6 100644 --- a/django/conf/locale/es_AR/LC_MESSAGES/django.po +++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-28 12:30-0300\n" -"PO-Revision-Date: 2009-05-05 20:35-0300\n" +"POT-Creation-Date: 2009-07-21 23:56-0300\n" +"PO-Revision-Date: 2009-07-22 00:13-0300\n" "Last-Translator: Ramiro Morales \n" "Language-Team: Django-I18N \n" "MIME-Version: 1.0\n" @@ -224,7 +224,7 @@ msgstr "chino tradicional" msgid "Successfully deleted %(count)d %(items)s." msgstr "Se eliminaron con éxito %(count)d %(items)s." -#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 msgid "Are you sure?" msgstr "¿Está seguro?" @@ -322,7 +322,7 @@ msgstr "Modifica %s." #: contrib/admin/options.py:519 contrib/admin/options.py:529 #: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 -#: forms/models.py:587 +#: forms/models.py:600 msgid "and" msgstr "y" @@ -345,27 +345,27 @@ msgstr "Se eliminó %(name)s \"%(object)s\"." msgid "No fields changed." msgstr "No ha modificado ningún campo." -#: contrib/admin/options.py:598 contrib/auth/admin.py:67 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Se agregó con éxito %(name)s \"%(obj)s\"." -#: contrib/admin/options.py:602 contrib/admin/options.py:635 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Puede modificarlo/a nuevamente abajo." -#: contrib/admin/options.py:612 contrib/admin/options.py:645 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Puede agregar otro/a %s abajo." -#: contrib/admin/options.py:633 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Se modificó con éxito %(name)s \"%(obj)s\"." -#: contrib/admin/options.py:641 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -373,43 +373,43 @@ msgstr "" "Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente " "abajo." -#: contrib/admin/options.py:772 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Agregar %s" -#: contrib/admin/options.py:803 contrib/admin/options.py:1003 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "No existe un objeto %(name)s con una clave primaria %(key)r." -#: contrib/admin/options.py:860 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: contrib/admin/options.py:904 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "Error de base de datos" -#: contrib/admin/options.py:940 +#: contrib/admin/options.py:941 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "Se ha modificado con éxito %(count)s %(name)s." msgstr[1] "Se han modificado con éxito %(count)s %(name)s." -#: contrib/admin/options.py:1018 +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"." -#: contrib/admin/options.py:1054 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Historia de modificaciones: %s" -#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -418,11 +418,11 @@ msgstr "" "Por favor introduzca un nombre de usuario y una contraseña correctos. Note " "que ambos campos son sensibles a mayúsculas/minúsculas." -#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Por favor, identifíquese de nuevo porque su sesión ha caducado." -#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -430,29 +430,29 @@ msgstr "" "Parece que su navegador no está configurado para aceptar cookies. Por favor " "actívelas, recargue esta página, e inténtelo de nuevo." -#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Los nombres de usuario no pueden contener el carácter '@'." -#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" "Su dirección de correo electrónico no es su nombre de usuario. Intente " "nuevamente usando '%s'." -#: contrib/admin/sites.py:360 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Administración de sitio" -#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Identificarse" -#: contrib/admin/sites.py:417 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "Administración de %s" @@ -487,7 +487,7 @@ msgstr "Modificar:" msgid "Lookup" msgstr "Buscar" -#: contrib/admin/widgets.py:236 +#: contrib/admin/widgets.py:235 msgid "Add Another" msgstr "Agregar otro/a" @@ -502,7 +502,7 @@ msgstr "Lo sentimos, pero no se encuentra la página solicitada." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:31 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -556,18 +556,18 @@ msgstr "Ejecutar" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Bienvenido," -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentación" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:40 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -575,7 +575,7 @@ msgstr "Documentación" msgid "Change password" msgstr "Cambiar contraseña" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -673,8 +673,9 @@ msgid "" "Are you sure you want to delete the selected %(object_name)s objects? All of " "the following objects and it's related items will be deleted:" msgstr "" -"¿Está seguro de que quiere eliminar los objetos %(object_name)s? Se " -"eliminarán todos los siguientes objetos relacionados:" +"¿Está seguro de que quiere eliminar los objetos %(object_name)s " +"seleccionados? Se eliminarán todos los siguientes objetos " +"relacionados:" #: contrib/admin/templates/admin/filter.html:2 #, python-format @@ -708,7 +709,7 @@ msgstr "Ninguna disponible" #: contrib/admin/templates/admin/index.html:72 msgid "Unknown content" -msgstr "COntenido desconocido" +msgstr "Contenido desconocido" #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" @@ -758,6 +759,11 @@ msgstr "" msgid "Show all" msgstr "Mostrar todos/as" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Grabar" + #: contrib/admin/templates/admin/search_form.html:8 msgid "Search" msgstr "Buscar" @@ -774,10 +780,6 @@ msgstr[1] "%(counter)s resultados" msgid "%(full_result_count)s total" msgstr "total: %(full_result_count)s" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Grabar" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Grabar como nuevo" @@ -861,9 +863,9 @@ msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Por favor, por razones de seguridad, introduzca su contraseña antigua, y " -"luego introduzca la nueva contraseña dos veces para verificar que la ha " -"escrito correctamente." +"Por favor, por razones de seguridad, introduzca primero su contraseña " +"antigua y luego introduzca la nueva contraseña dos veces para verificar que " +"la ha escrito correctamente." #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -928,7 +930,7 @@ msgid "" "used. Please request a new password reset." msgstr "" "El enlace de reinicialización de contraseña es inválido, posiblemente debido " -"a que ya ha sido usado. Por favor solicite una nueva reinicialización de " +"a que ya ha sido usado. Por favor solicite una nueva reinicialización de " "contraseña." #: contrib/admin/templates/registration/password_reset_done.html:6 @@ -948,7 +950,7 @@ msgstr "" #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "" -"Está recibiendo este mensaje debido a que solicitó recuperar la contraseña" +"Recibe este mensaje debido a que solicitó recuperar la contraseña" #: contrib/admin/templates/registration/password_reset_email.html:3 #, python-format @@ -1012,144 +1014,145 @@ msgstr "sitio" msgid "template" msgstr "plantilla" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 -#: contrib/admindocs/views.py:62 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "etiqueta:" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 -#: contrib/admindocs/views.py:95 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "filtrar:" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 -#: contrib/admindocs/views.py:159 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "ver:" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Aplicación %r no encontrada" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Modelo %(model_name)r no encontrado en aplicación %(app_label)r" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "el objeto `%(app_label)s.%(data_type)s` relacionado" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "modelo:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "objetos `%(app_label)s.%(object_name)s` relacionados" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "todos los %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "número de %s" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Campos en objetos %s" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Entero" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Booleano (Verdadero o Falso)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "Cadena (máximo %(max_length)s)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Enteros separados por comas" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Fecha (sin hora)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Fecha (con hora)" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Número decimal" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "Dirección de correo electrónico" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Ruta de archivo" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Número de punto flotante" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "Dirección IP" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadero, Falso o Nulo)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Relación con el modelo padre" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Número de teléfono" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Texto" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Hora" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "Estado de los EE.UU. (dos letras mayúsculas)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "Texto XML" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s no parece ser un objeto urlpattern" @@ -1555,7 +1558,7 @@ msgid "" "only." msgstr "" "Este comentario ha sido enviado por un usuario identificado, por lo tanto el " -"nombre no puede modificarse.%(text)s" +"nombre no puede modificarse." #: contrib/comments/models.py:128 msgid "" @@ -1563,7 +1566,7 @@ msgid "" "only." msgstr "" "Este comentario ha sido enviado por un usuario identificado, por lo tanto la " -"dirección de correo electrónico no puede modificarse.%(text)s" +"dirección de correo electrónico no puede modificarse." #: contrib/comments/models.py:153 #, python-format @@ -3048,7 +3051,7 @@ msgstr "" #: contrib/localflavor/pl/forms.py:72 msgid "Wrong checksum for the Tax Number (NIP)." -msgstr "Código de verificación de Número Impostitivo (NIP) inválido." +msgstr "Código de verificación de Número Impositivo (NIP) inválido." #: contrib/localflavor/pl/forms.py:109 msgid "National Business Register Number (REGON) consists of 9 or 14 digits." @@ -3945,14 +3948,14 @@ msgstr "Este valor debe ser None, True o False." 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/related.py:792 +#: db/models/fields/related.py:816 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." -#: db/models/fields/related.py:870 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -4075,7 +4078,7 @@ msgstr "" "Seleccione una opción válida. %(value)s no es una de las opciones " "disponibles." -#: forms/fields.py:704 forms/fields.py:765 forms/models.py:991 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Introduzca una lista de valores." @@ -4086,7 +4089,7 @@ msgstr "Introduzca una dirección IPv4 válida" #: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." -msgstr "Introduzca un 'slug' válido consistente en letras, números o guiones." +msgstr "Introduzca un 'slug' válido consistente de letras, números o guiones." #: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" @@ -4104,46 +4107,48 @@ msgstr "" 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." -#: forms/models.py:581 -#, fuzzy, python-format +#: forms/models.py:594 +#, python-format msgid "Please correct the duplicate data for %(field)s." -msgstr "Por favor, corrija el siguiente error." +msgstr "Por favor, corrija la información duplicada en %(field)s." -#: forms/models.py:585 +#: forms/models.py:598 #, 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:591 +#: forms/models.py:604 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " "for the %(lookup)s in %(date_field)s." msgstr "" +"Por favor corrija la información duplicada en %(field_name)s que debe ser " +"única para el %(lookup)s en %(date_field)s." -#: forms/models.py:599 -#, fuzzy +#: forms/models.py:612 msgid "Please correct the duplicate values below." -msgstr "Por favor, corrija el siguiente error." +msgstr "Por favor, corrija los valores duplicados detallados mas abajo." -#: forms/models.py:855 +#: forms/models.py:867 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 de la instancia padre." -#: forms/models.py:918 +#: forms/models.py:930 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Seleccione una opción válida. Esa opción no es una de las opciones " "disponibles." -#: forms/models.py:992 +#: forms/models.py:1004 #, 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:994 +#: forms/models.py:1006 #, 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." diff --git a/django/conf/locale/et/LC_MESSAGES/django.mo b/django/conf/locale/et/LC_MESSAGES/django.mo index f2fef35f52..426ee9c937 100644 Binary files a/django/conf/locale/et/LC_MESSAGES/django.mo and b/django/conf/locale/et/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/et/LC_MESSAGES/django.po b/django/conf/locale/et/LC_MESSAGES/django.po index 6d9b9e41e2..9b8ae9e27a 100644 --- a/django/conf/locale/et/LC_MESSAGES/django.po +++ b/django/conf/locale/et/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-11 07:53+0300\n" +"POT-Creation-Date: 2009-07-24 22:06+0300\n" "PO-Revision-Date: 2008-09-03 00:35+0200\n" "Last-Translator: Erik Allik \n" "Language-Team: Django-i18n \n" @@ -217,19 +217,19 @@ msgstr "lihtsustatud hiina" msgid "Traditional Chinese" msgstr "traditsiooniline hiina" -#: contrib/admin/actions.py:56 +#: contrib/admin/actions.py:60 #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "" +msgstr "%(count)d %(items)s kustutamine õnnestus" -#: contrib/admin/actions.py:63 contrib/admin/options.py:1023 +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 msgid "Are you sure?" msgstr "Kas olete kindel?" -#: contrib/admin/actions.py:81 +#: contrib/admin/actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "" +msgstr "Kustuta valitud %(verbose_name_plural)s" #: contrib/admin/filterspecs.py:44 #, python-format @@ -265,15 +265,15 @@ msgstr "Käesolev kuu" msgid "This year" msgstr "Käesolev aasta" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Jah" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Ei" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Tundmatu" @@ -311,100 +311,101 @@ msgstr "logisissekanded" #: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" -msgstr "puudub" +msgstr "Puudub" -#: contrib/admin/options.py:517 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Muutsin %s." -#: contrib/admin/options.py:517 contrib/admin/options.py:527 -#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "ja" -#: contrib/admin/options.py:522 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Lisatud %(name)s \"%(object)s\"." -#: contrib/admin/options.py:526 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Muudetud %(list)s objektil %(name)s \"%(object)s\"." -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Kustutatud %(name)s \"%(object)s\"." -#: contrib/admin/options.py:535 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Ühtegi välja ei muudetud." -#: contrib/admin/options.py:596 contrib/auth/admin.py:67 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" lisamine õnnestus." -#: contrib/admin/options.py:600 contrib/admin/options.py:633 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Võite jätkata redigeerimist." -#: contrib/admin/options.py:610 contrib/admin/options.py:643 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Võite jätkata uue %s lisamisega." -#: contrib/admin/options.py:631 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" muutmine õnnestus." -#: contrib/admin/options.py:639 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" lisamine õnnestus. Te võite seda muuta." -#: contrib/admin/options.py:770 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Lisa %s" -#: contrib/admin/options.py:801 contrib/admin/options.py:1001 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s primaarvõtmega %(key)r ei eksisteeri." -#: contrib/admin/options.py:858 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Muuda %s" -#: contrib/admin/options.py:902 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "Andmebaasi viga" -#: contrib/admin/options.py:938 +#: contrib/admin/options.py:941 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s muutmine õnnestus." msgstr[1] "%(count)s %(name)s muutmine õnnestus." -#: contrib/admin/options.py:1016 +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" kustutati." -#: contrib/admin/options.py:1052 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Muudatuste ajalugu: %s" -#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -413,11 +414,11 @@ msgstr "" "Palun sisestage korrektne kasutajatunnus ja salasõna. Mõlemad väljad on " "tõstutundlikud." -#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Teie sessioon on aegunud. Palun logige uuesti sisse." -#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -425,28 +426,27 @@ msgstr "" "Paistab, et Teie brauser ei aktsepteeri küpsiseid. Palun võimaldage küpsised " "ning seejärel laadige see leht uuesti." -#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Kasutajatunnused ei tohi sisaldada '@' märki." -#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "" -"Teie e-posti aadress ei ole Teie kasutajatunnus. Proovige '%s'." +msgstr "Teie e-posti aadress ei ole Teie kasutajatunnus. Proovige '%s'." -#: contrib/admin/sites.py:360 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Saidi administreerimine" -#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Sisene" -#: contrib/admin/sites.py:417 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "%s - administreerimine" @@ -496,7 +496,7 @@ msgstr "Vabandame, kuid soovitud lehte ei leitud." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -541,7 +541,6 @@ msgid "Run the selected action" msgstr "Käivita valitud toiming" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Mine" @@ -551,18 +550,18 @@ msgstr "Mine" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Tere tulemast," -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentatsioon" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:40 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -570,7 +569,7 @@ msgstr "Dokumentatsioon" msgid "Change password" msgstr "Muuda salasõna" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -659,9 +658,8 @@ msgid "" "your account doesn't have permission to delete the following types of " "objects:" msgstr "" -"%(object_name)s kustutamiseks on vaja " -"kustutada ka seotud objektid, aga teil puudub õigus järgnevat " -"tüüpi objektide kustutamiseks:" +"%(object_name)s kustutamiseks on vaja kustutada ka seotud objektid, aga teil " +"puudub õigus järgnevat tüüpi objektide kustutamiseks:" #: contrib/admin/templates/admin/delete_selected_confirmation.html:22 #, python-format @@ -702,6 +700,10 @@ msgstr "Minu Toimingud" msgid "None available" msgstr "Ei leitud ühtegi" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Tundmatu sisu" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -750,6 +752,15 @@ msgstr "" msgid "Show all" msgstr "Näita kõiki" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Salvesta" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "Otsing" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -762,10 +773,6 @@ msgstr[1] "%(counter)s tulemust" msgid "%(full_result_count)s total" msgstr "Kokku %(full_result_count)s" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Salvesta" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Salvesta uuena" @@ -993,144 +1000,145 @@ msgstr "sait" msgid "template" msgstr "mall" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 -#: contrib/admindocs/views.py:62 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "lipik:" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 -#: contrib/admindocs/views.py:95 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "filtreeri:" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 -#: contrib/admindocs/views.py:159 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "vaade:" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Rakendust %r ei leitud" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Mudelit %(model_name)r ei leitud rakendusest %(app_label)r" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "seotud `%(app_label)s.%(data_type)s` objekt" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "mudel:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "seotud `%(app_label)s.%(object_name)s` objektid" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "kõik %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "%s arv" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Objekti %s väljad" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Täisarv" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Tõeväärtus (Kas tõene või väär)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "String (kuni %(max_length)s märki)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Komaga eraldatud täisarvud" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Kuupäev (kellaajata)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Kuupäev (kellaajaga)" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Kümnendmurd" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "E-posti aadress" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Faili asukoht" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Ujukomaarv" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "IP aadress" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Tõeväärtus (Kas tõene, väär või tühi)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Seos ülem-mudeliga" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Telefoninumber" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Tekst" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Aeg" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "U.S.A. osariik (kaks suurt tähte)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "XML tekst" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s ei tundu olevat urlpattern objekt" @@ -1470,7 +1478,7 @@ msgid "" "If you enter anything in this field your comment will be treated as spam" msgstr "Kui sisestate sellesse lahtrisse midagi, loetakse kommentaar rämpsuks" -#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71 +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 msgid "content type" msgstr "sisutüüp" @@ -1698,11 +1706,11 @@ msgstr "Postita kommentaar" msgid "or make changes" msgstr "või tee muudatused" -#: contrib/contenttypes/models.py:67 +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "pythoni mudeli klassinimi" -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "sisutüübid" @@ -1772,18 +1780,25 @@ msgstr "" "Vabandame, kuid vorm on aegunud. Palun jätkake vormi täitmist käesolevalt " "lehelt." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Geomeetriline väärtus puudub." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Vigane geomeetriline väärtus." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Vigane geomeetriline tüüp." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"Geomeetria teisendamisel geomeetria vormivälja SRID-ks tekkis viga." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "." @@ -2104,59 +2119,59 @@ msgstr "Tšiili RUT on ebakorrektne." #: contrib/localflavor/cz/cz_regions.py:8 msgid "Prague" -msgstr "" +msgstr "Praha" #: contrib/localflavor/cz/cz_regions.py:9 msgid "Central Bohemian Region" -msgstr "" +msgstr "Kesk-Boheemia regioon" #: contrib/localflavor/cz/cz_regions.py:10 msgid "South Bohemian Region" -msgstr "" +msgstr "Lõuna-Boheemia regioon" #: contrib/localflavor/cz/cz_regions.py:11 msgid "Pilsen Region" -msgstr "" +msgstr "Pilseni regioon" #: contrib/localflavor/cz/cz_regions.py:12 msgid "Carlsbad Region" -msgstr "" +msgstr "Carlsbadi regioon" #: contrib/localflavor/cz/cz_regions.py:13 msgid "Usti Region" -msgstr "" +msgstr "Usti regioon" #: contrib/localflavor/cz/cz_regions.py:14 msgid "Liberec Region" -msgstr "" +msgstr "Libereci regioon" #: contrib/localflavor/cz/cz_regions.py:15 msgid "Hradec Region" -msgstr "" +msgstr "Hradeci regioon" #: contrib/localflavor/cz/cz_regions.py:16 msgid "Pardubice Region" -msgstr "" +msgstr "Pardubice regioon" #: contrib/localflavor/cz/cz_regions.py:17 msgid "Vysocina Region" -msgstr "" +msgstr "Vysocina regioon" #: contrib/localflavor/cz/cz_regions.py:18 msgid "South Moravian Region" -msgstr "" +msgstr "Lõuna-Moraavia regioon" #: contrib/localflavor/cz/cz_regions.py:19 msgid "Olomouc Region" -msgstr "" +msgstr "Olomouci regioon" #: contrib/localflavor/cz/cz_regions.py:20 msgid "Zlin Region" -msgstr "" +msgstr "Zlini regioon" #: contrib/localflavor/cz/cz_regions.py:21 msgid "Moravian-Silesian Region" -msgstr "" +msgstr "Moraavia-Sileesia regioon" #: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 msgid "Enter a postal code in the format XXXXX or XXX XX." @@ -2164,12 +2179,13 @@ msgstr "Sisesta postiindeks kujul XXXXX või XXX XX." #: contrib/localflavor/cz/forms.py:47 msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." -msgstr "" -"Sisesta sünninumber formaadis XXXXXX/XXXX või XXXXXXXXXX" +msgstr "Sisesta sünninumber formaadis XXXXXX/XXXX või XXXXXXXXXX" #: contrib/localflavor/cz/forms.py:48 msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" -msgstr "Ebasobiv valikuline parameeter Sugu, sobivad väärtused on 'f' (naine) ja 'm' (mees)" +msgstr "" +"Ebasobiv valikuline parameeter Sugu, sobivad väärtused on 'f' (naine) ja " +"'m' (mees)" #: contrib/localflavor/cz/forms.py:49 msgid "Enter a valid birth number." @@ -3846,7 +3862,7 @@ msgstr "hüüdnimi" msgid "sites" msgstr "saidid" -#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "See väärtus peab olema täisarv." @@ -3880,24 +3896,24 @@ msgstr "" msgid "This value must be a decimal number." msgstr "See väärtus peab olema kümnendarv." -#: db/models/fields/__init__.py:683 +#: db/models/fields/__init__.py:686 msgid "This value must be a float." msgstr "See väärtus peab olema murdarv." -#: db/models/fields/__init__.py:743 +#: db/models/fields/__init__.py:746 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:846 db/models/fields/__init__.py:860 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." msgstr "Sisestage korrektne kellaaeg formaadis TT:MM[:ss[.uuuuuu]]" -#: db/models/fields/related.py:792 +#: db/models/fields/related.py:816 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\")." -#: db/models/fields/related.py:870 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3961,11 +3977,11 @@ msgstr "Veenduge, et komakohtade arv ei ületaks %s." 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:288 forms/fields.py:862 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Sisestage korrektne kuupäev." -#: forms/fields.py:322 forms/fields.py:863 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Sisestage korrektne kellaaeg." @@ -4009,20 +4025,20 @@ msgstr "Sisestage korrektne URL." msgid "This URL appears to be a broken link." msgstr "See URL näib olevat katkine." -#: forms/fields.py:624 forms/fields.py:702 +#: forms/fields.py:625 forms/fields.py:703 #, 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:703 forms/fields.py:764 forms/models.py:776 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Sisestage väärtuste nimekiri." -#: forms/fields.py:891 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Sisestage korrektne IPv4 aadress." -#: forms/fields.py:901 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" @@ -4032,76 +4048,103 @@ msgstr "" msgid "Order" msgstr "Järjestus" -#: forms/models.py:299 forms/models.py:308 +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 #, 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." -#: forms/models.py:651 -msgid "The inline foreign key did not match the parent instance primary key." -msgstr "" +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Palun parandage duplikaat-andmed lahtris %(field)s." -#: forms/models.py:706 +#: forms/models.py:598 +#, 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:604 +#, 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:612 +msgid "Please correct the duplicate values below." +msgstr "Palun parandage allolevad duplikaat-väärtused" + +#: forms/models.py:867 +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:930 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:777 +#: forms/models.py:1004 #, 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:779 +#: forms/models.py:1006 #, python-format msgid "\"%s\" is not a valid value for a primary key." -msgstr "" +msgstr "\"%s\" ei ole sobiv väärtust primaarvõtmeks." -#: template/defaultfilters.py:765 +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "jah,ei,võib-olla" -#: template/defaultfilters.py:796 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d bait" msgstr[1] "%(size)d baiti" -#: template/defaultfilters.py:798 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:800 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:801 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "p.l." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "e.l." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "PL" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "EL" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "südaöö" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "keskpäev" diff --git a/django/conf/locale/fi/LC_MESSAGES/django.mo b/django/conf/locale/fi/LC_MESSAGES/django.mo index 49dc247cdc..446834f412 100644 Binary files a/django/conf/locale/fi/LC_MESSAGES/django.mo and b/django/conf/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fi/LC_MESSAGES/django.po b/django/conf/locale/fi/LC_MESSAGES/django.po index 67fa354844..f4d86b7a5f 100644 --- a/django/conf/locale/fi/LC_MESSAGES/django.po +++ b/django/conf/locale/fi/LC_MESSAGES/django.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-03 05:26+0300\n" +"POT-Creation-Date: 2009-05-24 14:45+0300\n" "PO-Revision-Date: 2007-09-15 00:34+0300\n" -"Last-Translator: Ville Säävuori \n" +"Last-Translator: Leo Honkanen \n" "Language-Team: Django I18N \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -102,117 +102,139 @@ msgid "Hebrew" msgstr "heprea" #: conf/global_settings.py:65 +msgid "Hindi" +msgstr "hindi" + +#: conf/global_settings.py:66 msgid "Croatian" msgstr "kroatia" -#: conf/global_settings.py:66 +#: conf/global_settings.py:67 msgid "Icelandic" msgstr "islanti" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Italian" msgstr "italia" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Japanese" msgstr "japani" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Georgian" msgstr "georgia" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Korean" msgstr "korea" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Khmer" msgstr "khmer" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Kannada" msgstr "kannada" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Latvian" msgstr "latvia" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Lithuanian" msgstr "liettua" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Macedonian" msgstr "makedonia" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Dutch" msgstr "hollanti" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "Norwegian" msgstr "norja" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Polish" msgstr "puola" -#: conf/global_settings.py:79 -msgid "Portugese" +#: conf/global_settings.py:80 +msgid "Portuguese" msgstr "portugali" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Brazilian Portuguese" msgstr "brasilian portugali" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Romanian" msgstr "romania" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Russian" msgstr "venäjä" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Slovak" msgstr "slovakia" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Slovenian" msgstr "slovenia" -#: conf/global_settings.py:85 +#: conf/global_settings.py:86 msgid "Serbian" msgstr "serbia" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Swedish" msgstr "ruotsi" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 msgid "Tamil" msgstr "tamili" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Telugu" msgstr "telugu" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 +msgid "Thai" +msgstr "thain kieli" + +#: conf/global_settings.py:91 msgid "Turkish" msgstr "turkki" -#: conf/global_settings.py:90 +#: conf/global_settings.py:92 msgid "Ukrainian" msgstr "ukraina" -#: conf/global_settings.py:91 +#: conf/global_settings.py:93 msgid "Simplified Chinese" msgstr "kiina (yksinkertaistettu)" -#: conf/global_settings.py:92 +#: conf/global_settings.py:94 msgid "Traditional Chinese" msgstr "kiina (perinteinen)" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Onnistuneesti poistettu %(count)d \"%(items)s\"-kohdetta." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 +msgid "Are you sure?" +msgstr "Oletko varma?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Poista valitut \"%(verbose_name_plural)s\"-kohteet" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" @@ -222,7 +244,7 @@ msgstr "" "

          %s:

          \n" "
            \n" -#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 #: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 msgid "All" msgstr "Kaikki" @@ -247,18 +269,22 @@ msgstr "Tässä kuussa" msgid "This year" msgstr "Tänä vuonna" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Kyllä" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Ei" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Tuntematon" +#: contrib/admin/helpers.py:14 +msgid "Action:" +msgstr "Toiminto:" + #: contrib/admin/models.py:19 msgid "action time" msgstr "tapahtumahetki" @@ -287,94 +313,103 @@ msgstr "lokimerkintä" msgid "log entries" msgstr "lokimerkinnät" -#: contrib/admin/options.py:60 contrib/admin/options.py:121 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" msgstr "Ei arvoa" -#: contrib/admin/options.py:338 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Muokattu: %s." -#: contrib/admin/options.py:338 contrib/admin/options.py:348 -#: forms/models.py:275 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:587 msgid "and" msgstr "ja" -#: contrib/admin/options.py:343 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Lisätty %(name)s \"%(object)s\"." -#: contrib/admin/options.py:347 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Muutettu %(list)s kohteelle %(name)s \"%(object)s\"." -#: contrib/admin/options.py:352 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Poistettu %(name)s \"%(object)s\"." -#: contrib/admin/options.py:356 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Ei muutoksia kenttiin." -#: contrib/admin/options.py:417 contrib/auth/admin.py:51 +#: contrib/admin/options.py:598 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" on lisätty." -#: contrib/admin/options.py:421 contrib/admin/options.py:454 -#: contrib/auth/admin.py:59 +#: contrib/admin/options.py:602 contrib/admin/options.py:635 +#: contrib/auth/admin.py:75 msgid "You may edit it again below." -msgstr "Voit muokata sitä uudelleen alla." +msgstr "Voit muokata sitä edelleen alla." -#: contrib/admin/options.py:431 contrib/admin/options.py:464 +#: contrib/admin/options.py:612 contrib/admin/options.py:645 #, python-format msgid "You may add another %s below." msgstr "Uusi %s on lisättävissä alla." -#: contrib/admin/options.py:452 +#: contrib/admin/options.py:633 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" on muutettu." -#: contrib/admin/options.py:460 +#: contrib/admin/options.py:641 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" on lisätty. Voit muokata sitä uudelleen alla." -#: contrib/admin/options.py:536 +#: contrib/admin/options.py:772 #, python-format msgid "Add %s" msgstr "Lisää %s" -#: contrib/admin/options.py:614 +#: contrib/admin/options.py:803 contrib/admin/options.py:1003 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "%(name)s perusavaimella %(key)r ei ole olemassa." + +#: contrib/admin/options.py:860 #, python-format msgid "Change %s" msgstr "Muokkaa %s" -#: contrib/admin/options.py:646 +#: contrib/admin/options.py:904 msgid "Database error" msgstr "Tietokantavirhe" -#: contrib/admin/options.py:696 +#: contrib/admin/options.py:940 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s %(name)s on muokattu." +msgstr[1] "%(count)s \"%(name)s\"-kohdetta on muokattu." + +#: contrib/admin/options.py:1018 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" on poistettu." -#: contrib/admin/options.py:703 -msgid "Are you sure?" -msgstr "Oletko varma?" - -#: contrib/admin/options.py:732 +#: contrib/admin/options.py:1054 #, python-format msgid "Change history: %s" msgstr "Muokkaushistoria: %s" -#: contrib/admin/sites.py:16 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -383,76 +418,76 @@ msgstr "" "Käyttäjätunnus tai salasana ei kelpaa. Huomaa, että isot ja pienet kirjaimet " "ovat merkitseviä." -#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." -msgstr "Kirjaudu uudelleen sisään, koska istuntosi on vanhentunut." +msgstr "Kirjaudu uudelleen sisään, sillä istuntosi on vanhentunut." -#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." msgstr "" -"Selaimesi ei salli evästeitä. Muuta asetukset sallimaan evästeet, lataa tämä " -"sivu uudelleen ja yritä uudestaan." +"Selaimesi ei vaikuta sallivan evästeitä. Muuta asetukset sallimaan evästeet, " +"lataa tämä sivu uudelleen ja yritä uudestaan." -#: contrib/admin/sites.py:250 contrib/admin/sites.py:256 +#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Käyttäjätunnuksessa ei saa olla '@'-merkkiä." -#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "Käyttäjätunnus ei ole sama kuin sähköpostiosoite. Kokeile '%s'." +msgstr "Sähköpostiosoitteesi ei ole käyttäjätunnuksesi. Kokeile '%s'." -#: contrib/admin/sites.py:313 +#: contrib/admin/sites.py:360 msgid "Site administration" msgstr "Sivuston ylläpito" -#: contrib/admin/sites.py:326 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Kirjaudu sisään" -#: contrib/admin/sites.py:373 +#: contrib/admin/sites.py:417 #, python-format msgid "%s administration" msgstr "%s ylläpito" -#: contrib/admin/util.py:138 +#: contrib/admin/util.py:168 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Yksi tai useampi %(fieldname)s kohteessa %(name)s: %(obj)s" -#: contrib/admin/util.py:143 +#: contrib/admin/util.py:173 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Yksi tai useampi %(fieldname)s kohteessa %(name)s:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Date:" msgstr "Pvm:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Time:" msgstr "Klo:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Currently:" msgstr "Tällä hetkellä:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Change:" msgstr "Muokkaa:" -#: contrib/admin/widgets.py:121 +#: contrib/admin/widgets.py:124 msgid "Lookup" msgstr "Etsi" -#: contrib/admin/widgets.py:228 +#: contrib/admin/widgets.py:236 msgid "Add Another" -msgstr "Lisää uusi" +msgstr "Lisää seuraava" #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -465,10 +500,11 @@ msgstr "Pahoittelemme, pyydettyä sivua ei löytynyt." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:30 +#: contrib/admin/templates/admin/base.html:31 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:8 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 #: contrib/admin/templates/admin/object_history.html:6 #: contrib/admin/templates/admin/auth/user/change_password.html:10 @@ -500,8 +536,16 @@ msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." msgstr "" -"Palvelimella on tapahtunut virhe. Se on ilmoitettu sivuston ylläpitäjille " -"sähköpostilla ja korjataan pian. Kiitämme kärsivällisyydestä." +"Palvelimella on tapahtunut virhe. Virheestä on ilmoitettu sivuston " +"ylläpitäjille ja se hoidetaan pian. Kiitämme kärsivällisyydestä." + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Suorita valittu toiminto" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Suorita" #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 @@ -509,26 +553,26 @@ msgstr "" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 msgid "Welcome," msgstr "Tervetuloa," -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Ohjeita" -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" msgstr "Vaihda salasana" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -554,28 +598,29 @@ msgstr "Muokkaushistoria" #: contrib/admin/templates/admin/change_form.html:28 #: contrib/admin/templates/admin/edit_inline/stacked.html:13 -#: contrib/admin/templates/admin/edit_inline/tabular.html:25 +#: contrib/admin/templates/admin/edit_inline/tabular.html:27 msgid "View on site" msgstr "Näytä lopputulos" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/auth/user/change_password.html:22 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Korjaa allaoleva virhe." msgstr[1] "Korjaa allaolevat virheet." -#: contrib/admin/templates/admin/change_list.html:16 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" msgstr "Lisää %(name)s" -#: contrib/admin/templates/admin/change_list.html:26 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "Suodatin" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 msgid "Delete" msgstr "Poista" @@ -600,9 +645,33 @@ msgstr "" "Myös seuraavat kohteet poistettaisiin samalla:" #: contrib/admin/templates/admin/delete_confirmation.html:28 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:33 msgid "Yes, I'm sure" msgstr "Kyllä, olen varma" +#: contrib/admin/templates/admin/delete_selected_confirmation.html:9 +msgid "Delete multiple objects" +msgstr "Poista useita kohteita" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:15 +#, python-format +msgid "" +"Deleting the %(object_name)s would result in deleting related objects, but " +"your account doesn't have permission to delete the following types of " +"objects:" +msgstr "" +"Kohteen (%(object_name)s) poisto poistaisi myös siihen liittyviä kohteita, " +"mutta sinulla ei ole oikeutta näiden kohteiden poistamiseen:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:22 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(object_name)s objects? All of " +"the following objects and it's related items will be deleted:" +msgstr "" +"Haluatko varmasti poistaa valitut (%(object_name)s) kohteet? Myös seuraavat " +"kohteet poistettaisiin samalla:" + #: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " @@ -633,6 +702,10 @@ msgstr "Omat tapahtumani" msgid "None available" msgstr "Ei yhtään" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Tuntematon sisältö" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -659,11 +732,12 @@ msgid "User" msgstr "Käyttäjä" #: contrib/admin/templates/admin/object_history.html:24 +#: contrib/comments/templates/comments/moderation_queue.html:33 msgid "Action" msgstr "Tapahtuma" #: contrib/admin/templates/admin/object_history.html:30 -#: utils/translation/trans_real.py:404 +#: utils/translation/trans_real.py:400 msgid "DATETIME_FORMAT" msgstr "j.n.Y G:i" @@ -672,7 +746,7 @@ msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -"Tällä kohteella ei ole muutoshistoriaa. Sitä ei ole lisätty tämän " +"Tällä kohteella ei ole muutoshistoriaa. Sitä ei ole ilmeisesti lisätty tämän " "ylläpitosivun avulla." #: contrib/admin/templates/admin/pagination.html:10 @@ -680,8 +754,8 @@ msgid "Show all" msgstr "Näytä kaikki" #: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Etsi" +msgid "Search" +msgstr "Haku" #: contrib/admin/templates/admin/search_form.html:10 #, python-format @@ -725,23 +799,23 @@ msgid "Username" msgstr "Käyttäjätunnus" #: contrib/admin/templates/admin/auth/user/add_form.html:20 -#: contrib/admin/templates/admin/auth/user/change_password.html:33 -#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 msgid "Password" msgstr "Salasana" #: contrib/admin/templates/admin/auth/user/add_form.html:26 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/auth/forms.py:185 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/auth/forms.py:186 msgid "Password (again)" msgstr "Salasana toistamiseen" #: contrib/admin/templates/admin/auth/user/add_form.html:27 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 msgid "Enter the same password as above, for verification." msgstr "Syötä sama salasana tarkistuksen vuoksi toistamiseen." -#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "Syötä käyttäjän %(username)s uusi salasana." @@ -902,165 +976,166 @@ msgstr "Sähköpostiosoite:" msgid "Reset my password" msgstr "Nollaa salasanani" -#: contrib/admin/templatetags/admin_list.py:288 +#: contrib/admin/templatetags/admin_list.py:299 msgid "All dates" msgstr "Kaikki päivät" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s" msgstr "Valitse %s" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s to change" msgstr "Valitse muokattava %s" -#: contrib/admin/views/template.py:36 contrib/sites/models.py:38 +#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 msgid "site" msgstr "sivusto" -#: contrib/admin/views/template.py:38 +#: contrib/admin/views/template.py:39 msgid "template" msgstr "mallipohjan nimi" -#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59 -#: contrib/admindocs/views.py:61 +#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 +#: contrib/admindocs/views.py:62 msgid "tag:" msgstr "tagi:" -#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92 -#: contrib/admindocs/views.py:94 +#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 +#: contrib/admindocs/views.py:95 msgid "filter:" msgstr "suodatin:" -#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156 -#: contrib/admindocs/views.py:158 +#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 +#: contrib/admindocs/views.py:159 msgid "view:" msgstr "näkymä:" -#: contrib/admindocs/views.py:186 +#: contrib/admindocs/views.py:187 #, python-format msgid "App %r not found" msgstr "Sovellusta %r ei löydy" -#: contrib/admindocs/views.py:193 +#: contrib/admindocs/views.py:194 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Sovelluksesta %(app_label)r ei löydy mallia %(model_name)r" -#: contrib/admindocs/views.py:205 +#: contrib/admindocs/views.py:206 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "tähän liittyvä `%(app_label)s.%(data_type)s`-kohde" -#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227 -#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 msgid "model:" msgstr "malli:" -#: contrib/admindocs/views.py:236 +#: contrib/admindocs/views.py:237 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "tähän liittyvät `%(app_label)s.%(object_name)s`-kohteet" -#: contrib/admindocs/views.py:241 +#: contrib/admindocs/views.py:242 #, python-format msgid "all %s" msgstr "kaikki %s" -#: contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:247 #, python-format msgid "number of %s" msgstr "%s-kohteiden lukumäärä" -#: contrib/admindocs/views.py:251 +#: contrib/admindocs/views.py:252 #, python-format msgid "Fields on %s objects" msgstr "%s-kohteiden kentät" -#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325 -#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333 -#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 +#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 msgid "Integer" msgstr "Kokonaisluku" -#: contrib/admindocs/views.py:315 +#: contrib/admindocs/views.py:316 msgid "Boolean (Either True or False)" msgstr "Totuusarvo: joko tosi (True) tai epätosi (False)" -#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335 +#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 #, python-format msgid "String (up to %(max_length)s)" msgstr "Merkkijono (enintään %(max_length)s merkkiä)" -#: contrib/admindocs/views.py:317 +#: contrib/admindocs/views.py:318 msgid "Comma-separated integers" msgstr "Pilkulla erotetut kokonaisluvut" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:319 msgid "Date (without time)" msgstr "Päivämäärä (ilman kellonaikaa)" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:320 msgid "Date (with time)" msgstr "Päivämäärä ja kellonaika" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:321 msgid "Decimal number" msgstr "Desimaaliluku" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:322 msgid "E-mail address" msgstr "Sähköpostiosoite" -#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323 -#: contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:327 msgid "File path" msgstr "Tiedostopolku" -#: contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:325 msgid "Floating point number" msgstr "Liukuluku" -#: contrib/admindocs/views.py:328 contrib/comments/models.py:58 +#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 msgid "IP address" msgstr "IP-osoite" -#: contrib/admindocs/views.py:330 +#: contrib/admindocs/views.py:331 msgid "Boolean (Either True, False or None)" msgstr "Totuusarvo: joko tosi (True), epätosi (False) tai ei mikään (None)" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:332 msgid "Relation to parent model" msgstr "Relaatio emomalliin" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:333 msgid "Phone number" msgstr "Puhelinnumero" -#: contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:338 msgid "Text" msgstr "Tekstiä" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:339 msgid "Time" msgstr "Kellonaika" -#: contrib/admindocs/views.py:339 contrib/comments/forms.py:22 +#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL-osoite" -#: contrib/admindocs/views.py:340 +#: contrib/admindocs/views.py:341 msgid "U.S. state (two uppercase letters)" msgstr "USA:n osavaltio (suuraakkosin, kaksi kirjainta)" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:342 msgid "XML text" msgstr "XML-teksti" -#: contrib/admindocs/views.py:367 +#: contrib/admindocs/views.py:368 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s ei näytä olevan urlpattern-olio" @@ -1147,43 +1222,43 @@ msgstr "Tärkeät päivämäärät" msgid "Groups" msgstr "Ryhmät" -#: contrib/auth/admin.py:64 +#: contrib/auth/admin.py:80 msgid "Add user" msgstr "Uusi käyttäjä" -#: contrib/auth/admin.py:90 +#: contrib/auth/admin.py:106 msgid "Password changed successfully." msgstr "Salasana muutettu onnistuneesti." -#: contrib/auth/admin.py:96 +#: contrib/auth/admin.py:112 #, python-format msgid "Change password: %s" msgstr "Vaihda salasana: %s" #: contrib/auth/forms.py:15 contrib/auth/forms.py:48 -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." msgstr "" -" Vaaditaan. Enintään 30 kirjanta (a-z), numeroa (0-9) tai alaviivaa (_)." +" Vaaditaan. Enintään 30 kirjanta (A-Z, a-z), numeroa (0-9) tai alaviivaa (_)." #: contrib/auth/forms.py:16 contrib/auth/forms.py:49 msgid "This value must contain only letters, numbers and underscores." msgstr "" -"Tässä voidaan käyttää vain kirjaimia (a-z), numeroita (0-9) ja alaviivoja " -"(_)." +"Tässä voidaan käyttää vain kirjaimia (A-Z, a-z), numeroita (0-9) ja " +"alaviivoja (_)." #: contrib/auth/forms.py:18 msgid "Password confirmation" -msgstr "Salasanan muuttaminen" +msgstr "Salasanan vahvistaminen" #: contrib/auth/forms.py:30 msgid "A user with that username already exists." msgstr "Käyttäjätunnus on jo rekisteröity." -#: contrib/auth/forms.py:36 contrib/auth/forms.py:154 -#: contrib/auth/forms.py:196 +#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:197 msgid "The two password fields didn't match." msgstr "Salasanat eivät täsmää." @@ -1195,7 +1270,8 @@ msgstr "Tämä käyttäjätili ei ole voimassa." msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." -msgstr "Selaimesi ei salli evästeitä. Sisäänkirjautuminen vaatii evästeen." +msgstr "" +"Selaimesi ei näytä sallivan evästeitä. Sisäänkirjautuminen vaatii evästeen." #: contrib/auth/forms.py:100 msgid "E-mail" @@ -1209,72 +1285,72 @@ msgstr "" "Sähköpostiosoitetta vastaavaa käyttäjätunnusta ei löydy. Oletko varmasti jo " "rekisteröitynyt?" -#: contrib/auth/forms.py:134 +#: contrib/auth/forms.py:135 #, python-format msgid "Password reset on %s" msgstr "Salasanan nollaus sivustolla %s" -#: contrib/auth/forms.py:142 +#: contrib/auth/forms.py:143 msgid "New password" msgstr "Uusi salasana" -#: contrib/auth/forms.py:143 +#: contrib/auth/forms.py:144 msgid "New password confirmation" msgstr "Uusi salasana uudelleen" -#: contrib/auth/forms.py:168 +#: contrib/auth/forms.py:169 msgid "Old password" msgstr "Vanha salasana" -#: contrib/auth/forms.py:176 +#: contrib/auth/forms.py:177 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Vanha salasana on virheellinen. Yritä uudelleen." -#: contrib/auth/models.py:72 contrib/auth/models.py:95 +#: contrib/auth/models.py:63 contrib/auth/models.py:86 msgid "name" msgstr "nimi" -#: contrib/auth/models.py:74 +#: contrib/auth/models.py:65 msgid "codename" msgstr "tunniste" -#: contrib/auth/models.py:77 +#: contrib/auth/models.py:68 msgid "permission" msgstr "oikeus" -#: contrib/auth/models.py:78 contrib/auth/models.py:96 +#: contrib/auth/models.py:69 contrib/auth/models.py:87 msgid "permissions" msgstr "oikeudet" -#: contrib/auth/models.py:99 +#: contrib/auth/models.py:90 msgid "group" msgstr "ryhmä" -#: contrib/auth/models.py:100 contrib/auth/models.py:146 +#: contrib/auth/models.py:91 contrib/auth/models.py:138 msgid "groups" msgstr "ryhmät" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "username" msgstr "käyttäjätunnus" -#: contrib/auth/models.py:137 +#: contrib/auth/models.py:129 msgid "first name" msgstr "etunimi" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:130 msgid "last name" msgstr "sukunimi" -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:131 msgid "e-mail address" msgstr "sähköposti" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "password" msgstr "salasana" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." @@ -1282,19 +1358,19 @@ msgstr "" "Syötä muodossa '[algo]$[suola]$[heksa-digest]' tai käytä muutoslomaketta." -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "staff status" msgstr "ylläpitäjä" -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "Designates whether the user can log into this admin site." -msgstr "Määrää, pääseekö käyttäjä tähän sivuston ylläpito-osioon." +msgstr "Määrittää, pääseekö käyttäjä tähän sivuston ylläpito-osioon." -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "active" msgstr "voimassa" -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -1302,54 +1378,55 @@ msgstr "" "Määrää, voiko käyttäjä kirjautua sisään. Tällä voi estää käyttäjätilin " "käytön poistamatta sitä." -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "superuser status" msgstr "pääkäyttäjä" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" "Antaa käyttäjälle kaikki oikeudet ilman, että niitä täytyy erikseen luetella." -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:136 msgid "last login" -msgstr "viimeksi kirjautunut" +msgstr "viimeisin kirjautuminen" -#: contrib/auth/models.py:145 +#: contrib/auth/models.py:137 msgid "date joined" msgstr "liittynyt" -#: contrib/auth/models.py:147 +#: contrib/auth/models.py:139 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -"Tässä valittujen oikeuksien lisäksi käyttäjä saa myös kaikki niiden ryhmien " -"oikeudet, joiden jäsen hän on." +"Erikseen mainittujen oikeuksien lisäksi käyttäjä saa myös kaikki niiden " +"ryhmien oikeudet, joiden jäsen hän on." -#: contrib/auth/models.py:148 +#: contrib/auth/models.py:140 msgid "user permissions" msgstr "käyttäjän oikeudet" -#: contrib/auth/models.py:152 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "käyttäjä" -#: contrib/auth/models.py:153 +#: contrib/auth/models.py:145 msgid "users" msgstr "käyttäjät" -#: contrib/auth/models.py:308 +#: contrib/auth/models.py:301 msgid "message" msgstr "viesti" -#: contrib/auth/views.py:50 +#: contrib/auth/views.py:56 msgid "Logged out" msgstr "Kirjautunut ulos" -#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428 +#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 msgid "Enter a valid e-mail address." msgstr "Syötä kelvollinen sähköpostiosoite." @@ -1361,69 +1438,86 @@ msgstr "Sisältö" msgid "Metadata" msgstr "Metatieto" -#: contrib/comments/forms.py:20 +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "Kommentit sivustolle %(site_name)s" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Sivuston %(site_name)s viimeisimmät kommentit" + +#: contrib/comments/forms.py:93 +#: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" msgstr "Nimi" -#: contrib/comments/forms.py:21 +#: contrib/comments/forms.py:94 msgid "Email address" msgstr "Sähköpostiosoite" -#: contrib/comments/forms.py:23 +#: contrib/comments/forms.py:96 +#: contrib/comments/templates/comments/moderation_queue.html:35 msgid "Comment" msgstr "Kommentti" -#: contrib/comments/forms.py:26 -msgid "" -"If you enter anything in this field your comment will be treated as spam" -msgstr "" -"Jos syötät tähän kenttään jotain, kommenttisi luokitellaan roskapostiksi" - -#: contrib/comments/forms.py:126 +#: contrib/comments/forms.py:173 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Siivoa suusi! Sanaa \"%s\" ei saa käyttää tässä." msgstr[1] "Siivoa suusi! Sanoja \"%s\" ei saa käyttää tässä." -#: contrib/comments/models.py:23 +#: contrib/comments/forms.py:180 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "" +"Jos syötät tähän kenttään jotain, kommenttisi luokitellaan roskapostiksi" + +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "sisältötyyppi" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "kohteen tunniste" -#: contrib/comments/models.py:50 +#: contrib/comments/models.py:52 msgid "user's name" msgstr "käyttäjän nimi" -#: contrib/comments/models.py:51 +#: contrib/comments/models.py:53 msgid "user's email address" msgstr "käyttäjän sähköpostiosoite" -#: contrib/comments/models.py:52 +#: contrib/comments/models.py:54 msgid "user's URL" msgstr "käyttäjän URL" -#: contrib/comments/models.py:54 +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "kommentti" -#: contrib/comments/models.py:57 +#: contrib/comments/models.py:59 msgid "date/time submitted" msgstr "lähettämishetki" -#: contrib/comments/models.py:59 +#: contrib/comments/models.py:61 msgid "is public" msgstr "on julkinen" -#: contrib/comments/models.py:60 +#: contrib/comments/models.py:62 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "Piilottaaksesi kommentin näkymästä sivustolta, poista tämä ruksi." -#: contrib/comments/models.py:62 +#: contrib/comments/models.py:64 msgid "is removed" msgstr "on poistettu" -#: contrib/comments/models.py:63 +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." @@ -1431,7 +1525,11 @@ msgstr "" "Rastita jos kommentti on asiaankuulumaton. Kommentin tilalla näytetään\n" "viesti \"Tämä kommentti on poistettu\"." -#: contrib/comments/models.py:115 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "kommentit" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." @@ -1440,7 +1538,7 @@ msgstr "" "käyttäjä." # Mitä "sketchy user" tarkoittaa? -#: contrib/comments/models.py:124 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." @@ -1448,7 +1546,7 @@ msgstr "" "Kommentin lähettäjän sähköpostiosoitetta ei voi muuttaa, koska lähettäjä on " "kirjautunut käyttäjä." -#: contrib/comments/models.py:149 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1463,15 +1561,154 @@ msgstr "" " \\n\n" " http://%(domain)s%(url)s" -#: contrib/contenttypes/models.py:67 +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "merkintä" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "päivä" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "kommentin merkintä" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "kommenttien merkinnät" + +#: contrib/comments/templates/comments/approve.html:4 +msgid "Approve a comment" +msgstr "Hyväksy kommentti" + +#: contrib/comments/templates/comments/approve.html:7 +msgid "Really make this comment public?" +msgstr "Haluatko varmasti tehdä kommentista julkisen?" + +#: contrib/comments/templates/comments/approve.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:49 +msgid "Approve" +msgstr "Hyväksy" + +#: contrib/comments/templates/comments/approved.html:4 +msgid "Thanks for approving" +msgstr "Kiitos hyväksynnästäsi" + +#: contrib/comments/templates/comments/approved.html:7 +#: contrib/comments/templates/comments/deleted.html:7 +#: contrib/comments/templates/comments/flagged.html:7 +msgid "" +"Thanks for taking the time to improve the quality of discussion on our site" +msgstr "Kiitos sivustomme keskusteluihin panostamastasi ajasta" + +#: contrib/comments/templates/comments/delete.html:4 +msgid "Remove a comment" +msgstr "Poista kommentti" + +#: contrib/comments/templates/comments/delete.html:7 +msgid "Really remove this comment?" +msgstr "Haluatko varmasti poistaa tämän kommentin?" + +#: contrib/comments/templates/comments/delete.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:53 +msgid "Remove" +msgstr "Poista" + +#: contrib/comments/templates/comments/deleted.html:4 +msgid "Thanks for removing" +msgstr "Kiitos poistamisesta" + +#: contrib/comments/templates/comments/flag.html:4 +msgid "Flag this comment" +msgstr "Merkitse tämä kommentti" + +#: contrib/comments/templates/comments/flag.html:7 +msgid "Really flag this comment?" +msgstr "Haluatko varmasti merkitä tämän kommentin?" + +#: contrib/comments/templates/comments/flag.html:12 +msgid "Flag" +msgstr "Merkitse" + +#: contrib/comments/templates/comments/flagged.html:4 +msgid "Thanks for flagging" +msgstr "Kiitos merkitsemisestä" + +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 +msgid "Post" +msgstr "Lähetä" + +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 +msgid "Preview" +msgstr "Esikatsele" + +#: contrib/comments/templates/comments/moderation_queue.html:4 +#: contrib/comments/templates/comments/moderation_queue.html:19 +msgid "Comment moderation queue" +msgstr "Kommenttien valvontajono" + +#: contrib/comments/templates/comments/moderation_queue.html:26 +msgid "No comments to moderate" +msgstr "Ei valvottavia kommentteja" + +#: contrib/comments/templates/comments/moderation_queue.html:36 +msgid "Email" +msgstr "Sähköposti" + +#: contrib/comments/templates/comments/moderation_queue.html:38 +msgid "Authenticated?" +msgstr "Kirjautunut?" + +#: contrib/comments/templates/comments/moderation_queue.html:39 +msgid "IP Address" +msgstr "IP-osoite" + +#: contrib/comments/templates/comments/moderation_queue.html:40 +msgid "Date posted" +msgstr "Lähettämispvm" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "yes" +msgstr "kyllä" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "no" +msgstr "ei" + +#: contrib/comments/templates/comments/posted.html:4 +msgid "Thanks for commenting" +msgstr "Kiitos kommentista" + +#: contrib/comments/templates/comments/posted.html:7 +msgid "Thank you for your comment" +msgstr "Kiitos kommentistasi" + +#: contrib/comments/templates/comments/preview.html:4 +#: contrib/comments/templates/comments/preview.html:13 +msgid "Preview your comment" +msgstr "Esikatsele kommenttia" + +#: contrib/comments/templates/comments/preview.html:11 +msgid "Please correct the error below" +msgid_plural "Please correct the errors below" +msgstr[0] "Korjaa allaoleva virhe" +msgstr[1] "Korjaa allaolevat virheet" + +#: contrib/comments/templates/comments/preview.html:16 +msgid "Post your comment" +msgstr "Lähetä kommentti" + +#: contrib/comments/templates/comments/preview.html:16 +msgid "or make changes" +msgstr "tai tee muutoksia" + +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "mallin python-luokan nimi" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "sisältötyyppi" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "sisältötyypit" @@ -1487,8 +1724,8 @@ msgid "" "This value must contain only letters, numbers, underscores, dashes or " "slashes." msgstr "" -"Tässä voidaan käyttää vain kirjaimia (a-z), numeroita (0-9) sekä ala-, tavu- " -"ja kauttaviivoja (_ - /)." +"Tässä voidaan käyttää vain kirjaimia (a-z, A-Z), numeroita (0-9) sekä ala-, " +"tavu- ja kauttaviivoja (_ - /)." #: contrib/flatpages/admin.py:22 msgid "Advanced options" @@ -1543,18 +1780,24 @@ msgstr "" "Pahoittelumme, mutta sessiosi on vanhentunut. Ole hyvä ja jatka lomakkeen " "täyttämistä tältä sivulta." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Geometria-arvoa ei annettu." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Virheellinen geometria-arvo." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Virheellinen geometriatyyppi." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "Kentän SRID-muunnoksessa tapahtui virhe." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "." @@ -1668,15 +1911,15 @@ msgstr "Burgenland" #: contrib/localflavor/at/at_states.py:6 msgid "Carinthia" -msgstr "Carinthia" +msgstr "Kärnten" #: contrib/localflavor/at/at_states.py:7 msgid "Lower Austria" -msgstr "Lower Austria" +msgstr "Ala-Itävalta" #: contrib/localflavor/at/at_states.py:8 msgid "Upper Austria" -msgstr "Upper Austria" +msgstr "Ylä-Itävalta" #: contrib/localflavor/at/at_states.py:9 msgid "Salzburg" @@ -1684,11 +1927,11 @@ msgstr "Salzburg" #: contrib/localflavor/at/at_states.py:10 msgid "Styria" -msgstr "Styria" +msgstr "Steiermark" #: contrib/localflavor/at/at_states.py:11 msgid "Tyrol" -msgstr "Tyrol" +msgstr "Tiroli" #: contrib/localflavor/at/at_states.py:12 msgid "Vorarlberg" @@ -1696,7 +1939,7 @@ msgstr "Vorarlberg" #: contrib/localflavor/at/at_states.py:13 msgid "Vienna" -msgstr "Vienna" +msgstr "Wien" #: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16 #: contrib/localflavor/no/forms.py:12 @@ -1875,6 +2118,83 @@ msgstr "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X." msgid "The Chilean RUT is not valid." msgstr "The Chilean RUT is not valid." +#: contrib/localflavor/cz/cz_regions.py:8 +msgid "Prague" +msgstr "Praha" + +#: contrib/localflavor/cz/cz_regions.py:9 +msgid "Central Bohemian Region" +msgstr "Central Bohemian Region" + +#: contrib/localflavor/cz/cz_regions.py:10 +msgid "South Bohemian Region" +msgstr "South Bohemian Region" + +#: contrib/localflavor/cz/cz_regions.py:11 +msgid "Pilsen Region" +msgstr "Pilsen Region" + +#: contrib/localflavor/cz/cz_regions.py:12 +msgid "Carlsbad Region" +msgstr "Carlsbad Region" + +#: contrib/localflavor/cz/cz_regions.py:13 +msgid "Usti Region" +msgstr "Usti Region" + +#: contrib/localflavor/cz/cz_regions.py:14 +msgid "Liberec Region" +msgstr "Liberec Region" + +#: contrib/localflavor/cz/cz_regions.py:15 +msgid "Hradec Region" +msgstr "Hradec Region" + +#: contrib/localflavor/cz/cz_regions.py:16 +msgid "Pardubice Region" +msgstr "Pardubice Region" + +#: contrib/localflavor/cz/cz_regions.py:17 +msgid "Vysocina Region" +msgstr "Vysocina Region" + +#: contrib/localflavor/cz/cz_regions.py:18 +msgid "South Moravian Region" +msgstr "South Moravian Region" + +#: contrib/localflavor/cz/cz_regions.py:19 +msgid "Olomouc Region" +msgstr "Olomouc Region" + +#: contrib/localflavor/cz/cz_regions.py:20 +msgid "Zlin Region" +msgstr "Zilin region" + +#: contrib/localflavor/cz/cz_regions.py:21 +msgid "Moravian-Silesian Region" +msgstr "Moravian-Silesian Region" + +#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "Syötä postinumero muodossa XXXXX tai XXX XX." + +#: contrib/localflavor/cz/forms.py:47 +msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." +msgstr "Syötä henkilötunnus muodossa XXXXXX/XXXX tai XXXXXXXXXX." + +#: contrib/localflavor/cz/forms.py:48 +msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" +msgstr "" +"Virheellinen valinnainen sukupuoli, valitse 'f' (nainen) tai 'm' (mies)" + +#: contrib/localflavor/cz/forms.py:49 +msgid "Enter a valid birth number." +msgstr "Syötä oikea henkilötunnus." + +#: contrib/localflavor/cz/forms.py:106 +msgid "Enter a valid IC number." +msgstr "Syötä oikea IC-tunnus." + #: contrib/localflavor/de/de_states.py:5 msgid "Baden-Wuerttemberg" msgstr "Baden-Wuerttemberg" @@ -2701,15 +3021,15 @@ msgstr "" msgid "Wrong checksum for the Tax Number (NIP)." msgstr "Wrong checksum for the Tax Number (NIP)." -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." -msgstr "National Business Register Number (REGON) consists of 7 or 9 digits." +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." +msgstr "National Business Register -numerossa (REGON) on 9 tai 14 numeroa." -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." msgstr "Wrong checksum for the National Business Register Number (REGON)." -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." msgstr "Syötä postinumero muodossa XX-XXX." @@ -2797,10 +3117,6 @@ msgstr "Puhelinnumeron tulee olla muodossa XXXX-XXXXXX." msgid "Enter a valid postal code in the format XXXXXX" msgstr "Syötä postinumero muodossa XXXXXX." -#: contrib/localflavor/sk/forms.py:30 -msgid "Enter a postal code in the format XXXXX or XXX XX." -msgstr "Syötä postinumero muodossa XXXXX tai XXX XX." - #: contrib/localflavor/sk/sk_districts.py:8 msgid "Banska Bystrica" msgstr "Banska Bystrica" @@ -3549,55 +3865,59 @@ msgstr "näyttönimi" msgid "sites" msgstr "sivustot" -#: db/models/fields/__init__.py:348 db/models/fields/__init__.py:683 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "Tarvitaan kokonaisluku." -#: db/models/fields/__init__.py:379 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." msgstr "Tarvitaan tosi (True) tai epätosi (False)." -#: db/models/fields/__init__.py:412 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Tämän kentän arvo ei voi olla \"null\"." -#: db/models/fields/__init__.py:428 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "Vain pilkulla erotetut kokonaisluvut kelpaavat tässä." -#: db/models/fields/__init__.py:459 +#: db/models/fields/__init__.py:474 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:468 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Päivämäärä %s ei kelpaa" -#: db/models/fields/__init__.py:532 db/models/fields/__init__.py:550 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 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:586 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." msgstr "Tähän tarvitaan desimaaliluku." -#: db/models/fields/__init__.py:719 +#: db/models/fields/__init__.py:686 +msgid "This value must be a float." +msgstr "Tämän luvun on oltava liukuluku." + +#: db/models/fields/__init__.py:746 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:817 db/models/fields/__init__.py:831 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." msgstr "Ajan täytyy olla muodossa TT:MM[:ss[.uuuuuu]]." -#: db/models/fields/related.py:761 +#: db/models/fields/related.py:792 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." -#: db/models/fields/related.py:838 +#: db/models/fields/related.py:870 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3656,130 +3976,177 @@ msgstr "Tässä luvussa saa olla enintään %s desimaalia." 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:287 forms/fields.py:848 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Syötä oikea päivämäärä." -#: forms/fields.py:321 forms/fields.py:849 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Syötä oikea kellonaika." -#: forms/fields.py:360 +#: forms/fields.py:361 msgid "Enter a valid date/time." msgstr "Syötä oikea pvm/kellonaika." -#: forms/fields.py:446 +#: forms/fields.py:447 msgid "No file was submitted. Check the encoding type on the form." msgstr "Tiedostoa ei lähetetty. Tarkista lomakkeen koodaus (encoding)." -#: forms/fields.py:447 +#: forms/fields.py:448 msgid "No file was submitted." msgstr "Yhtään tiedostoa ei ole lähetetty." -#: forms/fields.py:448 +#: forms/fields.py:449 msgid "The submitted file is empty." msgstr "Lähetetty tiedosto on tyhjä." -#: forms/fields.py:477 +#: forms/fields.py:450 +#, 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)." + +#: forms/fields.py:483 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:538 +#: forms/fields.py:544 msgid "Enter a valid URL." msgstr "Syötä oikea URL-osoite." -#: forms/fields.py:539 +#: forms/fields.py:545 msgid "This URL appears to be a broken link." msgstr "Tämä URL-osoite on rikkinäinen linkki." -#: forms/fields.py:618 forms/fields.py:696 +#: forms/fields.py:625 forms/fields.py:703 #, 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:697 forms/fields.py:758 forms/models.py:654 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:991 msgid "Enter a list of values." msgstr "Syötä lista." -#: forms/fields.py:877 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Syötä kelvollinen IPv4-osoite." -#: forms/fields.py:887 +#: forms/fields.py:902 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 (_ -)." -#: forms/formsets.py:242 forms/formsets.py:244 +#: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Järjestys" -#: forms/models.py:268 forms/models.py:277 +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 #, 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." -#: forms/models.py:584 +#: forms/models.py:581 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Korjaa kaksoisarvo kentälle %(field)s." + +#: forms/models.py:585 +#, 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:591 +#, python-format +msgid "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." +msgstr "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." + +#: forms/models.py:599 +msgid "Please correct the duplicate values below." +msgstr "Korjaa allaolevat kaksoisarvot." + +#: forms/models.py:855 +msgid "The inline foreign key did not match the parent instance primary key." +msgstr "Liittyvä perusavain ei vastannut vanhemman perusavainta." + +#: forms/models.py:918 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:655 +#: forms/models.py:992 #, 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." -#: template/defaultfilters.py:706 +#: forms/models.py:994 +#, python-format +msgid "\"%s\" is not a valid value for a primary key." +msgstr "\"%s\" ei kelpaa perusavaimeksi." + +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "kyllä,ei,ehkä" -#: template/defaultfilters.py:737 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d tavu" msgstr[1] "%(size)d tavua" -#: template/defaultfilters.py:739 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f Kt" -#: template/defaultfilters.py:741 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f Mt" -#: template/defaultfilters.py:742 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f Gt" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "ip" -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "ap" -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "IP" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "AP" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "keskiyö" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "keskipäivä" @@ -4003,33 +4370,33 @@ msgid_plural "minutes" msgstr[0] "minuutti" msgstr[1] "minuuttia" -#: utils/timesince.py:43 +#: utils/timesince.py:45 msgid "minutes" msgstr "minuuttia" -#: utils/timesince.py:48 +#: utils/timesince.py:50 #, python-format msgid "%(number)d %(type)s" msgstr "%(number)d %(type)s" -#: utils/timesince.py:54 +#: utils/timesince.py:56 #, python-format msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" -#: utils/translation/trans_real.py:403 +#: utils/translation/trans_real.py:399 msgid "DATE_FORMAT" msgstr "j.n.Y" -#: utils/translation/trans_real.py:405 +#: utils/translation/trans_real.py:401 msgid "TIME_FORMAT" msgstr "G:i" -#: utils/translation/trans_real.py:421 +#: utils/translation/trans_real.py:417 msgid "YEAR_MONTH_FORMAT" msgstr "N Y" -#: utils/translation/trans_real.py:422 +#: utils/translation/trans_real.py:418 msgid "MONTH_DAY_FORMAT" msgstr "N j, Y" @@ -4081,9 +4448,6 @@ msgstr "%(verbose_name)s on poistettu." #~ msgid "is valid rating" #~ msgstr "on sallittu pisteytys" -#~ msgid "comments" -#~ msgstr "kommentit" - #~ msgid "Content object" #~ msgstr "Kommentoitu kohde" @@ -4096,9 +4460,6 @@ msgstr "%(verbose_name)s on poistettu." #~ msgid "approved by staff" #~ msgstr "ylläpidon hyväksymä" -#~ msgid "free comment" -#~ msgstr "vapaa kommentti" - #~ msgid "free comments" #~ msgstr "vapaat kommentit" @@ -4165,9 +4526,6 @@ msgstr "%(verbose_name)s on poistettu." #~ msgid "Post a photo" #~ msgstr "Lähetä valokuva" -#~ msgid "Preview comment" -#~ msgstr "Esikatsele kommenttia" - #~ msgid "Your name:" #~ msgstr "Nimesi:" @@ -4295,9 +4653,6 @@ msgstr "%(verbose_name)s on poistettu." #~ msgid "Please enter both fields or leave them both empty." #~ msgstr "Täytä tai jätä tyhjäksi kummatkin kentät." -#~ msgid "This field must be given if %(field)s is %(value)s" -#~ msgstr "Tämä kenttä pitää täyttää, jos %(field)s on %(value)s." - #~ msgid "This field must be given if %(field)s is not %(value)s" #~ msgstr "Tämä kenttä pitää täyttää, jos %(field)s ei ole %(value)s." @@ -4307,9 +4662,6 @@ msgstr "%(verbose_name)s on poistettu." #~ msgid "This value must be between %(lower)s and %(upper)s." #~ msgstr "Tämän luvun on oltava välillä %(lower)s–%(upper)s." -#~ msgid "This value must be at least %s." -#~ msgstr "Tämän luvun on oltava vähintään %s." - #~ msgid "This value must be no more than %s." #~ msgstr "Tämän luvun on oltava enintään %s." diff --git a/django/conf/locale/he/LC_MESSAGES/django.mo b/django/conf/locale/he/LC_MESSAGES/django.mo index e471f5b199..8d8e328203 100644 Binary files a/django/conf/locale/he/LC_MESSAGES/django.mo and b/django/conf/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/he/LC_MESSAGES/django.po b/django/conf/locale/he/LC_MESSAGES/django.po index 5cf96f99fc..53b40132ba 100644 --- a/django/conf/locale/he/LC_MESSAGES/django.po +++ b/django/conf/locale/he/LC_MESSAGES/django.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-22 09:54-0500\n" -"PO-Revision-Date: 2009-04-22 10:54-0500\n" +"POT-Creation-Date: 2009-05-08 08:21-0500\n" +"PO-Revision-Date: 2009-05-08 15:31+0100\n" "Last-Translator: Alex \n" "Language-Team: Django-i18n \n" "MIME-Version: 1.0\n" @@ -219,16 +219,17 @@ msgstr "סינית פשוטה" msgid "Traditional Chinese" msgstr "סינית מסורתית" -#: contrib/admin/actions.py:56 +#: contrib/admin/actions.py:60 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s היו נמחקו בהצלחה." -#: contrib/admin/actions.py:63 contrib/admin/options.py:1023 +#: contrib/admin/actions.py:67 +#: contrib/admin/options.py:1025 msgid "Are you sure?" msgstr "האם את/ה בטוח/ה ?" -#: contrib/admin/actions.py:81 +#: contrib/admin/actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "מחק את %(verbose_name_plural)s שבחרת בו" @@ -242,8 +243,10 @@ msgstr "" "

            ע\"י %s:

            \n" "
              \n" -#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 -#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 +#: contrib/admin/filterspecs.py:75 +#: contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:147 +#: contrib/admin/filterspecs.py:173 msgid "All" msgstr "הכל" @@ -267,15 +270,18 @@ msgstr "החודש" msgid "This year" msgstr "השנה" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 +#: forms/widgets.py:434 msgid "Yes" msgstr "כן" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 +#: forms/widgets.py:434 msgid "No" msgstr "לא" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 +#: forms/widgets.py:434 msgid "Unknown" msgstr "לא ידוע" @@ -311,127 +317,132 @@ msgstr "רישום יומן" msgid "log entries" msgstr "רישומי יומן" -#: contrib/admin/options.py:133 contrib/admin/options.py:147 +#: contrib/admin/options.py:133 +#: contrib/admin/options.py:147 msgid "None" msgstr "ללא" -#: contrib/admin/options.py:517 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "%s שונה." -#: contrib/admin/options.py:517 contrib/admin/options.py:527 -#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306 +#: contrib/admin/options.py:519 +#: contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 +#: forms/models.py:388 +#: forms/models.py:587 msgid "and" msgstr "ו" -#: contrib/admin/options.py:522 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "התווסף %(name)s \"%(object)s\"." -#: contrib/admin/options.py:526 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "שונה %(list)s עבור %(name)s \"%(object)s\"." -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "נמחק %(name)s \"%(object)s\"." -#: contrib/admin/options.py:535 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "אף שדה לא השתנה." -#: contrib/admin/options.py:596 contrib/auth/admin.py:67 +#: contrib/admin/options.py:598 +#: contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה." -#: contrib/admin/options.py:600 contrib/admin/options.py:633 +#: contrib/admin/options.py:602 +#: contrib/admin/options.py:635 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "ניתן לערוך שוב מתחת" -#: contrib/admin/options.py:610 contrib/admin/options.py:643 +#: contrib/admin/options.py:612 +#: contrib/admin/options.py:645 #, python-format msgid "You may add another %s below." msgstr "ניתן להוסיף %s נוסף מתחת." -#: contrib/admin/options.py:631 +#: contrib/admin/options.py:633 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "שינוי %(name)s \"%(obj)s\" בוצע בהצלחה." -#: contrib/admin/options.py:639 +#: contrib/admin/options.py:641 #, python-format -msgid "" -"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן לערוך אותו שוב מתחת." -#: contrib/admin/options.py:770 +#: contrib/admin/options.py:772 #, python-format msgid "Add %s" msgstr "הוספת %s" -#: contrib/admin/options.py:801 contrib/admin/options.py:1001 +#: contrib/admin/options.py:803 +#: contrib/admin/options.py:1003 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "הפריט %(name)s עם המקש %(key)r אינו קיים." -#: contrib/admin/options.py:858 +#: contrib/admin/options.py:860 #, python-format msgid "Change %s" msgstr "שינוי %s" -#: contrib/admin/options.py:902 +#: contrib/admin/options.py:904 msgid "Database error" msgstr "שגיאת בסיס נתונים" -#: contrib/admin/options.py:938 +#: contrib/admin/options.py:940 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "שינוי %(count)s %(name)s בהצלחה." msgstr[1] "שינוי %(count)s %(name)s בהצלחה." -#: contrib/admin/options.py:1016 +#: contrib/admin/options.py:1018 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה." -#: contrib/admin/options.py:1052 +#: contrib/admin/options.py:1054 #, python-format msgid "Change history: %s" msgstr "היסטוריית שינוי: %s" -#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:20 +#: contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 -msgid "" -"Please enter a correct username and password. Note that both fields are case-" -"sensitive." -msgstr "" -"נא להזין שם משתמש וסיסמה נכונים. בשני השדות גודל האותיות האנגליות משנה." +msgid "Please enter a correct username and password. Note that both fields are case-sensitive." +msgstr "נא להזין שם משתמש וסיסמה נכונים. בשני השדות גודל האותיות האנגליות משנה." -#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:278 +#: contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "עליך להתחבר שנית כי פג הזמן המוקצב לך." -#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 -msgid "" -"Looks like your browser isn't configured to accept cookies. Please enable " -"cookies, reload this page, and try again." -msgstr "" -"נראה שהדפדפן שלך אינו מוגדר לקבל עוגיות. נא לאפשר עוגיות, לטעון מחדש את הדף " -"ולנסות שוב." +#: contrib/admin/sites.py:285 +#: contrib/admin/views/decorators.py:47 +msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again." +msgstr "נראה שהדפדפן שלך אינו מוגדר לקבל עוגיות. נא לאפשר עוגיות, לטעון מחדש את הדף ולנסות שוב." -#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/sites.py:301 +#: contrib/admin/sites.py:307 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "שם משתמש אינו יכול להכיל את התו '@'." -#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:304 +#: contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "כתובת הדוא\"ל שלך אינה שם המשתמש שלך. נסה/י '%s' במקום." @@ -440,7 +451,8 @@ msgstr "כתובת הדוא\"ל שלך אינה שם המשתמש שלך. נסה msgid "Site administration" msgstr "ניהול אתר" -#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:373 +#: contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" @@ -528,18 +540,14 @@ msgid "Server Error (500)" msgstr "שגיאת שרת (500)" #: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"התרחשה שגיאה. היא דווחה למנהלי האתר בדוא\"ל ותתוקן בקרוב. תודה על סבלנותך." +msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." +msgstr "התרחשה שגיאה. היא דווחה למנהלי האתר בדוא\"ל ותתוקן בקרוב. תודה על סבלנותך." #: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "הפעל את הפעולה שבחרת בה." #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "בצע" @@ -616,28 +624,20 @@ msgid "Filter" msgstr "סינון" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 +#: contrib/admin/templates/admin/submit_line.html:4 +#: forms/formsets.py:275 msgid "Delete" msgstr "מחיקה" #: contrib/admin/templates/admin/delete_confirmation.html:16 #, python-format -msgid "" -"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " -"related objects, but your account doesn't have permission to delete the " -"following types of objects:" -msgstr "" -"מחיקת %(object_name)s '%(escaped_object)s' מצריכה מחיקת אובייקטים מקושרים, " -"אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:" +msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" +msgstr "מחיקת %(object_name)s '%(escaped_object)s' מצריכה מחיקת אובייקטים מקושרים, אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:" #: contrib/admin/templates/admin/delete_confirmation.html:23 #, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " -"All of the following related items will be deleted:" -msgstr "" -"האם ברצונך למחוק את %(object_name)s \"%(escaped_object)s\"? כל הפריטים " -"הקשורים הבאים יימחקו:" +msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:" +msgstr "האם ברצונך למחוק את %(object_name)s \"%(escaped_object)s\"? כל הפריטים הקשורים הבאים יימחקו:" #: contrib/admin/templates/admin/delete_confirmation.html:28 #: contrib/admin/templates/admin/delete_selected_confirmation.html:33 @@ -650,22 +650,13 @@ msgstr "מחק כמה פריטים" #: contrib/admin/templates/admin/delete_selected_confirmation.html:15 #, python-format -msgid "" -"Deleting the %(object_name)s would result in deleting related objects, but " -"your account doesn't have permission to delete the following types of " -"objects:" -msgstr "" -"מחיקת %(object_name)s מצריכה מחיקת אובייקטים מקושרים, אך לחשבון שלך אין " -"הרשאות למחיקת סוגי האובייקטים הבאים:" +msgid "Deleting the %(object_name)s would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" +msgstr "מחיקת %(object_name)s מצריכה מחיקת אובייקטים מקושרים, אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:" #: contrib/admin/templates/admin/delete_selected_confirmation.html:22 #, python-format -msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and it's related items will be deleted:" -msgstr "" -"האם אתה בטוח שאתה רוצה למחוק את פריטי ה %(object_name)s שנבחרו. כל הפריטים " -"הבאים והחומר הנלווה אליהם יימחקו." +msgid "Are you sure you want to delete the selected %(object_name)s objects? All of the following objects and it's related items will be deleted:" +msgstr "האם אתה בטוח שאתה רוצה למחוק את פריטי ה %(object_name)s שנבחרו. כל הפריטים הבאים והחומר הנלווה אליהם יימחקו." #: contrib/admin/templates/admin/filter.html:2 #, python-format @@ -697,14 +688,13 @@ msgstr "הפעולות שלי" msgid "None available" msgstr "לא נמצאו" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "תוכן לא ידוע" + #: contrib/admin/templates/admin/invalid_setup.html:7 -msgid "" -"Something's wrong with your database installation. Make sure the appropriate " -"database tables have been created, and make sure the database is readable by " -"the appropriate user." -msgstr "" -"משהו שגוי בהתקנת בסיס הנתונים שלך. נא לוודא שנוצרו טבלאות בסיס הנתונים " -"המתאימות, ובסיס הנתונים ניתן לקריאה על ידי המשתמש המתאים." +msgid "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user." +msgstr "משהו שגוי בהתקנת בסיס הנתונים שלך. נא לוודא שנוצרו טבלאות בסיס הנתונים המתאימות, ובסיס הנתונים ניתן לקריאה על ידי המשתמש המתאים." #: contrib/admin/templates/admin/login.html:19 msgid "Username:" @@ -733,16 +723,17 @@ msgid "DATETIME_FORMAT" msgstr "d.m.‏Y H:i:s" #: contrib/admin/templates/admin/object_history.html:38 -msgid "" -"This object doesn't have a change history. It probably wasn't added via this " -"admin site." -msgstr "" -"לאובייקט זה אין היסטוריית שינוי. כנראה לא השתמשו בממשק הניהול הזה להוספתו." +msgid "This object doesn't have a change history. It probably wasn't added via this admin site." +msgstr "לאובייקט זה אין היסטוריית שינוי. כנראה לא השתמשו בממשק הניהול הזה להוספתו." #: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "הצג הכל" +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "חיפוש" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -772,21 +763,21 @@ msgid "Save and continue editing" msgstr "שמירה והמשך עריכה" #: contrib/admin/templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"ראשית יש להזין שם משתמש וסיסמה. לאחר מכן יהיה ביכולתך לערוך אפשרויות נוספות " -"עבור המשתמש." +msgid "First, enter a username and password. Then, you'll be able to edit more user options." +msgstr "ראשית יש להזין שם משתמש וסיסמה. לאחר מכן יהיה ביכולתך לערוך אפשרויות נוספות עבור המשתמש." #: contrib/admin/templates/admin/auth/user/add_form.html:13 -#: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59 +#: contrib/auth/forms.py:14 +#: contrib/auth/forms.py:47 +#: contrib/auth/forms.py:59 msgid "Username" msgstr "שם משתמש" #: contrib/admin/templates/admin/auth/user/add_form.html:20 #: contrib/admin/templates/admin/auth/user/change_password.html:34 -#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 +#: contrib/auth/forms.py:17 +#: contrib/auth/forms.py:60 +#: contrib/auth/forms.py:185 msgid "Password" msgstr "סיסמה" @@ -835,12 +826,8 @@ msgid "Your password was changed." msgstr "סיסמתך שונתה." #: contrib/admin/templates/registration/password_change_form.html:12 -msgid "" -"Please enter your old password, for security's sake, and then enter your new " -"password twice so we can verify you typed it in correctly." -msgstr "" -"נא להזין את סיסמתך הישנה, למען האבטחה, ולאחר מכן את סיסמתך החדשה פעמיים כדי " -"שנוכל לוודא שהקלדת אותה כראוי." +msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." +msgstr "נא להזין את סיסמתך הישנה, למען האבטחה, ולאחר מכן את סיסמתך החדשה פעמיים כדי שנוכל לוודא שהקלדת אותה כראוי." #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -888,9 +875,7 @@ msgid "Enter new password" msgstr "הזנת סיסמה חדשה" #: contrib/admin/templates/registration/password_reset_confirm.html:14 -msgid "" -"Please enter your new password twice so we can verify you typed it in " -"correctly." +msgid "Please enter your new password twice so we can verify you typed it in correctly." msgstr "נא להזין את סיסמתך החדשה פעמיים כדי שנוכל לוודא שהקלדת אותה כראוי." #: contrib/admin/templates/registration/password_reset_confirm.html:26 @@ -898,12 +883,8 @@ msgid "Password reset unsuccessful" msgstr "איפוס הסיסמה נכשל" #: contrib/admin/templates/registration/password_reset_confirm.html:28 -msgid "" -"The password reset link was invalid, possibly because it has already been " -"used. Please request a new password reset." -msgstr "" -"הקישור לאיפוס הסיסמה אינו חוקי. ייתכן והשתמשו בו כבר. נא לבקש איפוס סיסמה " -"חדש." +msgid "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." +msgstr "הקישור לאיפוס הסיסמה אינו חוקי. ייתכן והשתמשו בו כבר. נא לבקש איפוס סיסמה חדש." #: contrib/admin/templates/registration/password_reset_done.html:6 #: contrib/admin/templates/registration/password_reset_done.html:10 @@ -911,11 +892,8 @@ msgid "Password reset successful" msgstr "הסיסמה אופסה בהצלחה" #: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "" -"We've e-mailed you instructions for setting your password to the e-mail " -"address you submitted. You should be receiving it shortly." -msgstr "" -"שלחנו הוראות לקביעת הסיסמה אל כתובת הדוא\"ל שהזנת. ההודעה אמורה להתקבל בקרוב." +msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." +msgstr "שלחנו הוראות לקביעת הסיסמה אל כתובת הדוא\"ל שהזנת. ההודעה אמורה להתקבל בקרוב." #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" @@ -944,12 +922,8 @@ msgid "The %(site_name)s team" msgstr "צוות %(site_name)s" #: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll e-mail " -"instructions for setting a new one." -msgstr "" -"שכחת את סיסמתך ? נא להזין את כתובת הדוא\"ל מתחת, ואנו נשלח הוראות לקביעת " -"סיסמה חדשה." +msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." +msgstr "שכחת את סיסמתך ? נא להזין את כתובת הדוא\"ל מתחת, ואנו נשלח הוראות לקביעת סיסמה חדשה." #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" @@ -973,7 +947,8 @@ msgstr "בחירת %s" msgid "Select %s to change" msgstr "בחירת %s לשינוי" -#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 +#: contrib/admin/views/template.py:37 +#: contrib/sites/models.py:38 msgid "site" msgstr "אתר" @@ -981,17 +956,20 @@ msgstr "אתר" msgid "template" msgstr "תבנית" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 +#: contrib/admindocs/views.py:58 +#: contrib/admindocs/views.py:60 #: contrib/admindocs/views.py:62 msgid "tag:" msgstr "תג:" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 +#: contrib/admindocs/views.py:91 +#: contrib/admindocs/views.py:93 #: contrib/admindocs/views.py:95 msgid "filter:" msgstr "סינון:" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 +#: contrib/admindocs/views.py:155 +#: contrib/admindocs/views.py:157 #: contrib/admindocs/views.py:159 msgid "view:" msgstr "ה-view:" @@ -1011,8 +989,10 @@ msgstr "מודל %(model_name)r לא נמצא ביישום %(app_label)r" msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "אוביקטי `%(app_label)s.%(data_type)s` קשורים" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:247 msgid "model:" msgstr "מודל:" @@ -1036,9 +1016,12 @@ msgstr "מספר %s" msgid "Fields on %s objects" msgstr "Fields on %s objects" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:315 +#: contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:328 +#: contrib/admindocs/views.py:334 +#: contrib/admindocs/views.py:335 +#: contrib/admindocs/views.py:337 msgid "Integer" msgstr "מספר שלם" @@ -1046,7 +1029,8 @@ msgstr "מספר שלם" msgid "Boolean (Either True or False)" msgstr "בוליאני (אמת או שקר)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:317 +#: contrib/admindocs/views.py:336 #, python-format msgid "String (up to %(max_length)s)" msgstr "מחרוזת (עד %(max_length)s תווים)" @@ -1071,7 +1055,8 @@ msgstr "מספר עשרוני" msgid "E-mail address" msgstr "כתובת דוא\"ל" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:323 +#: contrib/admindocs/views.py:324 #: contrib/admindocs/views.py:327 msgid "File path" msgstr "נתיב קובץ" @@ -1080,7 +1065,8 @@ msgstr "נתיב קובץ" msgid "Floating point number" msgstr "מספר עשרוני" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +#: contrib/admindocs/views.py:329 +#: contrib/comments/models.py:60 msgid "IP address" msgstr "כתובת IP" @@ -1104,9 +1090,11 @@ msgstr "טקסט" msgid "Time" msgstr "זמן" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:340 +#: contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 -#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 +#: contrib/flatpages/admin.py:8 +#: contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" @@ -1154,9 +1142,7 @@ msgid "Documentation for this page" msgstr "תיעוד לדף זה" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:19 -msgid "" -"Jumps you from any page to the documentation for the view that generates " -"that page." +msgid "Jumps you from any page to the documentation for the view that generates that page." msgstr "מקפיץ אותך מכל עמוד לתיעוד התצוגה שייצרה אותו." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:21 @@ -1164,9 +1150,7 @@ msgid "Show object ID" msgstr "הצג מזהה אובייקט" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:22 -msgid "" -"Shows the content-type and unique ID for pages that represent a single " -"object." +msgid "Shows the content-type and unique ID for pages that represent a single object." msgstr "מציג את סוג התוכן והמזהה הייחודי לעמודים המייצגים אובייקט בודד." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:24 @@ -1214,15 +1198,14 @@ msgstr "הסיסמה שונתה בהצלחה." msgid "Change password: %s" msgstr "שינוי סיסמה: %s" -#: contrib/auth/forms.py:15 contrib/auth/forms.py:48 +#: contrib/auth/forms.py:15 +#: contrib/auth/forms.py:48 #: contrib/auth/models.py:128 -msgid "" -"Required. 30 characters or fewer. Alphanumeric characters only (letters, " -"digits and underscores)." -msgstr "" -"דורש 30 תווים או פחות. תווים אלפאנומריים בלבד (אותיות, ספרות וקווים תחתונים)." +msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)." +msgstr "דורש 30 תווים או פחות. תווים אלפאנומריים בלבד (אותיות, ספרות וקווים תחתונים)." -#: contrib/auth/forms.py:16 contrib/auth/forms.py:49 +#: contrib/auth/forms.py:16 +#: contrib/auth/forms.py:49 msgid "This value must contain only letters, numbers and underscores." msgstr "ערך זה חייב להכיל אותיות, ספרות וקווים תחתונים בלבד." @@ -1234,7 +1217,8 @@ msgstr "אימות סיסמה" msgid "A user with that username already exists." msgstr "משתמש עם שם משתמש זה קיים כבר" -#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:36 +#: contrib/auth/forms.py:155 #: contrib/auth/forms.py:197 msgid "The two password fields didn't match." msgstr "שני שדות הסיסמה אינם זהים." @@ -1244,9 +1228,7 @@ msgid "This account is inactive." msgstr "חשבון זה אינו פעיל." #: contrib/auth/forms.py:87 -msgid "" -"Your Web browser doesn't appear to have cookies enabled. Cookies are " -"required for logging in." +msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in." msgstr "נראה שעוגיות לא מאופשרות בדפדפן שלך. הן נדרשות כדי להתחבר." #: contrib/auth/forms.py:100 @@ -1254,9 +1236,7 @@ msgid "E-mail" msgstr "כתובת דוא\"ל" #: contrib/auth/forms.py:109 -msgid "" -"That e-mail address doesn't have an associated user account. Are you sure " -"you've registered?" +msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?" msgstr "כתובת דואר אלקטרוני זו אינה משוייכת למשתמש. בטוח שנרשמת ?" #: contrib/auth/forms.py:135 @@ -1280,7 +1260,8 @@ msgstr "סיסמה ישנה" msgid "Your old password was entered incorrectly. Please enter it again." msgstr "סיסמתך הישנה הוזנה בצורה שגויה. נא להזינה שוב." -#: contrib/auth/models.py:63 contrib/auth/models.py:86 +#: contrib/auth/models.py:63 +#: contrib/auth/models.py:86 msgid "name" msgstr "שם" @@ -1292,7 +1273,8 @@ msgstr "שם קוד" msgid "permission" msgstr "הרשאה" -#: contrib/auth/models.py:69 contrib/auth/models.py:87 +#: contrib/auth/models.py:69 +#: contrib/auth/models.py:87 msgid "permissions" msgstr "הרשאות" @@ -1300,7 +1282,8 @@ msgstr "הרשאות" msgid "group" msgstr "קבוצה" -#: contrib/auth/models.py:91 contrib/auth/models.py:138 +#: contrib/auth/models.py:91 +#: contrib/auth/models.py:138 msgid "groups" msgstr "קבוצות" @@ -1325,12 +1308,8 @@ msgid "password" msgstr "סיסמה" #: contrib/auth/models.py:132 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"יש להזין '[algo]$[salt]$[hexdigest]' או להשתמש בטופס " -"שינוי הסיסמה." +msgid "Use '[algo]$[salt]$[hexdigest]' or use the change password form." +msgstr "יש להזין '[algo]$[salt]$[hexdigest]' או להשתמש בטופס שינוי הסיסמה." #: contrib/auth/models.py:133 msgid "staff status" @@ -1345,21 +1324,15 @@ msgid "active" msgstr "פעיל" #: contrib/auth/models.py:134 -msgid "" -"Designates whether this user should be treated as active. Unselect this " -"instead of deleting accounts." -msgstr "" -"מציין האם יש להתייחס למשתמש כפעיל. יש לבטל בחירה זו במקום למחוק חשבונות " -"משתמשים." +msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts." +msgstr "מציין האם יש להתייחס למשתמש כפעיל. יש לבטל בחירה זו במקום למחוק חשבונות משתמשים." #: contrib/auth/models.py:135 msgid "superuser status" msgstr "סטטוס משתמש על" #: contrib/auth/models.py:135 -msgid "" -"Designates that this user has all permissions without explicitly assigning " -"them." +msgid "Designates that this user has all permissions without explicitly assigning them." msgstr "מציין שלמשתמש זה יש את כל ההרשאות ללא הצורך המפורש בהענקתן." #: contrib/auth/models.py:136 @@ -1371,18 +1344,15 @@ msgid "date joined" msgstr "תאריך הצטרפות" #: contrib/auth/models.py:139 -msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "" -"בנוסף לכל ההרשאות שהוקצו ידנית, יוענקו למשתמש גם כל ההרשאות של כל קבוצה " -"המשוייכת אליו." +msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." +msgstr "בנוסף לכל ההרשאות שהוקצו ידנית, יוענקו למשתמש גם כל ההרשאות של כל קבוצה המשוייכת אליו." #: contrib/auth/models.py:140 msgid "user permissions" msgstr "הרשאות משתמש" -#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/auth/models.py:144 +#: contrib/comments/models.py:50 #: contrib/comments/models.py:168 msgid "user" msgstr "משתמש" @@ -1399,7 +1369,8 @@ msgstr "הודעה" msgid "Logged out" msgstr "יצאת מהמערכת" -#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 +#: contrib/auth/management/commands/createsuperuser.py:23 +#: forms/fields.py:429 msgid "Enter a valid e-mail address." msgstr "יש להזין כתובת דוא\"ל חוקית." @@ -1443,11 +1414,11 @@ msgstr[0] "שמור על לשונך! המילה %s אסורה לשימוש כא msgstr[1] "שמור על לשונך! המילים %s אסורות לשימוש כאן." #: contrib/comments/forms.py:180 -msgid "" -"If you enter anything in this field your comment will be treated as spam" +msgid "If you enter anything in this field your comment will be treated as spam" msgstr "אם יוזן משהו בשדה היחס לתגובתך יהיה כמו לספאם" -#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +#: contrib/comments/models.py:22 +#: contrib/contenttypes/models.py:74 msgid "content type" msgstr "סוג תוכן" @@ -1467,7 +1438,8 @@ msgstr "כתובת דוא\"ל משתמש" msgid "user's URL" msgstr "אתר המשתמש" -#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:56 +#: contrib/comments/models.py:76 #: contrib/comments/models.py:169 msgid "comment" msgstr "תגובה" @@ -1481,8 +1453,7 @@ msgid "is public" msgstr "ציבורי" #: contrib/comments/models.py:62 -msgid "" -"Uncheck this box to make the comment effectively disappear from the site." +msgid "Uncheck this box to make the comment effectively disappear from the site." msgstr "ביטול סימון תיבה תעלים בפועל את התגובה מהאתר" #: contrib/comments/models.py:64 @@ -1490,26 +1461,19 @@ msgid "is removed" msgstr "האם הוסר" #: contrib/comments/models.py:65 -msgid "" -"Check this box if the comment is inappropriate. A \"This comment has been " -"removed\" message will be displayed instead." -msgstr "" -"יש לסמן תיבה זו עבור תגובה לא נאותה. הודעת \"תגובה זו נמחקה\" תוצג במקום." +msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead." +msgstr "יש לסמן תיבה זו עבור תגובה לא נאותה. הודעת \"תגובה זו נמחקה\" תוצג במקום." #: contrib/comments/models.py:77 msgid "comments" msgstr "תגובות" #: contrib/comments/models.py:119 -msgid "" -"This comment was posted by an authenticated user and thus the name is read-" -"only." +msgid "This comment was posted by an authenticated user and thus the name is read-only." msgstr "הודעה זו נשלחה ע\"י משתמש מחובר לכן השם הוא לקריאה בלבד." #: contrib/comments/models.py:128 -msgid "" -"This comment was posted by an authenticated user and thus the email is read-" -"only." +msgid "This comment was posted by an authenticated user and thus the email is read-only." msgstr "הודעה זו נשלחה ע\"י משתמש מחובר לכן כתובת הדוא\"ל לקריאה בלבד." #: contrib/comments/models.py:153 @@ -1563,8 +1527,7 @@ msgstr "תודה על השימוש באתר שלנו!" #: contrib/comments/templates/comments/approved.html:7 #: contrib/comments/templates/comments/deleted.html:7 #: contrib/comments/templates/comments/flagged.html:7 -msgid "" -"Thanks for taking the time to improve the quality of discussion on our site" +msgid "Thanks for taking the time to improve the quality of discussion on our site" msgstr "תודה שהקדשת מזמנך כדי לשפר את האתר שלנו" #: contrib/comments/templates/comments/delete.html:4 @@ -1679,15 +1642,11 @@ msgid "content types" msgstr "סוגי תוכן" #: contrib/flatpages/admin.py:9 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"לדוגמא: '/about/contact/'. יש לוודא הימצאות הקווים הנטויים בהתחלה ובסוף." +msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "לדוגמא: '/about/contact/'. יש לוודא הימצאות הקווים הנטויים בהתחלה ובסוף." #: contrib/flatpages/admin.py:11 -msgid "" -"This value must contain only letters, numbers, underscores, dashes or " -"slashes." +msgid "This value must contain only letters, numbers, underscores, dashes or slashes." msgstr "ערך זה חייב להכיל אותיות, ספרות, מקפים, קווים תחתונים ונטויים בלבד." #: contrib/flatpages/admin.py:22 @@ -1711,12 +1670,8 @@ msgid "template name" msgstr "שם תבנית" #: contrib/flatpages/models.py:12 -msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." -msgstr "" -"דוגמא: 'flatpages/contact_page.html'. אם זה לא צויין, המערכת תשתמש " -"ב-'flatpages/default.html'." +msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'." +msgstr "דוגמא: 'flatpages/contact_page.html'. אם זה לא צויין, המערכת תשתמש ב-'flatpages/default.html'." #: contrib/flatpages/models.py:13 msgid "registration required" @@ -1735,24 +1690,25 @@ msgid "flat pages" msgstr "דפים פשוטים" #: contrib/formtools/wizard.py:130 -msgid "" -"We apologize, but your form has expired. Please continue filling out the " -"form from this page." -msgstr "" -"לצערנו פג תוקף הטופס שלך. עליך להמשיך למלא את הטופס מן העמוד הזה ואילך." +msgid "We apologize, but your form has expired. Please continue filling out the form from this page." +msgstr "לצערנו פג תוקף הטופס שלך. עליך להמשיך למלא את הטופס מן העמוד הזה ואילך." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "לא סופק ערך גיאומטרי." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "ערך גאומטרי שגוי." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "סוג גיאומטרי שגוי." +#: contrib/gis/forms/fields.py:20 +msgid "An error occurred when transforming the geometry to the SRID of the geometry form field." +msgstr "הייתה בעיה עם השינוי של הצורה לסוג של השדה." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "רביעי" @@ -1842,8 +1798,10 @@ msgstr "אתמול" msgid "Enter a postal code in the format NNNN or ANNNNAAA." msgstr "יש להזין קוד דואר בתחביר NNNN או ANNNNAAA." -#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96 -#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 +#: contrib/localflavor/ar/forms.py:49 +#: contrib/localflavor/br/forms.py:96 +#: contrib/localflavor/br/forms.py:135 +#: contrib/localflavor/pe/forms.py:23 #: contrib/localflavor/pe/forms.py:51 msgid "This field requires only numbers." msgstr "יש להזין רק ספרות בשדה זה." @@ -1896,7 +1854,8 @@ msgstr "פורארלברג" msgid "Vienna" msgstr "וינה" -#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16 +#: contrib/localflavor/at/forms.py:20 +#: contrib/localflavor/ch/forms.py:16 #: contrib/localflavor/no/forms.py:12 msgid "Enter a zip code in the format XXXX." msgstr "יש להזין מיקוד בתחביר XXXX." @@ -1918,9 +1877,7 @@ msgid "Phone numbers must be in XX-XXXX-XXXX format." msgstr "מספרי טלפון חייבים להיות בתחביר XX-XXXX-XXXX." #: contrib/localflavor/br/forms.py:58 -msgid "" -"Select a valid brazilian state. That state is not one of the available " -"states." +msgid "Select a valid brazilian state. That state is not one of the available states." msgstr "נא לבחור מדינה ברזילאית חוקית. מדינה זו אינה אחת מהמדינות האפשריות." #: contrib/localflavor/br/forms.py:94 @@ -2052,9 +2009,7 @@ msgid "Zurich" msgstr "ציריך" #: contrib/localflavor/ch/forms.py:64 -msgid "" -"Enter a valid Swiss identity or passport card number in X1234567<0 or " -"1234567890 format." +msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format." msgstr "יש להזין מספר זיהוי או דרכון שוויצרי בתחביר X1234567<0 או 1234567890." #: contrib/localflavor/cl/forms.py:29 @@ -2125,7 +2080,8 @@ msgstr "מחוז זלין" msgid "Moravian-Silesian Region" msgstr "איזור מורביה – שלזיה" -#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +#: contrib/localflavor/cz/forms.py:27 +#: contrib/localflavor/sk/forms.py:30 msgid "Enter a postal code in the format XXXXX or XXX XX." msgstr "יש להזין קוד דואר בתחביר XXXXX או XXX XX." @@ -2209,15 +2165,14 @@ msgstr "שלזוויג-הולשטיין" msgid "Thuringia" msgstr "תורינגיה" -#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 +#: contrib/localflavor/de/forms.py:14 +#: contrib/localflavor/fi/forms.py:12 #: contrib/localflavor/fr/forms.py:15 msgid "Enter a zip code in the format XXXXX." msgstr "יש להזין מיקוד בתחביר XXXXX." #: contrib/localflavor/de/forms.py:41 -msgid "" -"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " -"format." +msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format." msgstr "יש להזין מספר זיהוי גרמני חוקי בתחביר XXXXXXXXXXX-XXXXXXX-XXXXXXX-X." #: contrib/localflavor/es/es_provinces.py:5 @@ -2492,11 +2447,8 @@ msgid "Enter a valid postal code in the range and format 01XXX - 52XXX." msgstr "נא להזיו מיקוד חוקי בתחום ובתחביר 01XXX - 52XXX." #: contrib/localflavor/es/forms.py:39 -msgid "" -"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or " -"9XXXXXXXX." -msgstr "" -"נא להזין מספר טלפון חוקי באחד מהתחבירים 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX." +msgid "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX." +msgstr "נא להזין מספר טלפון חוקי באחד מהתחבירים 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX." #: contrib/localflavor/es/forms.py:66 msgid "Please enter a valid NIF, NIE, or CIF." @@ -2519,8 +2471,7 @@ msgid "Invalid checksum for CIF." msgstr "סיכום ביקורת שגוי עבור CIF." #: contrib/localflavor/es/forms.py:142 -msgid "" -"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." +msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." msgstr "נא להזין חשבון בנק חוקי בתחביר XXXX-XXXX-XX-XXXXXXXXXX." #: contrib/localflavor/es/forms.py:143 @@ -2536,8 +2487,7 @@ msgid "Enter a zip code in the format XXXXXXX." msgstr "יש להזין מיקוד בתחביר XXXXXXX." #: contrib/localflavor/is_/forms.py:17 -msgid "" -"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." +msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." msgstr "יש להזין מספר זיהוי איסלנדי חוקי. התחביר הוא XXXXXX-XXXX." #: contrib/localflavor/is_/forms.py:18 @@ -2957,8 +2907,7 @@ msgid "Wrong checksum for the National Identification Number." msgstr "סכום ביקורת שגוי עבודי מספר הזיהוי הלאומי" #: contrib/localflavor/pl/forms.py:71 -msgid "" -"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." +msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." msgstr "נא להזין שדה מספר מס (NIP) בתחביר XXX-XXX-XX-XX או XX-XX-XXX-XXX." #: contrib/localflavor/pl/forms.py:72 @@ -3750,9 +3699,7 @@ msgid "redirect from" msgstr "הפניה מ" #: contrib/redirects/models.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." +msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'." msgstr "זה אמור להיות נתיב מלא, ללא שם המתחם. לדוגמא: '/‎/events/search'." #: contrib/redirects/models.py:9 @@ -3760,9 +3707,7 @@ msgid "redirect to" msgstr "הפניה אל" #: contrib/redirects/models.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." +msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." msgstr "יכול להיות נתיב מלא (כנ\"ל) או URL מלא המתחיל ב'http://'." #: contrib/redirects/models.py:13 @@ -3805,7 +3750,8 @@ msgstr "שם לתצוגה" msgid "sites" msgstr "אתרים" -#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 +#: db/models/fields/__init__.py:356 +#: db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "ערך זה חייב להיות מספר שלם." @@ -3830,7 +3776,8 @@ msgstr "יש להזין תאריך במבנה YYYY-MM-DD." msgid "Invalid date: %s" msgstr "תאריך שגוי: %s" -#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 +#: db/models/fields/__init__.py:547 +#: db/models/fields/__init__.py:565 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format." msgstr "נא להזין תאריך/שעה חוקיים בתחביר YYYY-MM-DD HH:MM[:ss[.uuuuuu]]." @@ -3846,21 +3793,19 @@ msgstr "על הערך הזה להיות ערך מספר עשרוני." msgid "This value must be either None, True or False." msgstr "ערך זה חייב להיות כלום, אמת או שקר." -#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 +#: db/models/fields/__init__.py:849 +#: db/models/fields/__init__.py:863 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." msgstr "נא להזין זמן חוקי בתחביר HH:MM[:ss[.uuuuuu]]." #: db/models/fields/related.py:792 -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "" -"יש להחזיק את \"Control\", או \"Command\" על מק, לחוץ כדי לבחור יותר מאחד." +msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "יש להחזיק את \"Control\", או \"Command\" על מק, לחוץ כדי לבחור יותר מאחד." #: db/models/fields/related.py:870 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "" -"Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." msgstr[0] "נא להזין מזהה %(self)s חוקי. הערך %(value)r אינו חוקי." msgstr[1] "נא להזין מזהי %(self)s חוקיים. הערכים %(value)r אינם חוקיים." @@ -3886,17 +3831,22 @@ msgstr "נא לוודא שערך זה מכיל לפחות %(min)d תווים (מ msgid "Enter a whole number." msgstr "נא להזין מספר שלם." -#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225 +#: forms/fields.py:167 +#: forms/fields.py:196 +#: forms/fields.py:225 #, python-format msgid "Ensure this value is less than or equal to %s." msgstr "יש לוודא שערך זה פחות מ או שווה ל %s." -#: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226 +#: forms/fields.py:168 +#: forms/fields.py:197 +#: forms/fields.py:226 #, python-format msgid "Ensure this value is greater than or equal to %s." msgstr "יש לוודא שהערך גדול מ או שווה ל %s." -#: forms/fields.py:195 forms/fields.py:224 +#: forms/fields.py:195 +#: forms/fields.py:224 msgid "Enter a number." msgstr "נא להזין מספר." @@ -3915,11 +3865,13 @@ msgstr "נא לוודא שאין יותר מ-%s ספרות אחרי הנקודה msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "נא לוודא שאין יותר מ-%s ספרות לפני הנקודה העשרונית" -#: forms/fields.py:288 forms/fields.py:862 +#: forms/fields.py:288 +#: forms/fields.py:863 msgid "Enter a valid date." msgstr "יש להזין תאריך חוקי." -#: forms/fields.py:322 forms/fields.py:863 +#: forms/fields.py:322 +#: forms/fields.py:864 msgid "Enter a valid time." msgstr "יש להזין שעה חוקית." @@ -3941,14 +3893,11 @@ msgstr "הקובץ שנשלח ריק." #: forms/fields.py:450 #, python-format -msgid "" -"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgid "Ensure this filename has at most %(max)d characters (it has %(length)d)." msgstr "על שם הקובץ להיות לא יותר מ %(max)d תווים (יש לו%(length)d)." #: forms/fields.py:483 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." +msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." msgstr "נא להעלות תמונה חוקית. הקובץ שהעלת אינו תמונה או מכיל תמונה מקולקלת." #: forms/fields.py:544 @@ -3959,47 +3908,75 @@ msgstr "יש להזין URL חוקי." msgid "This URL appears to be a broken link." msgstr "ה-URL הזה נראה כקישור שבור." -#: forms/fields.py:624 forms/fields.py:702 +#: forms/fields.py:625 +#: forms/fields.py:703 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "יש לבחור אפשרות חוקית. %(value)s אינו בין האפשרויות הזמינות." -#: forms/fields.py:703 forms/fields.py:764 forms/models.py:780 +#: forms/fields.py:704 +#: forms/fields.py:765 +#: forms/models.py:962 msgid "Enter a list of values." msgstr "יש להזין רשימת ערכים" -#: forms/fields.py:891 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "יש להזין כתובת IPv4 חוקית." -#: forms/fields.py:901 -msgid "" -"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +#: forms/fields.py:902 +msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "יש להזין ערך המכיל אותיות, ספרות, קווים תחתונים ומקפים בלבד." -#: forms/formsets.py:271 forms/formsets.py:273 +#: forms/formsets.py:271 +#: forms/formsets.py:273 msgid "Order" msgstr "מיון" -#: forms/models.py:299 forms/models.py:308 +#: forms/models.py:367 +#, python-format +msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." +msgstr "%(field_name)s חייב להיות ייחודי ל%(lookup)s של ה%(date_field)s" + +#: forms/models.py:381 +#: forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s·עם·%(field_label)s·זה קיימת כבר." -#: forms/models.py:655 +#: forms/models.py:581 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "נא לתקן את הערכים כפולים ל%(field)s." + +#: forms/models.py:585 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "נא לתקן את הערכים כפולים ל%(field)s, זה חייב להיות ייחודי." + +#: forms/models.py:591 +#, 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:599 +msgid "Please correct the duplicate values below." +msgstr "נא לתקן את הערכים כפולים מתחת." + +#: forms/models.py:837 msgid "The inline foreign key did not match the parent instance primary key." msgstr "הרצופות מפתח זר לא תאם את האב מופע המפתח העיקרי." -#: forms/models.py:710 +#: forms/models.py:892 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "יש לבחור אפשרות חוקית; '%(data)s' אינו בין %(choices)s." -#: forms/models.py:781 +#: forms/models.py:963 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "יש לבחור אפשרות חוקית. %s אינו בין האפשרויות הזמינות." -#: forms/models.py:783 +#: forms/models.py:965 #, python-format msgid "\"%s\" is not a valid value for a primary key." msgstr "\"%s\" איננו חוקי כמקש עיקרי." @@ -4118,23 +4095,28 @@ msgstr "ינואר" msgid "February" msgstr "פברואר" -#: utils/dates.py:18 utils/dates.py:31 +#: utils/dates.py:18 +#: utils/dates.py:31 msgid "March" msgstr "מרס" -#: utils/dates.py:18 utils/dates.py:31 +#: utils/dates.py:18 +#: utils/dates.py:31 msgid "April" msgstr "אפריל" -#: utils/dates.py:18 utils/dates.py:31 +#: utils/dates.py:18 +#: utils/dates.py:31 msgid "May" msgstr "מאי" -#: utils/dates.py:18 utils/dates.py:31 +#: utils/dates.py:18 +#: utils/dates.py:31 msgid "June" msgstr "יוני" -#: utils/dates.py:19 utils/dates.py:31 +#: utils/dates.py:19 +#: utils/dates.py:31 msgid "July" msgstr "יולי" @@ -4319,392 +4301,3 @@ msgstr "ה-%(verbose_name)s עודכן בהצלחה." msgid "The %(verbose_name)s was deleted." msgstr "ה-%(verbose_name)s נמחק." -#~ msgid "DATE_WITH_TIME_FULL" -#~ msgstr "l d.m.y H:i:s" - -#~ msgid "headline" -#~ msgstr "כותרת" - -#~ msgid "rating #1" -#~ msgstr "דירוג #1" - -#~ msgid "rating #2" -#~ msgstr "דירוג #2" - -#~ msgid "rating #3" -#~ msgstr "דירוג #3" - -#~ msgid "rating #4" -#~ msgstr "דירוג #4" - -#~ msgid "rating #5" -#~ msgstr "דירוג #5" - -#~ msgid "rating #6" -#~ msgstr "דירוג #6" - -#~ msgid "rating #7" -#~ msgstr "דירוג #7" - -#~ msgid "rating #8" -#~ msgstr "דירוג #8" - -#~ msgid "is valid rating" -#~ msgstr "האם דירוג חוקי" - -#~ msgid "Content object" -#~ msgstr "אובייקט תוכן" - -#~ msgid "person's name" -#~ msgstr "שם" - -#~ msgid "ip address" -#~ msgstr "כתובת IP" - -#~ msgid "approved by staff" -#~ msgstr "אושר ע\"י הצוות" - -#~ msgid "free comments" -#~ msgstr "הערות אנונימיות" - -#~ msgid "score" -#~ msgstr "ציון" - -#~ msgid "score date" -#~ msgstr "תאריך ציון" - -#~ msgid "karma score" -#~ msgstr "ניקוד קארמה" - -#~ msgid "karma scores" -#~ msgstr "ניקודי קארמה" - -#~ msgid "%(score)d rating by %(user)s" -#~ msgstr "%(score)d·דירוג ע\"י·%(user)s" - -#~ msgid "" -#~ "This comment was flagged by %(user)s:\n" -#~ "\n" -#~ "%(text)s" -#~ msgstr "" -#~ "התגובה סומנה ע\"י %(user)s:\n" -#~ "\n" -#~ "%(text)s" - -#~ msgid "flag date" -#~ msgstr "תאריך סימון" - -#~ msgid "user flag" -#~ msgstr "סימון ע\"י משתמש" - -#~ msgid "user flags" -#~ msgstr "סימונים ע\"י משתמש" - -#~ msgid "Flag by %r" -#~ msgstr "סימון ע\"י %r" - -#~ msgid "deletion date" -#~ msgstr "תאריך מחיקה" - -#~ msgid "moderator deletion" -#~ msgstr "מחיקת מודרטור" - -#~ msgid "moderator deletions" -#~ msgstr "מחיקות מודרטור" - -#~ msgid "Moderator deletion by %r" -#~ msgstr "מחיקת מודרציה ע\"י %r" - -#~ msgid "Forgotten your password?" -#~ msgstr "שכחת את סיסמתך?" - -#~ msgid "Ratings" -#~ msgstr "דירוג" - -#~ msgid "Required" -#~ msgstr "נדרש" - -#~ msgid "Optional" -#~ msgstr "אופציונלי" - -#~ msgid "Post a photo" -#~ msgstr "שליחת תמונה" - -#~ msgid "Your name:" -#~ msgstr "שמך:" - -#~ msgid "" -#~ "This rating is required because you've entered at least one other rating." -#~ msgstr "הדירוג נדרש מאחר והזנת לפחות דרוג אחד אחר." - -#~ msgid "" -#~ "This comment was posted by a user who has posted fewer than %(count)s " -#~ "comment:\n" -#~ "\n" -#~ "%(text)s" -#~ msgid_plural "" -#~ "This comment was posted by a user who has posted fewer than %(count)s " -#~ "comments:\n" -#~ "\n" -#~ "%(text)s" -#~ msgstr[0] "" -#~ "ההודעה נשלחה ע\"י משתמש ששלח פחות מ-%(count)s תגובה:\n" -#~ "\n" -#~ "%(text)s" -#~ msgstr[1] "" -#~ "ההודעה נשלחה ע\"י משתמש ששלח פחות מ-%(count)s תגובות:\n" -#~ "\n" -#~ "%(text)s" - -#~ msgid "Only POSTs are allowed" -#~ msgstr "רק פעולות POST מותרות" - -#~ msgid "One or more of the required fields wasn't submitted" -#~ msgstr "אחד או יותר מהשדות הנדרשים אינו נשלח." - -#~ msgid "Somebody tampered with the comment form (security violation)" -#~ msgstr "מישהו התעסק עם טופס התגובה (הפרת אבטחה)" - -#~ msgid "" -#~ "The comment form had an invalid 'target' parameter -- the object ID was " -#~ "invalid" -#~ msgstr "טופס התגובה הכיל פרמטר target לא חוקי -- מזהה האובייקט אינו חוקי" - -#~ msgid "The comment form didn't provide either 'preview' or 'post'" -#~ msgstr "טופס התגובה לא הכיל 'preview' או 'post'" - -#~ msgid "Anonymous users cannot vote" -#~ msgstr "משתמשים אנונימיים אינם יכולים להצביע" - -#~ msgid "Invalid comment ID" -#~ msgstr "מזהה תגובה שגוי" - -#~ msgid "No voting for yourself" -#~ msgstr "לא ניתן להצביע לעצמך" - -#~ msgid "Uppercase letters are not allowed here." -#~ msgstr "אסור להשתמש באותיות גדולות." - -#~ msgid "Lowercase letters are not allowed here." -#~ msgstr "אסור להשתמש באותיות קטנות." - -#~ msgid "Enter valid e-mail addresses separated by commas." -#~ msgstr "יש להזין רק כתובות דוא\"ל מופרדות בפסיקים." - -#~ msgid "Please enter a valid IP address." -#~ msgstr "נא להזין כתובת IP חוקית." - -#~ msgid "Empty values are not allowed here." -#~ msgstr "חובה להזין ערך בשדה זה." - -#~ msgid "Non-numeric characters aren't allowed here." -#~ msgstr "מותר להזין ספרות בלבד." - -#~ msgid "This value can't be comprised solely of digits." -#~ msgstr "ערך זה אינו יכול להכיל ספרות בלבד." - -#~ msgid "Only alphabetical characters are allowed here." -#~ msgstr "יש להזין כאן אותיות בלבד." - -#~ msgid "Enter a valid time in HH:MM format." -#~ msgstr "יש להזין שעה במבנה HH:MM." - -#~ msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -#~ msgstr "יש להזין תאריך ושעה במבנה YYYY-MM-DD HH:MM." - -#~ msgid "The URL %s does not point to a valid image." -#~ msgstr "ה-URL %s אנו מצביע לתמונה חוקית." - -#~ msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -#~ msgstr "מספרי טלפון חייבים להיות במבנה XXX-XXX-XXXX.‏ \"%s\" אינו חוקי." - -#~ msgid "The URL %s does not point to a valid QuickTime video." -#~ msgstr "ה-URL‏ %s אינו מצביע לסרטון QuickTime חוקי." - -#~ msgid "A valid URL is required." -#~ msgstr "יש להזין URL חוקי." - -#~ msgid "" -#~ "Valid HTML is required. Specific errors are:\n" -#~ "%s" -#~ msgstr "" -#~ "יש להזין HTML חוקי. שגיאות ספציפיות:\n" -#~ "%s" - -#~ msgid "Badly formed XML: %s" -#~ msgstr "מבנה XML שגוי: %s" - -#~ msgid "Invalid URL: %s" -#~ msgstr "URL שגוי: %s" - -#~ msgid "The URL %s is a broken link." -#~ msgstr "ה-URL‏ %s הוא קישור שבור." - -#~ msgid "Enter a valid U.S. state abbreviation." -#~ msgstr "יש להזין קיצור חוקי למדינה בארה\"ב." - -#~ msgid "This field must match the '%s' field." -#~ msgstr "תוכן השדה חייב להיות זהה לשדה '%s'." - -#~ msgid "Please enter something for at least one field." -#~ msgstr "יש להזין תוכן בלפחות אחד מהשדות." - -#~ msgid "Please enter both fields or leave them both empty." -#~ msgstr "יש להזין תוכן בשני השדות או להשאיר את שניהם ריקים." - -#~ msgid "This field must be given if %(field)s is %(value)s" -#~ msgstr "יש להזין תוכן בשדה זה אם שדה %(field)s מכיל %(value)s" - -#~ msgid "This field must be given if %(field)s is not %(value)s" -#~ msgstr "יש להזין תוכן בשדה זה אם תוכן שדה %(field)s אינו %(value)s" - -#~ msgid "Duplicate values are not allowed." -#~ msgstr "לא ניתן להזין ערכים כפולים." - -#~ msgid "This value must be between %(lower)s and %(upper)s." -#~ msgstr "ערך זה חייב להיות בין %(lower)s ל-%(upper)s." - -#~ msgid "This value must be no more than %s." -#~ msgstr "ערך זה אינו יכול להיות יותר מ-%s." - -#~ msgid "This value must be a power of %s." -#~ msgstr "ערך זה חייב להיות חזקה של %s." - -#~ msgid "Please enter a valid decimal number." -#~ msgstr "יש להזין מספר עשרוני חוקי." - -#~ msgid "Please enter a valid decimal number with at most %s total digit." -#~ msgid_plural "" -#~ "Please enter a valid decimal number with at most %s total digits." -#~ msgstr[0] "יש להזין מספר עשרוני חוקי עם ספרה %s לכל היותר." -#~ msgstr[1] "יש להזין מספר עשרוני חוקי עם %s ספרות לכל היותר." - -#~ msgid "" -#~ "Please enter a valid decimal number with a whole part of at most %s digit." -#~ msgid_plural "" -#~ "Please enter a valid decimal number with a whole part of at most %s " -#~ "digits." -#~ msgstr[0] "יש להזין מספר עשרוני חוקי עם ספרה %s בחלק השלם לכל היותר." -#~ msgstr[1] "יש להזין מספר עשרוני חוקי עם %s ספרות בחלק השלם לכל היותר." - -#~ msgid "Please enter a valid decimal number with at most %s decimal place." -#~ msgid_plural "" -#~ "Please enter a valid decimal number with at most %s decimal places." -#~ msgstr[0] "יש להזין מספר עשרוני חוקי עם ספרה %s בחלק העשרוני לכל היותר." -#~ msgstr[1] "יש להזין מספר עשרוני חוקי עם %s ספרות בחלק העשרוני לכל היותר." - -#~ msgid "Please enter a valid floating point number." -#~ msgstr "נא להזין מספר נקודה צפה חוקי." - -#~ msgid "Make sure your uploaded file is at least %s bytes big." -#~ msgstr "יש להעלות קובץ בגודל %s בתים לפחות." - -#~ msgid "Make sure your uploaded file is at most %s bytes big." -#~ msgstr "יש לוודא שהקובץ שהעלת הוא בגודל %s בתים לכל היותר." - -#~ msgid "The format for this field is wrong." -#~ msgstr "מבנה תוכן שדה זה שגוי." - -#~ msgid "This field is invalid." -#~ msgstr "שדה זה אינו חוקי." - -#~ msgid "Could not retrieve anything from %s." -#~ msgstr "לא ניתן לאחזר כלום מ %s." - -#~ msgid "" -#~ "The URL %(url)s returned the invalid Content-Type header '%(contenttype)" -#~ "s'." -#~ msgstr "ה-URL·%(url)s·החזיר כותרת·Content-Type·לא חוקית·'%(contenttype)s'." - -#~ msgid "" -#~ "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts " -#~ "with \"%(start)s\".)" -#~ msgstr "" -#~ "נא לסגור את תג·%(tag)s·בשורה·%(line)s.·(השורה מתחילה ב·\"%(start)s\".)" - -#~ msgid "" -#~ "Some text starting on line %(line)s is not allowed in that context. (Line " -#~ "starts with \"%(start)s\".)" -#~ msgstr "" -#~ "חלק מהטקסט בשורה·%(line)s·אסור בהקשר זה.·(השורה·מתחילה ב·\"%(start)s\".)" - -#~ msgid "" -#~ "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with " -#~ "\"%(start)s\".)" -#~ msgstr "" -#~ "\"%(attr)s\"·בשורה·%(line)s·אינה תכונה חוקית.·(השורה מתחילה ב·\"%(start)s" -#~ "\".)" - -#~ msgid "" -#~ "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" -#~ "(start)s\".)" -#~ msgstr "" -#~ "\"<%(tag)s>\"·בשורה·%(line)s·אינו תג חוקי.·(השורה מתחילה ב·\"%(start)s\".)" - -#~ msgid "" -#~ "A tag on line %(line)s is missing one or more required attributes. (Line " -#~ "starts with \"%(start)s\".)" -#~ msgstr "" -#~ "לתג בשורה %(line)s חסרה תכונה אחת או יותר נדרשות. (השורה מתחילה ב-\"%" -#~ "(start)s\".)" - -#~ msgid "" -#~ "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " -#~ "starts with \"%(start)s\".)" -#~ msgstr "" -#~ "לתכונה·\"%(attr)s\"·בשורה·%(line)s·יש ערך לא חוקי.·(השורה·מתחילה ב·\"%" -#~ "(start)s\".)" - -#~ msgid "" -#~ "%(object)s with this %(type)s already exists for the given %(field)s." -#~ msgstr "%(object)s עם %(type)s קיים כבר עבור %(field)s נתון." - -#~ msgid "Enter a valid filename." -#~ msgstr "יש להזין שם קובץ חוקי." - -#~ msgid "Please enter a valid %s." -#~ msgstr "יש להזין %s חוקי." - -#~ msgid "Ensure your text is less than %s character." -#~ msgid_plural "Ensure your text is less than %s characters." -#~ msgstr[0] "נא לוודא שהטקסט שלך מכיל פחות מ %s תו." -#~ msgstr[1] "נא לוודא שהטקסט שלך מכיל פחות מ %s תווים." - -#~ msgid "Line breaks are not allowed here." -#~ msgstr "מעברי שורה אסורים כאן." - -#~ msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -#~ msgstr "יש לבחור אפשרות חוקית; '%(data)s' אינו בין %(choices)s." - -#~ msgid "Enter a whole number between -32,768 and 32,767." -#~ msgstr "יש להזין מספר שלם בין ‎-32,768 ל- 32,767." - -#~ msgid "Enter a positive number." -#~ msgstr "יש להזין מספר חיובי." - -#~ msgid "Enter a whole number between 0 and 32,767." -#~ msgstr "יש להזין מספר שלם בין 0 ל- 32,767." - -#~ msgid "Ordering" -#~ msgstr "מיון" - -#~ msgid "Your new password is: %(new_password)s" -#~ msgstr "סיסמתך החדשה: %(new_password)s" - -#~ msgid "Feel free to change this password by going to this page:" -#~ msgstr "ניתן לשנות את הסיסמה בכל עת ע\"י פניה לדף זה:" - -#~ msgid "Added %s." -#~ msgstr "%s התווסף." - -#~ msgid "Deleted %s." -#~ msgstr "%s נמחק." - -#~ msgid "The two 'new password' fields didn't match." -#~ msgstr "שני שדות 'הסיסמה החדשה' אינם זהים." - -#~ msgid "Year must be 1900 or later." -#~ msgstr "שנה צריכה להיות 1900 ומעלה." - -#~ msgid "Separate multiple IDs with commas." -#~ msgstr "יש להפריד מזהים מרובים בפסיקים." diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index cad80c1f91..f4b5a08101 100644 Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 5ab3cd1fa9..22145a2fb5 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -6,15 +6,15 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-10 08:26+0200\n" -"PO-Revision-Date: 2009-04-10 08:29+0200\n" +"POT-Creation-Date: 2009-07-27 11:12+0200\n" +"PO-Revision-Date: 2009-07-27 11:10+0200\n" "Last-Translator: Nicola Larosa \n" -"Language-Team: Italian\n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 0.3\n" #: conf/global_settings.py:44 msgid "Arabic" @@ -202,7 +202,7 @@ msgstr "telugu" #: conf/global_settings.py:90 msgid "Thai" -msgstr "thai" +msgstr "tailandese" #: conf/global_settings.py:91 msgid "Turkish" @@ -220,19 +220,19 @@ msgstr "cinese semplificato" msgid "Traditional Chinese" msgstr "cinese tradizionale" -#: contrib/admin/actions.py:56 +#: contrib/admin/actions.py:60 #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "Cancellati con successo %(count)d %(items)s." +msgstr "Cancellati/e con successo %(count)d %(items)s." -#: contrib/admin/actions.py:63 contrib/admin/options.py:1023 +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 msgid "Are you sure?" msgstr "Sei sicuro?" -#: contrib/admin/actions.py:81 +#: contrib/admin/actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "Cancellati i %(verbose_name_plural)s selezionati" +msgstr "Cancella %(verbose_name_plural)s selezionati/e" #: contrib/admin/filterspecs.py:44 #, python-format @@ -268,15 +268,15 @@ msgstr "Questo mese" msgid "This year" msgstr "Quest'anno" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Sì" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "No" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Sconosciuto" @@ -316,99 +316,100 @@ msgstr "voci di log" msgid "None" msgstr "Nessuno" -#: contrib/admin/options.py:517 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." -msgstr "%s modificato." +msgstr "%s modificato/a." -#: contrib/admin/options.py:517 contrib/admin/options.py:527 -#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "e" -#: contrib/admin/options.py:522 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." -msgstr "Aggiunti %(name)s \"%(object)s\"." +msgstr "Aggiunto/a %(name)s \"%(object)s\"." -#: contrib/admin/options.py:526 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." -msgstr "Cambiati %(list)s per %(name)s \"%(object)s\"." +msgstr "Cambiato/i %(list)s per %(name)s \"%(object)s\"." -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." -msgstr "Cancellati %(name)s \"%(object)s\"." +msgstr "Cancellato/a %(name)s \"%(object)s\"." -#: contrib/admin/options.py:535 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Nessun campo modificato." -#: contrib/admin/options.py:596 contrib/auth/admin.py:67 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "%(name)s \"%(obj)s\" è stato aggiunto correttamente." +msgstr "%(name)s \"%(obj)s\" aggiunto/a correttamente." -#: contrib/admin/options.py:600 contrib/admin/options.py:633 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 #: contrib/auth/admin.py:75 msgid "You may edit it again below." -msgstr "È possibile modificarlo nuovamente qui sotto." +msgstr "È possibile modificare nuovamente qui sotto." -#: contrib/admin/options.py:610 contrib/admin/options.py:643 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." -msgstr "Puoi aggiungere un altro %s qui sotto." +msgstr "Puoi aggiungere un altro/a %s qui sotto." -#: contrib/admin/options.py:631 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "%(name)s \"%(obj)s\" modificato correttamente." +msgstr "%(name)s \"%(obj)s\" modificato/a correttamente." -#: contrib/admin/options.py:639 +#: contrib/admin/options.py:642 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -"%(name)s \"%(obj)s\" aggiunto correttamente. Puoi modificarlo ancora qui " +"%(name)s \"%(obj)s\" aggiunto/a correttamente. Puoi modificare ancora qui " "sotto." -#: contrib/admin/options.py:770 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Aggiungi %s" -#: contrib/admin/options.py:801 contrib/admin/options.py:1001 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "L'oggetto %(name)s con chiave primaria %(key)r non esiste." -#: contrib/admin/options.py:858 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Modifica %s" -#: contrib/admin/options.py:902 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "Errore nel database" -#: contrib/admin/options.py:938 +#: contrib/admin/options.py:941 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." -msgstr[0] "%(count)s %(name)s è stato modificato correttamente." -msgstr[1] "%(count)s %(name)s sono stati modificati correttamente." +msgstr[0] "%(count)s %(name)s modificato/a correttamente." +msgstr[1] "%(count)s %(name)s modificati/e correttamente." -#: contrib/admin/options.py:1016 +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" cancellato correttamente." +msgstr "%(name)s \"%(obj)s\" cancellato/a correttamente." -#: contrib/admin/options.py:1052 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Tracciato delle modifiche: %s" -#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -417,11 +418,11 @@ msgstr "" "Inserisci nome utente e password corretti. In entrambi i campi le maiuscole " "sono significative." -#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Effettua di nuovo l'accesso, perché la tua sessione è scaduta." -#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -429,27 +430,27 @@ msgstr "" "Il browser non sembra configurato per accettare i cookie. Una volta " "abilitati, ricarica la pagina e riprova." -#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "I nomi utente non possono contenere il carattere '@'." -#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Prova con '%s'." -#: contrib/admin/sites.py:360 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Amministrazione sito" -#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Accedi" -#: contrib/admin/sites.py:417 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "Amministrazione %s" @@ -499,7 +500,7 @@ msgstr "Spiacenti, ma la pagina richiesta non è stata trovata." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -535,7 +536,8 @@ msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." msgstr "" -"Si è verificato un errore. È stato riportato agli amministratori del sito " +"Si è verificato un errore. Gli amministratori del sito ne sono stati " +"informati" "via e-mail e verrà corretto a breve. Grazie per la tua pazienza." #: contrib/admin/templates/admin/actions.html:4 @@ -543,7 +545,6 @@ msgid "Run the selected action" msgstr "Esegui l'azione selezionata" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Vai" @@ -553,18 +554,18 @@ msgstr "Vai" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," -msgstr "Benvenuto," +msgstr "Benvenuto/a," -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentazione" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:40 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -572,7 +573,7 @@ msgstr "Documentazione" msgid "Change password" msgstr "Cambia la password" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -607,7 +608,7 @@ msgstr "Vedi sul sito" #: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." -msgstr[0] "Correggi gli errori qui sotto." +msgstr[0] "Correggi l'errore qui sotto." msgstr[1] "Correggi gli errori qui sotto." #: contrib/admin/templates/admin/change_list.html:46 @@ -703,6 +704,10 @@ msgstr "Azioni Proprie" msgid "None available" msgstr "Nessuna disponibile" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Contenuto sconosciuto" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -751,6 +756,15 @@ msgstr "" msgid "Show all" msgstr "Mostra tutto" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Salva" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "Cerca" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -763,10 +777,6 @@ msgstr[1] "%(counter)s risultati" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s totali" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Salva" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Salva come nuovo" @@ -836,7 +846,7 @@ msgstr "Cambio password" #: contrib/admin/templates/registration/password_change_done.html:6 #: contrib/admin/templates/registration/password_change_done.html:10 msgid "Password change successful" -msgstr "Cambio di password avvenuto correttamente" +msgstr "Cambio password avvenuto correttamente" #: contrib/admin/templates/registration/password_change_done.html:12 msgid "Your password was changed." @@ -905,7 +915,7 @@ msgstr "" #: contrib/admin/templates/registration/password_reset_confirm.html:26 msgid "Password reset unsuccessful" -msgstr "Password NON reimpostata" +msgstr "Password non reimpostata" #: contrib/admin/templates/registration/password_reset_confirm.html:28 msgid "" @@ -943,7 +953,7 @@ msgstr "Vai alla pagina seguente e scegli una nuova password:" #: contrib/admin/templates/registration/password_reset_email.html:9 msgid "Your username, in case you've forgotten:" -msgstr "Il tuo nome utente, in caso l'abbia dimenticato:" +msgstr "Il tuo nome utente, in caso tu l'abbia dimenticato:" #: contrib/admin/templates/registration/password_reset_email.html:11 msgid "Thanks for using our site!" @@ -959,7 +969,7 @@ msgid "" "Forgotten your password? Enter your e-mail address below, and we'll e-mail " "instructions for setting a new one." msgstr "" -"Dimenticata la password? Inserisci il tuo indirizzo email qui sotto, e ti " +"Password dimenticata? Inserisci il tuo indirizzo email qui sotto, e ti " "invieremo per email le istruzioni per impostarne una nuova." #: contrib/admin/templates/registration/password_reset_form.html:16 @@ -992,144 +1002,145 @@ msgstr "sito" msgid "template" msgstr "modello" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 -#: contrib/admindocs/views.py:62 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "tag:" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 -#: contrib/admindocs/views.py:95 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "filtro:" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 -#: contrib/admindocs/views.py:159 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "view:" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Appl. %r non trovata" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Modello %(model_name)r non trovato nell'appl. %(app_label)r" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "l'oggetto `%(app_label)s.%(data_type)s` collegato" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "modello:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "oggetti `%(app_label)s.%(object_name)s` collegati" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "tutti %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "numero di %s" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Campi sugli oggetti %s" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Intero" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Booleano (True o False)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "Stringa (fino a %(max_length)s)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Interi separati da virgola" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Data (senza ora)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Data (con ora)" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Numero decimale" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "Indirizzo e-mail" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Percorso di file" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Numero decimale" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "indirizzo IP" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Booleano (True, False o None)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Collegamento a modello padre" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Numero di telefono" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Testo" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Ora" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "Stato USA (due lettere maiuscole)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "Testo XML" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s non sembra essere un oggetto urlpattern" @@ -1153,10 +1164,10 @@ msgid "" "your computer is \"internal\").

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

              Per installare i bookmarklet, trascina il link sulla " -"barra \n" -"dei bookmark, o clicca il link con il tasto destro e aggiungilo ai " -"bookmark.\n" +"

              Per installare i bookmarklet, trascina il link sulla barra " +"\n" +"dei bookmark, o clicca il link con il tasto destro e aggiungilo ai bookmark." +"\n" "Potrai poi scegliere un bookmarklet in qualsiasi pagina del sito.\n" "Nota che alcuni di questi bookmarklet richiedono l'accesso al sito tramite " "un\n" @@ -1253,7 +1264,7 @@ msgstr "Conferma password" #: contrib/auth/forms.py:30 msgid "A user with that username already exists." -msgstr "Un utente con questo nome·è già presente." +msgstr "Un utente con questo nome è già presente." #: contrib/auth/forms.py:36 contrib/auth/forms.py:155 #: contrib/auth/forms.py:197 @@ -1303,7 +1314,8 @@ msgstr "Password attuale" #: contrib/auth/forms.py:177 msgid "Your old password was entered incorrectly. Please enter it again." -msgstr "La password attuale non è stata inserita correttamente: va inserita di nuovo." +msgstr "" +"La password attuale non è stata inserita correttamente: va inserita di nuovo." #: contrib/auth/models.py:63 contrib/auth/models.py:86 msgid "name" @@ -1466,14 +1478,14 @@ msgstr "Commento" #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." -msgstr[0] "Modera i termini: la parola %s non è ammessa." -msgstr[1] "Modera i termini: le parole %s non sono ammesse." +msgstr[0] "Modera i termini: la parola %s non è ammessa qui." +msgstr[1] "Modera i termini: le parole %s non sono ammesse qui." #: contrib/comments/forms.py:180 msgid "If you enter anything in this field your comment will be treated as spam" msgstr "Se inserisci qualcosa in questo campo il tuo commento verrà considerato spam" -#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71 +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 msgid "content type" msgstr "content type" @@ -1701,11 +1713,11 @@ msgstr "Pubblica il tuo commento" msgid "or make changes" msgstr "o fai dei cambiamenti" -#: contrib/contenttypes/models.py:67 +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "nome della classe del modello Python" -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "content type" @@ -1777,18 +1789,26 @@ msgstr "" "Spiacenti, ma la tua form è scaduta. Puoi continuare a compilare la form da " "questa pagina." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Nessun valore geometrico fornito." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Valore geometrico non valido." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Tipo geometrico non valido." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"Si è verificato un errore durante la trasformazione della geometria nello " +"SRID del campo geometria della form." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "º" @@ -2251,7 +2271,7 @@ msgstr "Schleswig-Holstein" #: contrib/localflavor/de/de_states.py:20 msgid "Thuringia" -msgstr "Thuringia" +msgstr "Turingia" #: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 #: contrib/localflavor/fr/forms.py:15 @@ -3017,7 +3037,9 @@ msgstr "Checksum errato per il Numero d'Imposta (NIP)." #: contrib/localflavor/pl/forms.py:109 msgid "National Business Register Number (REGON) consists of 9 or 14 digits." -msgstr "Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 9 o 14 cifre." +msgstr "" +"Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 9 o 14 " +"cifre." #: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." @@ -3625,27 +3647,27 @@ msgstr "Worcestershire" #: contrib/localflavor/uk/uk_regions.py:55 msgid "County Antrim" -msgstr "County Antrim" +msgstr "Contea di Antrim" #: contrib/localflavor/uk/uk_regions.py:56 msgid "County Armagh" -msgstr "County Armagh" +msgstr "Contea di Armagh" #: contrib/localflavor/uk/uk_regions.py:57 msgid "County Down" -msgstr "County Down" +msgstr "Contea di Down" #: contrib/localflavor/uk/uk_regions.py:58 msgid "County Fermanagh" -msgstr "County Fermanagh" +msgstr "Contea di Fermanagh" #: contrib/localflavor/uk/uk_regions.py:59 msgid "County Londonderry" -msgstr "County Londonderry" +msgstr "Contea di Londonderry" #: contrib/localflavor/uk/uk_regions.py:60 msgid "County Tyrone" -msgstr "County Tyrone" +msgstr "Contea di Tyrone" #: contrib/localflavor/uk/uk_regions.py:64 msgid "Clwyd" @@ -3750,7 +3772,7 @@ msgstr "Inserisci un codice postale nel formato XXXXX o XXXXX-XXXX ." #: contrib/localflavor/us/forms.py:54 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." msgstr "" -"Inserisci un numero di assistenza sociale statunitense valido, nel formato " +"Inserisci un numero di assistenza sociale USA valido, nel formato " "XXX-XX-XXXX ." #: contrib/localflavor/za/forms.py:20 @@ -3861,56 +3883,57 @@ msgstr "nome visualizzato" msgid "sites" msgstr "siti" -#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "Questo valore deve essere un intero." -#: db/models/fields/__init__.py:387 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." msgstr "Questo valore deve essere True o False." -#: db/models/fields/__init__.py:420 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Questo campo non può essere nullo." -#: db/models/fields/__init__.py:436 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "Inserisci solo cifre separate da virgole." -#: db/models/fields/__init__.py:467 +#: db/models/fields/__init__.py:474 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:476 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Data non valida: %s" -#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format." msgstr "Inserisci una data/ora valida nel formato AAAA-MM-GG OO:MM[ss[.uuuuuu]]." -#: db/models/fields/__init__.py:594 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." msgstr "Questo valore deve essere un numero decimale." -#: db/models/fields/__init__.py:676 +#: db/models/fields/__init__.py:686 msgid "This value must be a float." msgstr "Questo valore deve essere un numero a virgola mobile." -#: db/models/fields/__init__.py:736 +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." msgstr "Questo valore deve essere None, True o False." -#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 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/related.py:792 +#: db/models/fields/related.py:816 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." +msgstr "" +"Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno." -#: db/models/fields/related.py:870 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." @@ -3972,11 +3995,11 @@ msgstr "Assicurarsi che non vi siano più di %s cifre decimali." msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Assicurarsi che non vi siano più di %s cifre prima della virgola." -#: forms/fields.py:288 forms/fields.py:862 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Inserisci una data valida." -#: forms/fields.py:322 forms/fields.py:863 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Inserisci un'ora valida." @@ -3999,7 +4022,9 @@ msgstr "Il file inviato è vuoto." #: forms/fields.py:450 #, python-format msgid "Ensure this filename has at most %(max)d characters (it has %(length)d)." -msgstr "Assicurarsi che questo nome di file non contenga più di %(max)d caratteri (ne ha %(length)d)." +msgstr "" +"Assicurarsi che questo nome di file non contenga più di %(max)d caratteri " +"(ne ha %(length)d)." #: forms/fields.py:483 msgid "" @@ -4015,20 +4040,20 @@ msgstr "Inserisci una URL valida." msgid "This URL appears to be a broken link." msgstr "Questa URL non sembra funzionare." -#: forms/fields.py:624 forms/fields.py:702 +#: forms/fields.py:625 forms/fields.py:703 #, 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:703 forms/fields.py:764 forms/models.py:776 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Inserisci una lista di valori." -#: forms/fields.py:891 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Inserisci un indirizzo IPv4 valido." -#: forms/fields.py:901 +#: forms/fields.py:902 msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Inserisci uno 'slug' valido contenente lettere, cifre, sottolineati o " @@ -4038,80 +4063,107 @@ msgstr "" msgid "Order" msgstr "Ordine" -#: forms/models.py:299 forms/models.py:308 +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s con questo %(field_label)s esiste già." -#: forms/models.py:651 +#: forms/models.py:594, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Correggi i dati duplicati di %(field)s." + +#: forms/models.py:598 +#, 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:604 +#, 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." + +#: forms/models.py:612 +msgid "Please correct the duplicate values below." +msgstr "Correggi i dati duplicati qui sotto." + +#: forms/models.py:867 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 " -"principale." +"padre." -#: forms/models.py:706 +#: forms/models.py:930 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:777 +#: forms/models.py:1004 #, 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:779 +#: forms/models.py:1006 #, python-format msgid "\"%s\" is not a valid value for a primary key." msgstr "\"%s\" non è un valore valido per una chiave primaria." -#: template/defaultfilters.py:765 +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "sì,no,forse" -#: template/defaultfilters.py:796 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d byte" msgstr[1] "%(size)d byte" -#: template/defaultfilters.py:798 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:800 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:801 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "p.m." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "a.m." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "PM" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "AM" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "mezzanotte" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "mezzogiorno" @@ -4368,15 +4420,15 @@ msgstr "F j" #: views/generic/create_update.py:114 #, python-format msgid "The %(verbose_name)s was created successfully." -msgstr "%(verbose_name)s creato correttamente." +msgstr "%(verbose_name)s creato/a correttamente." #: views/generic/create_update.py:156 #, python-format msgid "The %(verbose_name)s was updated successfully." -msgstr "%(verbose_name)s aggiornato correttamente." +msgstr "%(verbose_name)s aggiornato/a correttamente." #: views/generic/create_update.py:198 #, python-format msgid "The %(verbose_name)s was deleted." -msgstr "%(verbose_name)s è stato cancellato." +msgstr "%(verbose_name)s cancellato/a." diff --git a/django/conf/locale/it/LC_MESSAGES/djangojs.mo b/django/conf/locale/it/LC_MESSAGES/djangojs.mo index 2208b3e6e3..310afc7efb 100644 Binary files a/django/conf/locale/it/LC_MESSAGES/djangojs.mo and b/django/conf/locale/it/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/it/LC_MESSAGES/djangojs.po b/django/conf/locale/it/LC_MESSAGES/djangojs.po index 2e534b1494..ff7237968f 100644 --- a/django/conf/locale/it/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/it/LC_MESSAGES/djangojs.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-04-10 08:26+0200\n" -"PO-Revision-Date: 2008-08-14 18:36+0200\n" +"PO-Revision-Date: 2009-07-26 17:51+0200\n" "Last-Translator: Nicola Larosa \n" -"Language-Team: Italian\n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 0.3\n" #: contrib/admin/media/js/SelectFilter2.js:33 #, perl-format @@ -40,7 +40,7 @@ msgstr "%s scelti" #: contrib/admin/media/js/SelectFilter2.js:54 msgid "Select your choice(s) and click " -msgstr "Fai le tue scelte e clicca " +msgstr "Seleziona le tue scelte e clicca " #: contrib/admin/media/js/SelectFilter2.js:59 msgid "Clear all" @@ -118,3 +118,4 @@ msgstr "Ieri" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:179 msgid "Tomorrow" msgstr "Domani" + diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo index 0393042941..987e61e5bf 100644 Binary files a/django/conf/locale/ja/LC_MESSAGES/django.mo and b/django/conf/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po index c2be43c751..09ae670daf 100644 --- a/django/conf/locale/ja/LC_MESSAGES/django.po +++ b/django/conf/locale/ja/LC_MESSAGES/django.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-03 05:23+0900\n" -"PO-Revision-Date: 2009-04-03 05:32+0900\n" +"POT-Creation-Date: 2009-07-22 23:23+0900\n" +"PO-Revision-Date: 2009-07-22 23:32+0900\n" "Last-Translator: Takashi Matsuo \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -216,6 +216,20 @@ msgstr "簡体字中国語" msgid "Traditional Chinese" msgstr "繁体字中国語" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "%(count)d 個の %(items)sを削除しました。" + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 +msgid "Are you sure?" +msgstr "よろしいですか？" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "選択された %(verbose_name_plural)s の削除" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" @@ -250,15 +264,15 @@ msgstr "今月" msgid "This year" msgstr "今年" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "はい" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "いいえ" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "不明" @@ -294,115 +308,102 @@ msgstr "ログエントリ" msgid "log entries" msgstr "ログエントリ" -#: contrib/admin/options.py:131 contrib/admin/options.py:145 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" msgstr "None" -#: contrib/admin/options.py:498 -#, python-format -msgid "Successfully deleted %(count)d %(items)s." -msgstr "%(count)d 個の %(items)sを削除しました。" - -#: contrib/admin/options.py:505 contrib/admin/options.py:1012 -msgid "Are you sure?" -msgstr "よろしいですか？" - -#: contrib/admin/options.py:523 -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "選択された %(verbose_name_plural)s の削除" - -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "%s を変更しました。" -#: contrib/admin/options.py:531 contrib/admin/options.py:541 -#: contrib/comments/templates/comments/preview.html:15 forms/models.py:306 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "と" -#: contrib/admin/options.py:536 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\"を追加しました。" -#: contrib/admin/options.py:540 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" の %(list)s を変更しました。" -#: contrib/admin/options.py:545 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" を削除しました。" -#: contrib/admin/options.py:549 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "変更はありませんでした。" -#: contrib/admin/options.py:610 contrib/auth/admin.py:67 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" を追加しました。" -#: contrib/admin/options.py:614 contrib/admin/options.py:647 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "続けて編集できます。" -#: contrib/admin/options.py:624 contrib/admin/options.py:657 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "続けて別の %s を追加できます。" -#: contrib/admin/options.py:645 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" を変更しました。" -#: contrib/admin/options.py:653 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。" -#: contrib/admin/options.py:774 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "%s を追加" -#: contrib/admin/options.py:805 contrib/admin/options.py:990 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "主キーが %(key)r である %(name)s オブジェクトは存在しません。" -#: contrib/admin/options.py:862 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "%s を変更" -#: contrib/admin/options.py:894 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "データベースエラー" -#: contrib/admin/options.py:930 +#: contrib/admin/options.py:941 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s 個の %(name)s を変更しました。" -#: contrib/admin/options.py:1005 +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" を削除しました。" -#: contrib/admin/options.py:1041 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "変更履歴: %s" -#: contrib/admin/sites.py:15 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -410,12 +411,12 @@ msgid "" msgstr "" "正しいユーザ名とパスワードを入力してください (大文字小文字は区別します) 。" -#: contrib/admin/sites.py:250 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "" "再ログインしてください。ログインセッションが有効期間切れしてしまいました。" -#: contrib/admin/sites.py:257 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -423,27 +424,27 @@ msgstr "" "ブラウザがクッキーの使用を許可していないようです。クッキーの使用を許可して、" "もう一度このページを表示してください。" -#: contrib/admin/sites.py:273 contrib/admin/sites.py:279 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "ユーザ名には '@' を含められません。" -#: contrib/admin/sites.py:276 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "メールアドレスはユーザ名ではありません。 '%s' を試してみてください。" -#: contrib/admin/sites.py:336 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "サイト管理" -#: contrib/admin/sites.py:349 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "ログイン" -#: contrib/admin/sites.py:396 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "%s サイト管理" @@ -478,7 +479,7 @@ msgstr "変更:" msgid "Lookup" msgstr "検索" -#: contrib/admin/widgets.py:236 +#: contrib/admin/widgets.py:235 msgid "Add Another" msgstr "追加" @@ -493,9 +494,9 @@ msgstr "申し訳ありませんが、お探しのページは見つかりませ #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:20 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 #: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 @@ -537,9 +538,8 @@ msgid "Run the selected action" msgstr "選択された操作を実行" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" -msgstr "検索" +msgstr "実行" #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 @@ -547,18 +547,18 @@ msgstr "検索" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "ようこそ" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "ドキュメント" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:40 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -566,7 +566,7 @@ msgstr "ドキュメント" msgid "Change password" msgstr "パスワードの変更" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -597,18 +597,18 @@ msgid "View on site" msgstr "サイト上で表示" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/change_list.html:49 +#: contrib/admin/templates/admin/change_list.html:54 #: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "下記のエラーを修正してください。" -#: contrib/admin/templates/admin/change_list.html:41 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" msgstr "%(name)s を追加" -#: contrib/admin/templates/admin/change_list.html:60 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "フィルタ" @@ -696,6 +696,10 @@ msgstr "操作" msgid "None available" msgstr "利用不可" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "不明なコンテント" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -743,6 +747,15 @@ msgstr "" msgid "Show all" msgstr "全件表示" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "保存" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "検索" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -754,10 +767,6 @@ msgstr[0] "%(counter)s 件" msgid "%(full_result_count)s total" msgstr "全 %(full_result_count)s 件" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "保存" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "新規保存" @@ -984,145 +993,146 @@ msgstr "サイト" msgid "template" msgstr "テンプレート" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 -#: contrib/admindocs/views.py:62 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "タグ" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 -#: contrib/admindocs/views.py:95 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "フィルタ" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 -#: contrib/admindocs/views.py:159 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "ビュー" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "アプリケーション %r が見つかりません" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "" "モデル %(model_name)r が %(app_label)r アプリケーションに見つかりません" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "`%(app_label)s.%(data_type)s` (関連オブジェクト)" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "モデル :" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "`%(app_label)s.%(object_name)s` (関連オブジェクト)" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "全ての %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "%s の数" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "%s のフィールド" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "整数" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "ブール値 (真: True または偽: False)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "文字列 ( %(max_length)s 字まで )" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "カンマ区切りの整数" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "日付" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "日時" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "10 進数 (小数可)" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "メールアドレス" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "ファイルの場所" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "浮動小数点" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:58 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "IP アドレス" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "ブール値 (真: True 、偽: False または None)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "親モデルへのリレーション" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "電話番号" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "テキスト" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "時刻" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "アメリカの州 (大文字二文字で)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "XMLテキスト" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s はurlpatternオブジェクトでは無いようです" @@ -1392,7 +1402,8 @@ msgstr "" msgid "user permissions" msgstr "ユーザパーミッション" -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "ユーザ" @@ -1420,6 +1431,16 @@ msgstr "内容" msgid "Metadata" msgstr "メタデータ" +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "%(site_name)s のコメント" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "%(site_name)s の最新コメント" + #: contrib/comments/forms.py:93 #: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" @@ -1445,45 +1466,50 @@ msgid "" "If you enter anything in this field your comment will be treated as spam" msgstr "このフィールドに入力するとコメントはスパム扱いされます" -#: contrib/comments/models.py:23 +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "コンテンツタイプ" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "オブジェクト ID" -#: contrib/comments/models.py:50 +#: contrib/comments/models.py:52 msgid "user's name" msgstr "名前" -#: contrib/comments/models.py:51 +#: contrib/comments/models.py:53 msgid "user's email address" msgstr "メールアドレス" -#: contrib/comments/models.py:52 +#: contrib/comments/models.py:54 msgid "user's URL" msgstr "URL" -#: contrib/comments/models.py:54 +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "コメント" -#: contrib/comments/models.py:57 +#: contrib/comments/models.py:59 msgid "date/time submitted" msgstr "コメント投稿日時" -#: contrib/comments/models.py:59 +#: contrib/comments/models.py:61 msgid "is public" msgstr "は公開中です" -#: contrib/comments/models.py:60 +#: contrib/comments/models.py:62 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "" "手っ取り早くコメントをサイトから消すにはここのチェックを外してください。" -#: contrib/comments/models.py:62 +#: contrib/comments/models.py:64 msgid "is removed" msgstr "は削除されました" -#: contrib/comments/models.py:63 +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." @@ -1491,7 +1517,11 @@ msgstr "" "コメントが不適切な場合はチェックを入れてください。「コメントは削除されまし" "た」と表示されるようになります。" -#: contrib/comments/models.py:115 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "コメント" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." @@ -1499,7 +1529,7 @@ msgstr "" "このコメントは認証済みユーザーによって投稿されたため、名前は読み取り専用で" "す。" -#: contrib/comments/models.py:124 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." @@ -1507,7 +1537,7 @@ msgstr "" "このコメントは認証済みユーザーによって投稿されたため、メールアドレスは読み取" "り専用です。" -#: contrib/comments/models.py:149 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1522,6 +1552,22 @@ msgstr "" "\n" "http://%(domain)s%(url)s" +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "フラグ" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "フラグを付けた日時" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "コメントフラグ" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "コメントフラグ" + #: contrib/comments/templates/comments/approve.html:4 msgid "Approve a comment" msgstr "コメントを承認する" @@ -1579,13 +1625,13 @@ msgstr "フラグを付ける" msgid "Thanks for flagging" msgstr "ご利用ありがとうございました！" -#: contrib/comments/templates/comments/form.html:16 -#: contrib/comments/templates/comments/preview.html:31 +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 msgid "Post" msgstr "投稿" -#: contrib/comments/templates/comments/form.html:17 -#: contrib/comments/templates/comments/preview.html:32 +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 msgid "Preview" msgstr "プレビュー" @@ -1631,32 +1677,28 @@ msgid "Thank you for your comment" msgstr "コメントありがとうございました" #: contrib/comments/templates/comments/preview.html:4 -#: contrib/comments/templates/comments/preview.html:12 +#: contrib/comments/templates/comments/preview.html:13 msgid "Preview your comment" msgstr "コメントのプレビュー" -#: contrib/comments/templates/comments/preview.html:10 +#: contrib/comments/templates/comments/preview.html:11 msgid "Please correct the error below" msgid_plural "Please correct the errors below" msgstr[0] "下記のエラーを修正してください。" -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "Post your comment" msgstr "コメントを投稿" -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "or make changes" msgstr "さらに編集" -#: contrib/contenttypes/models.py:67 +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "Python モデルクラス名" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "コンテンツタイプ" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "コンテンツタイプ" @@ -1725,18 +1767,26 @@ msgstr "" "申し訳ありませんが、あなたのフォームへの入力は時間切れになりました。このペー" "ジで再度入力してください。" -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "geometry値がありません。" -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "geometry値が不正です" -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "geometryタイプが不正です。" +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"geometry を geometry フォームフィールドの SRID に変換しようとしてエラーが起き" +"ました。" + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "番目" @@ -2956,15 +3006,15 @@ msgstr "XXXXXか、XXXXX-XXXXの形式で納税者欄(NIP)を入力してくだ msgid "Wrong checksum for the Tax Number (NIP)." msgstr "税務署登録ID(NIP)のチェックサムがあいません。" -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." -msgstr "ポーランド企業番号(REGON)は7文字か9文字で入力して下さい。" +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." +msgstr "ポーランド企業番号(REGON)は9文字か14文字で入力して下さい。" -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." msgstr "ポーランド企業番号(REGON)のチェックサムがあいません。" -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." msgstr "XX-XXXの形式で郵便番号を入力してください。" @@ -3796,59 +3846,59 @@ msgstr "表示名" msgid "sites" msgstr "サイト" -#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "値は整数でなければなりません。" -#: db/models/fields/__init__.py:387 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." msgstr "値は真: True または偽: False でなければなりません。" -#: db/models/fields/__init__.py:420 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "このフィールドには NULL を指定できません。" -#: db/models/fields/__init__.py:436 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "カンマ区切りの数字だけを入力してください。" -#: db/models/fields/__init__.py:467 +#: db/models/fields/__init__.py:474 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "YYYY-MM-DD形式で日付を入力してください。" -#: db/models/fields/__init__.py:476 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "無効な日付: %s" -#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 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:594 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." msgstr "値は整数でなければなりません。" -#: db/models/fields/__init__.py:676 +#: db/models/fields/__init__.py:686 msgid "This value must be a float." msgstr "値は浮動小数点数でなければなりません。" -#: db/models/fields/__init__.py:736 +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." msgstr "値は、空: None、真: True または偽: False でなければなりません。" -#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." msgstr "HH:MM[:ss[.uuuuuu]]形式で時刻を入力してください。" -#: db/models/fields/related.py:792 +#: db/models/fields/related.py:816 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "複数選択するときには Control キーを押したまま選択してください。Mac は " "Command キーを使ってください" -#: db/models/fields/related.py:870 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3906,11 +3956,11 @@ msgstr "少数部は %s 桁までで入力して下さい。" msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "整数部は %s 桁までで入力して下さい。" -#: forms/fields.py:288 forms/fields.py:855 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "日付を正しく入力してください。" -#: forms/fields.py:322 forms/fields.py:856 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "時間を正しく入力してください。" @@ -3935,7 +3985,9 @@ msgstr "入力されたファイルは空です。" #, python-format msgid "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." -msgstr "ファイル名は %(max)d 字以上で入力してください( %(length)d 文字入力されました)。" +msgstr "" +"ファイル名は %(max)d 字以上で入力してください( %(length)d 文字入力されまし" +"た)。" #: forms/fields.py:483 msgid "" @@ -3953,20 +4005,20 @@ msgstr "URLを正しく入力してください。" msgid "This URL appears to be a broken link." msgstr "このURLはリンクが壊れています。" -#: forms/fields.py:624 forms/fields.py:702 +#: forms/fields.py:625 forms/fields.py:703 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "正しく選択してください。 %(value)s は候補にありません。" -#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "リストを入力してください。" -#: forms/fields.py:884 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "有効なIPアドレス (IPv4) を入力してください。" -#: forms/fields.py:894 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "slug には半角の英数字、アンダースコア、ハイフン以外は使用できません。" @@ -3975,75 +4027,103 @@ msgstr "slug には半角の英数字、アンダースコア、ハイフン以 msgid "Order" msgstr "並び変え" -#: forms/models.py:299 forms/models.py:308 +#: forms/models.py:367 +#, python-format +msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." +msgstr "" +"%(date_field)s %(lookup)s では %(field_name)s がユニークである必要がありま" +"す。" + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "この %(field_label)s を持った %(model_name)s が既に存在します。" -#: forms/models.py:651 +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "%(field)s の重複したデータを修正してください。" + +#: forms/models.py:598 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "%(field)s の重複したデータを修正してください。このフィールドはユニークである必要があります。" + +#: forms/models.py:604 +#, 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 がユニークである必要があります。" + +#: forms/models.py:612 +msgid "Please correct the duplicate values below." +msgstr "下記の重複したデータを修正してください。" + +#: forms/models.py:867 msgid "The inline foreign key did not match the parent instance primary key." msgstr "インライン外部キーが親インスタンスの主キーと一致しません。" -#: forms/models.py:706 +#: forms/models.py:930 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "正しく選択してください。選択したものは候補にありません。" -#: forms/models.py:777 +#: forms/models.py:1004 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "正しく選択してください。 %s は候補にありません。" -#: forms/models.py:779 +#: forms/models.py:1006 #, python-format msgid "\"%s\" is not a valid value for a primary key." msgstr "\"%s\" はプライマリキーとして無効な値です。" -#: template/defaultfilters.py:765 +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "はい,いいえ,たぶん" -#: template/defaultfilters.py:796 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d バイト" -#: template/defaultfilters.py:798 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:800 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:801 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "p.m." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "a.m." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "PM" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "AM" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "0時" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "12時" diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo index 4a9e5aab9d..ec9e86ac2a 100644 Binary files a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.po b/django/conf/locale/ja/LC_MESSAGES/djangojs.po index b2a5913796..e21ed9815b 100644 --- a/django/conf/locale/ja/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ja/LC_MESSAGES/djangojs.po @@ -1,9 +1,9 @@ -# Japanese translation for js. +# Japanese translation for js. msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-19 12:04+0900\n" +"POT-Creation-Date: 2009-07-22 23:23+0900\n" "PO-Revision-Date: 2006-05-08 13:39+0900\n" "Last-Translator: makoto tsuyuki \n" "Language-Team: Japanese \n" diff --git a/django/conf/locale/ko/LC_MESSAGES/django.mo b/django/conf/locale/ko/LC_MESSAGES/django.mo index d20015784d..9957716cd2 100644 Binary files a/django/conf/locale/ko/LC_MESSAGES/django.mo and b/django/conf/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ko/LC_MESSAGES/django.po b/django/conf/locale/ko/LC_MESSAGES/django.po index fee48952a3..983e26f966 100644 --- a/django/conf/locale/ko/LC_MESSAGES/django.po +++ b/django/conf/locale/ko/LC_MESSAGES/django.po @@ -1,1123 +1,1262 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Django Korean Translation +# Copyright (C) 2009 +# This file is distributed under the same license as the django package. +# Hyun Mi Ae, Joongi Kim (me@daybreaker.info), Sung-Jin Hong (serialx.net@gmail.com) # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-24 12:33+0900\n" +"POT-Creation-Date: 2009-07-20 00:51+0900\n" "PO-Revision-Date: 2007-04-06 11:04+0900\n" -"Last-Translator: Sung-Jin Hong \n" +"Last-Translator: Joongi Kim (me@daybreaker.info)\n" "Language-Team: Korean\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: db/models/manipulators.py:307 -#, python-format -msgid "%(object)s with this %(type)s already exists for the given %(field)s." -msgstr "%(field)s 에 입력된 값은 %(type)s 의 %(object)s 에 이미 존재합니다." - -#: db/models/manipulators.py:308 contrib/admin/views/main.py:335 -#: contrib/admin/views/main.py:337 contrib/admin/views/main.py:339 -msgid "and" -msgstr "또한" - -#: db/models/fields/__init__.py:42 -#, python-format -msgid "%(optname)s with this %(fieldname)s already exists." -msgstr "%(fieldname)s 의 %(optname)s (은)는 이미 존재합니다." - -#: db/models/fields/__init__.py:117 db/models/fields/__init__.py:274 -#: db/models/fields/__init__.py:610 db/models/fields/__init__.py:621 -#: newforms/fields.py:80 newforms/fields.py:376 newforms/fields.py:452 -#: newforms/fields.py:463 newforms/models.py:178 oldforms/__init__.py:357 -msgid "This field is required." -msgstr "필수 항목입니다." - -#: db/models/fields/__init__.py:367 -msgid "This value must be an integer." -msgstr "정수 값을 사용하세요." - -#: db/models/fields/__init__.py:402 -msgid "This value must be either True or False." -msgstr "True 또는 False 값을 사용하세요." - -#: db/models/fields/__init__.py:423 -msgid "This field cannot be null." -msgstr "이 필드는 null 값은 사용할 수 없습니다. " - -#: db/models/fields/__init__.py:457 core/validators.py:148 -msgid "Enter a valid date in YYYY-MM-DD format." -msgstr "날짜는 YYYY-MM-DD 형식으로 입력하세요." - -#: db/models/fields/__init__.py:526 core/validators.py:157 -msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -msgstr "날짜/시각을 YYYY-MM-DD HH:MM 형식으로 입력하세요." - -#: db/models/fields/__init__.py:630 -msgid "Enter a valid filename." -msgstr "올바른 파일명을 입력하세요." - -#: db/models/fields/__init__.py:751 -msgid "This value must be either None, True or False." -msgstr "None, True 또는 False 값을 사용하세요." - -#: db/models/fields/related.py:53 -#, python-format -msgid "Please enter a valid %s." -msgstr "올바른 %s (을)를 입력하세요." - -#: db/models/fields/related.py:642 -msgid "Separate multiple IDs with commas." -msgstr "복수 ID는 콤마로 구분해 주세요." - -#: db/models/fields/related.py:644 -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "" -"복수 선택 시에는 \"Control\" 키를 누른 상태에서 선택해 주세요.(Mac은 " -"\"Command\" 키)" - -#: db/models/fields/related.py:691 -#, python-format -msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "" -"Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr[0] "" -"올바른 %(self)s ID를 입력해 주세요. %(value)r (은)는 적절치 않습니다." -msgstr[1] "" -"올바른 %(self)s ID를 입력해 주세요. %(value)r (은)는 적절치 않습니다." - -#: conf/global_settings.py:39 +#: conf/global_settings.py:44 msgid "Arabic" msgstr "아랍어" -#: conf/global_settings.py:40 +#: conf/global_settings.py:45 msgid "Bengali" msgstr "방글라데시어" -#: conf/global_settings.py:41 +#: conf/global_settings.py:46 +msgid "Bulgarian" +msgstr "불가리어" + +#: conf/global_settings.py:47 msgid "Catalan" msgstr "카탈로니아어" -#: conf/global_settings.py:42 +#: conf/global_settings.py:48 msgid "Czech" msgstr "체코어" -#: conf/global_settings.py:43 +#: conf/global_settings.py:49 msgid "Welsh" msgstr "웨일즈어" -#: conf/global_settings.py:44 +#: conf/global_settings.py:50 msgid "Danish" msgstr "덴마크어" -#: conf/global_settings.py:45 +#: conf/global_settings.py:51 msgid "German" msgstr "독일어" -#: conf/global_settings.py:46 +#: conf/global_settings.py:52 msgid "Greek" msgstr "그리스어" -#: conf/global_settings.py:47 +#: conf/global_settings.py:53 msgid "English" msgstr "영어" -#: conf/global_settings.py:48 +#: conf/global_settings.py:54 msgid "Spanish" msgstr "스페인어" -#: conf/global_settings.py:49 +#: conf/global_settings.py:55 +msgid "Estonian" +msgstr "에스토니아어" + +#: conf/global_settings.py:56 msgid "Argentinean Spanish" msgstr "아르헨티나_스페인어" -#: conf/global_settings.py:50 +#: conf/global_settings.py:57 +msgid "Basque" +msgstr "바스크어" + +#: conf/global_settings.py:58 +msgid "Persian" +msgstr "페르시아어" + +#: conf/global_settings.py:59 msgid "Finnish" msgstr "핀란드어" -#: conf/global_settings.py:51 +#: conf/global_settings.py:60 msgid "French" msgstr "프랑스어" -#: conf/global_settings.py:52 +#: conf/global_settings.py:61 +msgid "Irish" +msgstr "아일랜드어" + +#: conf/global_settings.py:62 msgid "Galician" msgstr "갈리시아어" -#: conf/global_settings.py:53 +#: conf/global_settings.py:63 msgid "Hungarian" msgstr "헝가리어" -#: conf/global_settings.py:54 +#: conf/global_settings.py:64 msgid "Hebrew" msgstr "히브리어" -#: conf/global_settings.py:55 +#: conf/global_settings.py:65 +msgid "Hindi" +msgstr "" + +#: conf/global_settings.py:66 +msgid "Croatian" +msgstr "크로아티아어" + +#: conf/global_settings.py:67 msgid "Icelandic" msgstr "아이슬란드어" -#: conf/global_settings.py:56 +#: conf/global_settings.py:68 msgid "Italian" msgstr "이탈리아어" -#: conf/global_settings.py:57 +#: conf/global_settings.py:69 msgid "Japanese" msgstr "일본어" -#: conf/global_settings.py:58 +#: conf/global_settings.py:70 +msgid "Georgian" +msgstr "조지아어" + +#: conf/global_settings.py:71 msgid "Korean" msgstr "한국어" -#: conf/global_settings.py:59 +#: conf/global_settings.py:72 +msgid "Khmer" +msgstr "크메르어" + +#: conf/global_settings.py:73 msgid "Kannada" msgstr "칸나다어" -#: conf/global_settings.py:60 +#: conf/global_settings.py:74 msgid "Latvian" msgstr "라트비아어" -#: conf/global_settings.py:61 +#: conf/global_settings.py:75 +msgid "Lithuanian" +msgstr "리투아니아어" + +#: conf/global_settings.py:76 msgid "Macedonian" msgstr "마케도니아어" -#: conf/global_settings.py:62 +#: conf/global_settings.py:77 msgid "Dutch" msgstr "네덜란드어" -#: conf/global_settings.py:63 +#: conf/global_settings.py:78 msgid "Norwegian" msgstr "노르웨이어" -#: conf/global_settings.py:64 +#: conf/global_settings.py:79 msgid "Polish" msgstr "폴란드어" -#: conf/global_settings.py:65 -msgid "Portugese" +#: conf/global_settings.py:80 +msgid "Portuguese" msgstr "포르투갈어" -#: conf/global_settings.py:66 -msgid "Brazilian" -msgstr "브라질어" +#: conf/global_settings.py:81 +msgid "Brazilian Portuguese" +msgstr "브라질 포르투갈어" -#: conf/global_settings.py:67 +#: conf/global_settings.py:82 msgid "Romanian" msgstr "루마니아어" -#: conf/global_settings.py:68 +#: conf/global_settings.py:83 msgid "Russian" msgstr "러시아어" -#: conf/global_settings.py:69 +#: conf/global_settings.py:84 msgid "Slovak" msgstr "슬로바키아어" -#: conf/global_settings.py:70 +#: conf/global_settings.py:85 msgid "Slovenian" msgstr "슬로베니아어" -#: conf/global_settings.py:71 +#: conf/global_settings.py:86 msgid "Serbian" msgstr "세르비아어" -#: conf/global_settings.py:72 +#: conf/global_settings.py:87 msgid "Swedish" msgstr "스웨덴어" -#: conf/global_settings.py:73 +#: conf/global_settings.py:88 msgid "Tamil" msgstr "타밀어" -#: conf/global_settings.py:74 +#: conf/global_settings.py:89 msgid "Telugu" msgstr "텔루구어" -#: conf/global_settings.py:75 +#: conf/global_settings.py:90 +msgid "Thai" +msgstr "태국어" + +#: conf/global_settings.py:91 msgid "Turkish" msgstr "터키어" -#: conf/global_settings.py:76 +#: conf/global_settings.py:92 msgid "Ukrainian" msgstr "우크라이나어" -#: conf/global_settings.py:77 +#: conf/global_settings.py:93 msgid "Simplified Chinese" msgstr "중국어 간체" -#: conf/global_settings.py:78 +#: conf/global_settings.py:94 msgid "Traditional Chinese" msgstr "중국어 번체" -#: core/validators.py:64 -msgid "This value must contain only letters, numbers and underscores." -msgstr "문자, 숫자, '_'만 가능합니다." - -#: core/validators.py:68 -msgid "" -"This value must contain only letters, numbers, underscores, dashes or " -"slashes." -msgstr "문자, 숫자, '_', '-', '/'만 가능합니다." - -#: core/validators.py:72 -msgid "This value must contain only letters, numbers, underscores or hyphens." -msgstr "문자, 숫자, '_', '-'만 가능합니다." - -#: core/validators.py:76 -msgid "Uppercase letters are not allowed here." -msgstr "대문자는 사용할 수 없습니다." - -#: core/validators.py:80 -msgid "Lowercase letters are not allowed here." -msgstr "소문자는 사용할 수 없습니다." - -#: core/validators.py:87 -msgid "Enter only digits separated by commas." -msgstr "콤마로 구분된 숫자만 입력하세요." - -#: core/validators.py:99 -msgid "Enter valid e-mail addresses separated by commas." -msgstr "콤마로 구분된 이메일 주소만 입력하세요." - -#: core/validators.py:103 -msgid "Please enter a valid IP address." -msgstr "올바른 IP 주소를 입력하세요." - -#: core/validators.py:107 -msgid "Empty values are not allowed here." -msgstr "반드시 입력하세요." - -#: core/validators.py:111 -msgid "Non-numeric characters aren't allowed here." -msgstr "숫자만 사용할 수 있습니다." - -#: core/validators.py:115 -msgid "This value can't be comprised solely of digits." -msgstr "숫자만 사용할 수는 없습니다." - -#: core/validators.py:120 newforms/fields.py:128 -msgid "Enter a whole number." -msgstr "정수를 입력하세요." - -#: core/validators.py:124 -msgid "Only alphabetical characters are allowed here." -msgstr "문자만 사용할 수 있습니다." - -#: core/validators.py:139 -msgid "Year must be 1900 or later." -msgstr "1900년 이후의 연도만 가능" - -#: core/validators.py:143 +#: contrib/admin/actions.py:60 #, python-format -msgid "Invalid date: %s" -msgstr "날짜가 부적절합니다.: %s" +msgid "Successfully deleted %(count)d %(items)s." +msgstr "%(count)d개의 %(items)s (을)를 성공적으로 삭제하였습니다." -#: core/validators.py:153 -msgid "Enter a valid time in HH:MM format." -msgstr "시각은 HH:MM 형식으로 입력하세요." +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 +msgid "Are you sure?" +msgstr "확실합니까?" -#: core/validators.py:162 newforms/fields.py:271 -msgid "Enter a valid e-mail address." -msgstr "올바른 이메일 주소를 입력하세요." - -#: core/validators.py:174 core/validators.py:445 oldforms/__init__.py:672 -msgid "No file was submitted. Check the encoding type on the form." -msgstr "등록된 파일이 없습니다. 인코딩 형식을 확인하세요." - -#: core/validators.py:178 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." -msgstr "" -"올바른 이미지를 업로드하세요.업로드하신 파일은 이미지 파일이 아니거나 파일이 " -"깨져 있습니다." - -#: core/validators.py:185 +#: contrib/admin/actions.py:85 #, python-format -msgid "The URL %s does not point to a valid image." -msgstr "해당 URL %s (은)는 올바른 이미지가 아닙니다." +msgid "Delete selected %(verbose_name_plural)s" +msgstr "선택된 %(verbose_name_plural)s (을)를 삭제합니다." -#: core/validators.py:189 -#, python-format -msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -msgstr "" -"전화번호는 xxx-xxx-xxxx 형식으로 입력하세요. \"%s\" (은)는 부적절합니다." - -#: core/validators.py:197 -#, python-format -msgid "The URL %s does not point to a valid QuickTime video." -msgstr "해당 URL %s (은)는 올바른 QuickTime video가 아닙니다." - -#: core/validators.py:201 -msgid "A valid URL is required." -msgstr "올바른 URL을 입력하세요." - -#: core/validators.py:215 +#: contrib/admin/filterspecs.py:44 #, python-format msgid "" -"Valid HTML is required. Specific errors are:\n" -"%s" +"

              By %s:

              \n" +"
                \n" msgstr "" -"올바른 HTML을 입력하세요. 오류:\n" -"%s" +"

                %s(으)로:

                \n" +"
                  \n" -#: core/validators.py:222 -#, python-format -msgid "Badly formed XML: %s" -msgstr "잘못된 형식의 XML: %s" +#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 +msgid "All" +msgstr "모두" -#: core/validators.py:239 -#, python-format -msgid "Invalid URL: %s" -msgstr "부적절한 URL: %s" +#: contrib/admin/filterspecs.py:113 +msgid "Any date" +msgstr "언제나" -#: core/validators.py:244 core/validators.py:246 -#, python-format -msgid "The URL %s is a broken link." -msgstr "해당 URL %s 링크가 깨졌습니다." +#: contrib/admin/filterspecs.py:114 +msgid "Today" +msgstr "오늘" -#: core/validators.py:252 -msgid "Enter a valid U.S. state abbreviation." -msgstr "올바른 미국의 주의 약어를 입력하세요." +#: contrib/admin/filterspecs.py:117 +msgid "Past 7 days" +msgstr "지난 7일" -#: core/validators.py:266 -#, python-format -msgid "Watch your mouth! The word %s is not allowed here." -msgid_plural "Watch your mouth! The words %s are not allowed here." -msgstr[0] "비속어/욕설입니다. %s (은)는 사용하실 수 없습니다." -msgstr[1] "비속어/욕설입니다. %s (은)는 사용하실 수 없습니다." +#: contrib/admin/filterspecs.py:119 +msgid "This month" +msgstr "이번 달" -#: core/validators.py:273 -#, python-format -msgid "This field must match the '%s' field." -msgstr "이 필드는 '%s' 필드와 일치해야 합니다." +#: contrib/admin/filterspecs.py:121 +msgid "This year" +msgstr "이번 해" -#: core/validators.py:292 -msgid "Please enter something for at least one field." -msgstr "하나 이상의 필드에 입력해 주세요." - -#: core/validators.py:301 core/validators.py:312 -msgid "Please enter both fields or leave them both empty." -msgstr "양쪽 필드에 모두 입력하시거나, 모두 빈칸으로 해 주십시오." - -#: core/validators.py:320 -#, python-format -msgid "This field must be given if %(field)s is %(value)s" -msgstr "%(field)s (이)가 %(value)s 일 경우, 이 필드에 반드시 입력해 주세요." - -#: core/validators.py:333 -#, python-format -msgid "This field must be given if %(field)s is not %(value)s" -msgstr "" -"%(field)s (이)가 %(value)s (이)가 아닐 경우, 이 필드에 반드시 입력해 주세요." - -#: core/validators.py:352 -msgid "Duplicate values are not allowed." -msgstr "중복해서 사용할 수 없습니다." - -#: core/validators.py:367 -#, python-format -msgid "This value must be between %(lower)s and %(upper)s." -msgstr "%(lower)s 에서 %(upper)s 사이의 값을 사용해 주세요." - -#: core/validators.py:369 -#, python-format -msgid "This value must be at least %s." -msgstr "%s 이상의 값을 사용해 주세요." - -#: core/validators.py:371 -#, python-format -msgid "This value must be no more than %s." -msgstr "%s 이하의 값을 사용해 주세요." - -#: core/validators.py:407 -#, python-format -msgid "This value must be a power of %s." -msgstr "%s 제곱의 값을 사용해 주세요." - -#: core/validators.py:418 -msgid "Please enter a valid decimal number." -msgstr "10진수를 사용해 주세요." - -#: core/validators.py:422 -#, python-format -msgid "Please enter a valid decimal number with at most %s total digit." -msgid_plural "" -"Please enter a valid decimal number with at most %s total digits." -msgstr[0] "전체 %s 자리 이하의 10진수를 입력하세요." -msgstr[1] "전체 %s 자리 이하의 10진수를 입력하세요." - -#: core/validators.py:425 -#, python-format -msgid "" -"Please enter a valid decimal number with a whole part of at most %s digit." -msgid_plural "" -"Please enter a valid decimal number with a whole part of at most %s digits." -msgstr[0] "정수부분이 %s 자리 이하인 10진수를 입력하세요." -msgstr[1] "정수부분이 %s 자리 이하인 10진수를 입력하세요." - -#: core/validators.py:428 -#, python-format -msgid "Please enter a valid decimal number with at most %s decimal place." -msgid_plural "" -"Please enter a valid decimal number with at most %s decimal places." -msgstr[0] "소수부분이 %s 자리 이하인 10진수를 입력하세요." -msgstr[1] "소수부분이 %s 자리 이하인 10진수를 입력하세요." - -#: core/validators.py:438 -#, python-format -msgid "Make sure your uploaded file is at least %s bytes big." -msgstr "업로드 파일은 %s bytes 이상입니다." - -#: core/validators.py:439 -#, python-format -msgid "Make sure your uploaded file is at most %s bytes big." -msgstr "업로드 파일은 %s bytes 이하입니다." - -#: core/validators.py:456 -msgid "The format for this field is wrong." -msgstr "이 필드의 형식이 잘못되었습니다." - -#: core/validators.py:471 -msgid "This field is invalid." -msgstr "필드가 올바르지 않습니다." - -#: core/validators.py:507 -#, python-format -msgid "Could not retrieve anything from %s." -msgstr "%s 에서 검색된 내용이 없습니다." - -#: core/validators.py:510 -#, python-format -msgid "" -"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." -msgstr "" -"URL %(url)s (이)가 부적절한 Content-Type heade '%(contenttype)s' (을)를 반환" -"했습니다." - -#: core/validators.py:543 -#, python-format -msgid "" -"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " -"\"%(start)s\".)" -msgstr "" -"%(line)s 줄의 %(tag)s 태그가 닫히지 않았습니다.(시작줄 : \"%(start)s\")" - -#: core/validators.py:547 -#, python-format -msgid "" -"Some text starting on line %(line)s is not allowed in that context. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"%(line)s 줄의 내용으로 시작하는 텍스트는 사용할 수 없습니다.(시작줄 : \"%" -"(start)s\")" - -#: core/validators.py:552 -#, python-format -msgid "" -"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" -"(start)s\".)" -msgstr "" -"%(line)s 줄의 \"%(attr)s\" (은)는 부적절한 속성입니다.(시작줄 : \"%(start)s" -"\")" - -#: core/validators.py:557 -#, python-format -msgid "" -"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" -"(start)s\".)" -msgstr "" -"%(line)s 줄의 \"<%(tag)s>\" (은)는 부적절한 태그입니다.(시작줄 : \"%(start)s" -"\")" - -#: core/validators.py:561 -#, python-format -msgid "" -"A tag on line %(line)s is missing one or more required attributes. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"%(line)s 줄의 태그는 하나 이상의 필수 속성이 생략되어 있습니다.(시작줄 : \"%" -"(start)s\")" - -#: core/validators.py:566 -#, python-format -msgid "" -"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"%(line)s 줄의 \"%(attr)s\" 속성의 값이 부적절합니다.(시작줄 : \"%(start)s\")" - -#: views/generic/create_update.py:43 -#, python-format -msgid "The %(verbose_name)s was created successfully." -msgstr "%(verbose_name)s (이)가 생성되었습니다." - -#: views/generic/create_update.py:117 -#, python-format -msgid "The %(verbose_name)s was updated successfully." -msgstr "%(verbose_name)s (이)가 수정되었습니다." - -#: views/generic/create_update.py:184 -#, python-format -msgid "The %(verbose_name)s was deleted." -msgstr "%(verbose_name)s (이)가 삭제되었습니다." - -#: utils/dates.py:6 -msgid "Monday" -msgstr "월요일" - -#: utils/dates.py:6 -msgid "Tuesday" -msgstr "화요일" - -#: utils/dates.py:6 -msgid "Wednesday" -msgstr "수요일" - -#: utils/dates.py:6 -msgid "Thursday" -msgstr "목요일" - -#: utils/dates.py:6 -msgid "Friday" -msgstr "금요일" - -#: utils/dates.py:7 -msgid "Saturday" -msgstr "토요일" - -#: utils/dates.py:7 -msgid "Sunday" -msgstr "일요일" - -#: utils/dates.py:14 -msgid "January" -msgstr "1월" - -#: utils/dates.py:14 -msgid "February" -msgstr "2월" - -#: utils/dates.py:14 utils/dates.py:27 -msgid "March" -msgstr "3월" - -#: utils/dates.py:14 utils/dates.py:27 -msgid "April" -msgstr "4월" - -#: utils/dates.py:14 utils/dates.py:27 -msgid "May" -msgstr "5월" - -#: utils/dates.py:14 utils/dates.py:27 -msgid "June" -msgstr "6월" - -#: utils/dates.py:15 utils/dates.py:27 -msgid "July" -msgstr "7월" - -#: utils/dates.py:15 -msgid "August" -msgstr "8월" - -#: utils/dates.py:15 -msgid "September" -msgstr "9월" - -#: utils/dates.py:15 -msgid "October" -msgstr "10월" - -#: utils/dates.py:15 -msgid "November" -msgstr "11월" - -#: utils/dates.py:16 -msgid "December" -msgstr "12월" - -#: utils/dates.py:19 -msgid "jan" -msgstr "1월" - -#: utils/dates.py:19 -msgid "feb" -msgstr "2월" - -#: utils/dates.py:19 -msgid "mar" -msgstr "3월" - -#: utils/dates.py:19 -msgid "apr" -msgstr "4월" - -#: utils/dates.py:19 -msgid "may" -msgstr "5월" - -#: utils/dates.py:19 -msgid "jun" -msgstr "6월" - -#: utils/dates.py:20 -msgid "jul" -msgstr "7월" - -#: utils/dates.py:20 -msgid "aug" -msgstr "8월" - -#: utils/dates.py:20 -msgid "sep" -msgstr "9월" - -#: utils/dates.py:20 -msgid "oct" -msgstr "10월" - -#: utils/dates.py:20 -msgid "nov" -msgstr "11월" - -#: utils/dates.py:20 -msgid "dec" -msgstr "12월" - -#: utils/dates.py:27 -msgid "Jan." -msgstr "1월" - -#: utils/dates.py:27 -msgid "Feb." -msgstr "2월" - -#: utils/dates.py:28 -msgid "Aug." -msgstr "8월" - -#: utils/dates.py:28 -msgid "Sept." -msgstr "9월" - -#: utils/dates.py:28 -msgid "Oct." -msgstr "10월" - -#: utils/dates.py:28 -msgid "Nov." -msgstr "11월" - -#: utils/dates.py:28 -msgid "Dec." -msgstr "12월" - -#: utils/timesince.py:12 -msgid "year" -msgid_plural "years" -msgstr[0] "년" -msgstr[1] "년" - -#: utils/timesince.py:13 -msgid "month" -msgid_plural "months" -msgstr[0] "월" -msgstr[1] "월" - -#: utils/timesince.py:14 -msgid "week" -msgid_plural "weeks" -msgstr[0] "주" -msgstr[1] "주" - -#: utils/timesince.py:15 -msgid "day" -msgid_plural "days" -msgstr[0] "일" -msgstr[1] "일" - -#: utils/timesince.py:16 -msgid "hour" -msgid_plural "hours" -msgstr[0] "시간" -msgstr[1] "시간" - -#: utils/timesince.py:17 -msgid "minute" -msgid_plural "minutes" -msgstr[0] "분" -msgstr[1] "분" - -#: utils/timesince.py:40 -#, python-format -msgid "%d milliseconds" -msgstr "%d밀리초" - -#: utils/timesince.py:41 -#, python-format -msgid "%(number)d %(type)s" -msgstr "%(number)d%(type)s" - -#: utils/timesince.py:47 -#, python-format -msgid ", %(number)d %(type)s" -msgstr ", %(number)d%(type)s" - -#: utils/dateformat.py:40 -msgid "p.m." -msgstr "오후" - -#: utils/dateformat.py:41 -msgid "a.m." -msgstr "오전" - -#: utils/dateformat.py:46 -msgid "PM" -msgstr "오후" - -#: utils/dateformat.py:47 -msgid "AM" -msgstr "오전" - -#: utils/dateformat.py:95 -msgid "midnight" -msgstr "자정" - -#: utils/dateformat.py:97 -msgid "noon" -msgstr "정오" - -#: utils/translation/trans_real.py:358 -msgid "DATE_FORMAT" -msgstr "" - -#: utils/translation/trans_real.py:359 -msgid "DATETIME_FORMAT" -msgstr "" - -#: utils/translation/trans_real.py:360 -msgid "TIME_FORMAT" -msgstr "" - -#: utils/translation/trans_real.py:376 -msgid "YEAR_MONTH_FORMAT" -msgstr "" - -#: utils/translation/trans_real.py:377 -msgid "MONTH_DAY_FORMAT" -msgstr "" - -#: newforms/fields.py:103 newforms/fields.py:256 -#, python-format -msgid "Ensure this value has at most %d characters." -msgstr "%d 자 이하로 입력해 주세요." - -#: newforms/fields.py:105 newforms/fields.py:258 -#, python-format -msgid "Ensure this value has at least %d characters." -msgstr "%d 자 이상 입력해 주세요." - -#: newforms/fields.py:130 -#, python-format -msgid "Ensure this value is less than or equal to %s." -msgstr "%s 이하의 값을 입력해 주세요." - -#: newforms/fields.py:132 -#, python-format -msgid "Ensure this value is greater than or equal to %s." -msgstr "%s 이상의 값을 입력해 주세요." - -#: newforms/fields.py:165 -msgid "Enter a valid date." -msgstr "올바른 날짜를 입력하세요." - -#: newforms/fields.py:192 -msgid "Enter a valid time." -msgstr "올바른 시각을 입력하세요." - -#: newforms/fields.py:228 -msgid "Enter a valid date/time." -msgstr "올바른 날짜/시각을 입력하세요." - -#: newforms/fields.py:242 -msgid "Enter a valid value." -msgstr "올바른 값을 입력하세요." - -#: newforms/fields.py:289 newforms/fields.py:311 -msgid "Enter a valid URL." -msgstr "올바른 URL을 입력하세요." - -#: newforms/fields.py:313 -msgid "This URL appears to be a broken link." -msgstr "해당 URL의 링크가 잘못 되어 있습니다." - -#: newforms/fields.py:364 newforms/models.py:165 -msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "올바르게 선택해 주세요. 선택하신 것이 선택가능항목에 없습니다." - -#: newforms/fields.py:380 newforms/fields.py:456 newforms/models.py:182 -msgid "Enter a list of values." -msgstr "리스트를 입력하세요." - -#: newforms/fields.py:389 newforms/models.py:188 -#, python-format -msgid "Select a valid choice. %s is not one of the available choices." -msgstr "올바르게 선택해 주세요. %s (이)가 선택가능항목에 없습니다." - -#: newforms/widgets.py:180 contrib/admin/filterspecs.py:150 -#: oldforms/__init__.py:577 -msgid "Unknown" -msgstr "알 수 없습니다." - -#: newforms/widgets.py:180 contrib/admin/filterspecs.py:143 -#: oldforms/__init__.py:577 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "예" -#: newforms/widgets.py:180 contrib/admin/filterspecs.py:143 -#: oldforms/__init__.py:577 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "아니오" -#: contrib/contenttypes/models.py:36 -msgid "python model class name" -msgstr "python 모델 클래스 명" +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 +msgid "Unknown" +msgstr "알 수 없습니다." -#: contrib/contenttypes/models.py:39 -msgid "content type" -msgstr "콘텐츠 타입" +#: contrib/admin/helpers.py:14 +msgid "Action:" +msgstr "액션:" -#: contrib/contenttypes/models.py:40 -msgid "content types" -msgstr "콘텐츠 타입(들)" +#: contrib/admin/models.py:19 +msgid "action time" +msgstr "액션 타임" -#: contrib/humanize/templatetags/humanize.py:17 -msgid "th" -msgstr "번째" +#: contrib/admin/models.py:22 +msgid "object id" +msgstr "오브젝트 아이디" -#: contrib/humanize/templatetags/humanize.py:17 -msgid "st" -msgstr "번째" +#: contrib/admin/models.py:23 +msgid "object repr" +msgstr "오브젝트 표현" -#: contrib/humanize/templatetags/humanize.py:17 -msgid "nd" -msgstr "번째" +#: contrib/admin/models.py:24 +msgid "action flag" +msgstr "액션 플래그" -#: contrib/humanize/templatetags/humanize.py:17 -msgid "rd" -msgstr "번째" +#: contrib/admin/models.py:25 +msgid "change message" +msgstr "메시지 변경" -#: contrib/humanize/templatetags/humanize.py:47 +#: contrib/admin/models.py:28 +msgid "log entry" +msgstr "로그 엔트리" + +#: contrib/admin/models.py:29 +msgid "log entries" +msgstr "로그 엔트리" + +#: contrib/admin/options.py:133 contrib/admin/options.py:147 +msgid "None" +msgstr "없음" + +#: contrib/admin/options.py:519 #, python-format -msgid "%(value).1f million" -msgid_plural "%(value).1f million" -msgstr[0] "(value).1f" -msgstr[1] "(value).1f" +msgid "Changed %s." +msgstr "%s (이)가 변경되었습니다." -#: contrib/humanize/templatetags/humanize.py:50 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 +msgid "and" +msgstr "또한" + +#: contrib/admin/options.py:524 #, python-format -msgid "%(value).1f billion" -msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f" -msgstr[1] "%(value).1f" +msgid "Added %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" (을)를 추가하였습니다." -#: contrib/humanize/templatetags/humanize.py:53 +#: contrib/admin/options.py:528 #, python-format -msgid "%(value).1f trillion" -msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f" -msgstr[1] "%(value).1f" +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "%(list)s에 대한 %(name)s \"%(object)s\" (을)를 변경하였습니다." -#: contrib/humanize/templatetags/humanize.py:68 -msgid "one" -msgstr "1" +#: contrib/admin/options.py:533 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" (을)를 삭제하였습니다." -#: contrib/humanize/templatetags/humanize.py:68 -msgid "two" -msgstr "2" +#: contrib/admin/options.py:537 +msgid "No fields changed." +msgstr "변경된 필드가 없습니다." -#: contrib/humanize/templatetags/humanize.py:68 -msgid "three" -msgstr "3" +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다." -#: contrib/humanize/templatetags/humanize.py:68 -msgid "four" -msgstr "4" +#: contrib/admin/options.py:603 contrib/admin/options.py:636 +#: contrib/auth/admin.py:75 +msgid "You may edit it again below." +msgstr "계속해서 편집하실 수 있습니다." -#: contrib/humanize/templatetags/humanize.py:68 -msgid "five" -msgstr "5" +#: contrib/admin/options.py:613 contrib/admin/options.py:646 +#, python-format +msgid "You may add another %s below." +msgstr "계속해서 다른 %s (을)를 추가하세요." -#: contrib/humanize/templatetags/humanize.py:68 -msgid "six" -msgstr "6" +#: contrib/admin/options.py:634 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "%(name)s \"%(obj)s\" (이)가 변경되었습니다." -#: contrib/humanize/templatetags/humanize.py:68 -msgid "seven" -msgstr "7" +#: contrib/admin/options.py:642 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다. 계속해서 편집하세요." -#: contrib/humanize/templatetags/humanize.py:68 -msgid "eight" -msgstr "8" +#: contrib/admin/options.py:773 +#, python-format +msgid "Add %s" +msgstr "%s 추가" -#: contrib/humanize/templatetags/humanize.py:68 -msgid "nine" -msgstr "9" +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "Primary key %(key)r에 대한 오브젝트 %(name)s가 존재하지 않습니다." -#: contrib/auth/views.py:39 -msgid "Logged out" -msgstr "로그 아웃" +#: contrib/admin/options.py:861 +#, python-format +msgid "Change %s" +msgstr "%s 변경" -#: contrib/auth/models.py:38 contrib/auth/models.py:58 -msgid "name" -msgstr "이름" +#: contrib/admin/options.py:905 +msgid "Database error" +msgstr "데이터베이스 오류" -#: contrib/auth/models.py:40 -msgid "codename" -msgstr "코드명" +#: contrib/admin/options.py:941 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s %(name)s (이)가 변경되었습니다." +msgstr[1] "%(count)s %(name)s (이)가 변경되었습니다." -#: contrib/auth/models.py:43 -msgid "permission" -msgstr "허가" +#: contrib/admin/options.py:1020 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" (이)가 삭제되었습니다." -#: contrib/auth/models.py:44 contrib/auth/models.py:59 -msgid "permissions" -msgstr "허가" +#: contrib/admin/options.py:1057 +#, python-format +msgid "Change history: %s" +msgstr "변경 히스토리: %s" -#: contrib/auth/models.py:62 -msgid "group" -msgstr "그룹" +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 +#: contrib/auth/forms.py:80 +msgid "" +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." +msgstr "사용자명과 비밀번호를 입력하세요.(대, 소문자 구별)" -#: contrib/auth/models.py:63 contrib/auth/models.py:103 -msgid "groups" -msgstr "그룹" +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 +msgid "Please log in again, because your session has expired." +msgstr "로그인 세션이 끊겼습니다. 다시 로그인 하세요." -#: contrib/auth/models.py:93 -msgid "username" +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 +msgid "" +"Looks like your browser isn't configured to accept cookies. Please enable " +"cookies, reload this page, and try again." +msgstr "" +"사용하시는 브라우저가 쿠키 사용을 허가하고 있지 않습니다.쿠키 사용을 체크하시" +"고 다시 시도해 주세요." + +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 +#: contrib/admin/views/decorators.py:66 +msgid "Usernames cannot contain the '@' character." +msgstr "사용자명에는 '@'을 사용할 수 없습니다." + +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 +#, python-format +msgid "Your e-mail address is not your username. Try '%s' instead." +msgstr "이메일 주소와 사용자명은 다릅니다. '%s'를 사용하세요." + +#: contrib/admin/sites.py:367 +msgid "Site administration" +msgstr "사이트 관리" + +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/templates/registration/password_reset_complete.html:14 +#: contrib/admin/views/decorators.py:20 +msgid "Log in" +msgstr "로그인" + +#: contrib/admin/sites.py:426 +#, python-format +msgid "%s administration" +msgstr "%s 사이트 관리" + +#: contrib/admin/util.py:168 +#, python-format +msgid "One or more %(fieldname)s in %(name)s: %(obj)s" +msgstr "%(name)s 에 %(fieldname)s (이)가 하나 이상 있는 %(obj)s" + +#: contrib/admin/util.py:173 +#, python-format +msgid "One or more %(fieldname)s in %(name)s:" +msgstr "%(name)s 에 %(fieldname)s (이)가 하나 이상 있는" + +#: contrib/admin/widgets.py:71 +msgid "Date:" +msgstr "날짜:" + +#: contrib/admin/widgets.py:71 +msgid "Time:" +msgstr "시각:" + +#: contrib/admin/widgets.py:95 +msgid "Currently:" +msgstr "현재:" + +#: contrib/admin/widgets.py:95 +msgid "Change:" +msgstr "변경:" + +#: contrib/admin/widgets.py:124 +msgid "Lookup" +msgstr "찾아보기" + +#: contrib/admin/widgets.py:235 +msgid "Add Another" +msgstr "하나 더 추가하기" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "해당 페이지가 없습니다." + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "죄송합니다, 요청하신 페이지를 찾을 수 없습니다." + +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/app_index.html:8 +#: contrib/admin/templates/admin/base.html:54 +#: contrib/admin/templates/admin/change_form.html:17 +#: contrib/admin/templates/admin/change_list.html:25 +#: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:6 +#: contrib/admin/templates/admin/invalid_setup.html:4 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/admin/auth/user/change_password.html:10 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_complete.html:4 +#: contrib/admin/templates/registration/password_reset_confirm.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 +msgid "Home" +msgstr "홈" + +#: contrib/admin/templates/admin/500.html:4 +msgid "Server error" +msgstr "서버 오류" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "서버 오류 (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "서버 오류 (500)" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"오류가 발생했습니다. 사이트 관리자에게 이메일로 에러를 보고 했습니다.조속히 " +"수정하도록 하겠습니다. 고맙습니다." + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "선택한 액션을 실행합니다." + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "실행" + +#: contrib/admin/templates/admin/app_index.html:10 +#: contrib/admin/templates/admin/index.html:19 +#, python-format +msgid "%(name)s" +msgstr "%(name)s" + +#: contrib/admin/templates/admin/base.html:27 +msgid "Welcome," +msgstr "환영합니다," + +#: contrib/admin/templates/admin/base.html:32 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "문서" + +#: contrib/admin/templates/admin/base.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +msgid "Change password" +msgstr "비밀번호 변경" + +#: contrib/admin/templates/admin/base.html:47 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +msgid "Log out" +msgstr "로그아웃" + +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django 사이트 관리" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Django 관리" + +#: contrib/admin/templates/admin/change_form.html:20 +#: contrib/admin/templates/admin/index.html:29 +msgid "Add" +msgstr "추가" + +#: contrib/admin/templates/admin/change_form.html:27 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "히스토리" + +#: contrib/admin/templates/admin/change_form.html:28 +#: contrib/admin/templates/admin/edit_inline/stacked.html:13 +#: contrib/admin/templates/admin/edit_inline/tabular.html:27 +msgid "View on site" +msgstr "사이트에서 보기" + +#: contrib/admin/templates/admin/change_form.html:38 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "아래의 오류를 수정해 주세요." +msgstr[1] "아래의 오류들을 수정해 주세요." + +#: contrib/admin/templates/admin/change_list.html:46 +#, python-format +msgid "Add %(name)s" +msgstr "%(name)s 추가" + +#: contrib/admin/templates/admin/change_list.html:65 +msgid "Filter" +msgstr "필터" + +#: contrib/admin/templates/admin/delete_confirmation.html:10 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 +msgid "Delete" +msgstr "삭제" + +#: contrib/admin/templates/admin/delete_confirmation.html:16 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"%(object_name)s \"%(escaped_object)s\" (을)를 삭제하면서관련 오브젝트를 제거" +"하고자 했으나, 지금 사용하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없" +"습니다. :" + +#: contrib/admin/templates/admin/delete_confirmation.html:23 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"정말로 %(object_name)s \"%(escaped_object)s\" (을)를 삭제하시겠습니까?다음의 " +"관련 아이템들이 모두 삭제됩니다. :" + +#: contrib/admin/templates/admin/delete_confirmation.html:28 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:33 +msgid "Yes, I'm sure" +msgstr "네, 확실합니다." + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:9 +msgid "Delete multiple objects" +msgstr "여러 개의 오브젝트 삭제" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:15 +#, python-format +msgid "" +"Deleting the %(object_name)s would result in deleting related objects, but " +"your account doesn't have permission to delete the following types of " +"objects:" +msgstr "" +"%(object_name)s(을)를 삭제하면서관련 오브젝트를 제거하고자 했으나, 지금 사용" +"하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없습니다. :" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:22 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(object_name)s objects? All of " +"the following objects and it's related items will be deleted:" +msgstr "" +"정말로 %(object_name)s(을)를 삭제하시겠습니까?다음의 관련 아이템들이 모두 삭" +"제됩니다. :" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr "%(filter_title)s (으)로" + +#: contrib/admin/templates/admin/index.html:18 +#, python-format +msgid "Models available in the %(name)s application." +msgstr "%(name)s 어플리케이션으로 이용 가능한 모델" + +#: contrib/admin/templates/admin/index.html:35 +msgid "Change" +msgstr "변경" + +#: contrib/admin/templates/admin/index.html:45 +msgid "You don't have permission to edit anything." +msgstr "수정할 권한이 없습니다." + +#: contrib/admin/templates/admin/index.html:53 +msgid "Recent Actions" +msgstr "최근 액션" + +#: contrib/admin/templates/admin/index.html:54 +msgid "My Actions" +msgstr "나의 액션" + +#: contrib/admin/templates/admin/index.html:58 +msgid "None available" +msgstr "이용할 수 없습니다." + +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "내용 형식이 지정되지 않았습니다." + +#: contrib/admin/templates/admin/invalid_setup.html:7 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"데이터베이스 설정에 문제가 발생했습니다. 해당 데이터베이스 테이블이 생성되었" +"는지,해당 유저가 데이터베이스를 읽어 들일 수 있는지 확인하세요." + +#: contrib/admin/templates/admin/login.html:19 +msgid "Username:" msgstr "사용자명" -#: contrib/auth/models.py:93 +#: contrib/admin/templates/admin/login.html:22 +msgid "Password:" +msgstr "비밀번호" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "날짜/시간" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "사용자" + +#: contrib/admin/templates/admin/object_history.html:24 +#: contrib/comments/templates/comments/moderation_queue.html:33 +msgid "Action" +msgstr "액션" + +#: contrib/admin/templates/admin/object_history.html:30 +#: utils/translation/trans_real.py:400 +msgid "DATETIME_FORMAT" +msgstr "날짜/시간 형식" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"오브젝트에 변경사항이 없습니다. 이 admin 사이트를 통해 추가된 것이 아닐 수 있" +"습니다." + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "모두 표시" + +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "저장" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "검색" + +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "1 result" +msgid_plural "%(counter)s results" +msgstr[0] "1건" +msgstr[1] "%(counter)s 건" + +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "%(full_result_count)s total" +msgstr "모두 %(full_result_count)s 건" + +#: contrib/admin/templates/admin/submit_line.html:5 +msgid "Save as new" +msgstr "새로 저장" + +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Save and add another" +msgstr "저장 및 다른 이름으로 추가" + +#: contrib/admin/templates/admin/submit_line.html:7 +msgid "Save and continue editing" +msgstr "저장 및 편집 계속" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"사용자명와 비밀번호를 입력하세요.더 많은 사용자 옵션을 사용하실 수 있습니다." + +#: contrib/admin/templates/admin/auth/user/add_form.html:13 +#: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59 +msgid "Username" +msgstr "사용자명" + +#: contrib/admin/templates/admin/auth/user/add_form.html:20 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 +msgid "Password" +msgstr "비밀번호" + +#: contrib/admin/templates/admin/auth/user/add_form.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/auth/forms.py:186 +msgid "Password (again)" +msgstr "비밀번호 (확인)" + +#: contrib/admin/templates/admin/auth/user/add_form.html:27 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 +msgid "Enter the same password as above, for verification." +msgstr "확인을 위해 위와 동일한 비밀번호를 입력하세요. " + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s 새로운 비밀번호를 입력하세요." + +#: contrib/admin/templates/admin/edit_inline/tabular.html:15 +msgid "Delete?" +msgstr "삭제" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "사이트를 이용해 주셔서 고맙습니다." + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "다시 로그인하기" + +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_change_form.html:6 +#: contrib/admin/templates/registration/password_change_form.html:10 +msgid "Password change" +msgstr "비밀번호 변경" + +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_done.html:10 +msgid "Password change successful" +msgstr "비밀번호를 변경하였습니다." + +#: contrib/admin/templates/registration/password_change_done.html:12 +msgid "Your password was changed." +msgstr "비밀번호가 변경되었습니다." + +#: contrib/admin/templates/registration/password_change_form.html:12 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"보안상 필요하오니 기존에 사용하시던 비밀번호를 입력해 주세요.새로운 비밀번호" +"는 정확히 입력했는지 확인할 수 있도록 두 번 입력하시기 바랍니다." + +#: contrib/admin/templates/registration/password_change_form.html:17 +msgid "Old password:" +msgstr "기존 비밀번호:" + +#: contrib/admin/templates/registration/password_change_form.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:18 +msgid "New password:" +msgstr "새로운 비밀번호:" + +#: contrib/admin/templates/registration/password_change_form.html:21 +#: contrib/admin/templates/registration/password_reset_confirm.html:20 +msgid "Confirm password:" +msgstr "새로운 비밀번호(확인):" + +#: contrib/admin/templates/registration/password_change_form.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "Change my password" +msgstr "비밀번호 변경" + +#: contrib/admin/templates/registration/password_reset_complete.html:4 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:10 +msgid "Password reset" +msgstr "비밀번호 초기화" + +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_complete.html:10 +msgid "Password reset complete" +msgstr "비밀번호가 초기화 완료" + +#: contrib/admin/templates/registration/password_reset_complete.html:12 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "비밀번호가 설정되었습니다. 이제 로그인하세요." + +#: contrib/admin/templates/registration/password_reset_confirm.html:4 +msgid "Password reset confirmation" +msgstr "비밀번호 초기화 확인" + +#: contrib/admin/templates/registration/password_reset_confirm.html:12 +msgid "Enter new password" +msgstr "새 비밀번호 입력" + +#: contrib/admin/templates/registration/password_reset_confirm.html:14 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" +"새로운 비밀번호를 정확히 입력했는지 확인할 수 있도록두 번 입력하시기 바랍니" +"다." + +#: contrib/admin/templates/registration/password_reset_confirm.html:26 +msgid "Password reset unsuccessful" +msgstr "비밀번호가 초기화를 실패하였습니다." + +#: contrib/admin/templates/registration/password_reset_confirm.html:28 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" +"비밀번호 초기화 링크가 이미 사용되어 올바르지 않습니다.비밀번호 초기화을 다" +"시 해주세요." + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "비밀번호가 초기화되었습니다." + +#: contrib/admin/templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed you instructions for setting your password to the e-mail " +"address you submitted. You should be receiving it shortly." +msgstr "새로운 비밀번호를 등록하신 이메일로 보내드렸습니다." + +#: contrib/admin/templates/registration/password_reset_email.html:2 +msgid "You're receiving this e-mail because you requested a password reset" +msgstr "비밀번호가 초기화되었음을 알려드립니다." + +#: contrib/admin/templates/registration/password_reset_email.html:3 +#, python-format +msgid "for your user account at %(site_name)s" +msgstr "%(site_name)s 의 사용자 비밀번호가 초기화되었습니다." + +#: contrib/admin/templates/registration/password_reset_email.html:5 +msgid "Please go to the following page and choose a new password:" +msgstr "이어지는 페이지에서 새 비밀번호를 선택하세요." + +#: contrib/admin/templates/registration/password_reset_email.html:9 +msgid "Your username, in case you've forgotten:" +msgstr "사용자명:" + +#: contrib/admin/templates/registration/password_reset_email.html:11 +msgid "Thanks for using our site!" +msgstr "사이트를 이용해 주셔서 고맙습니다." + +#: contrib/admin/templates/registration/password_reset_email.html:13 +#, python-format +msgid "The %(site_name)s team" +msgstr "%(site_name)s 팀" + +#: contrib/admin/templates/registration/password_reset_form.html:12 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll e-mail " +"instructions for setting a new one." +msgstr "" +"비밀번호를 잊으셨나요? 아래에 메일 주소를 입력하시면, 새 비밀번호 설정 방법" +"을 안내하는 메일을 보내드립니다." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "이메일 주소:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "비밀번호 초기화" + +#: contrib/admin/templatetags/admin_list.py:299 +msgid "All dates" +msgstr "언제나" + +#: contrib/admin/views/main.py:70 +#, python-format +msgid "Select %s" +msgstr "%s 선택" + +#: contrib/admin/views/main.py:70 +#, python-format +msgid "Select %s to change" +msgstr "변경할 %s 선택" + +#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 +msgid "site" +msgstr "사이트" + +#: contrib/admin/views/template.py:39 +msgid "template" +msgstr "템플릿명" + +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 +msgid "tag:" +msgstr "태그:" + +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 +msgid "filter:" +msgstr "필터:" + +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 +msgid "view:" +msgstr "뷰:" + +#: contrib/admindocs/views.py:190 +#, python-format +msgid "App %r not found" +msgstr "어플리케이션 %r (이)가 없습니다." + +#: contrib/admindocs/views.py:197 +#, python-format +msgid "Model %(model_name)r not found in app %(app_label)r" +msgstr "모델 %(model_name)r (이)가 어플리케이션 %(app_label)r 에 없습니다." + +#: contrib/admindocs/views.py:209 +#, python-format +msgid "the related `%(app_label)s.%(data_type)s` object" +msgstr "`%(app_label)s.%(data_type)s` 관련 오브젝트" + +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 +msgid "model:" +msgstr "모델:" + +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 +#, python-format +msgid "related `%(app_label)s.%(object_name)s` objects" +msgstr "`%(app_label)s.%(object_name)s` 관련 오브젝트(들)" + +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 +#, python-format +msgid "all %s" +msgstr "모든 %s" + +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 +#, python-format +msgid "number of %s" +msgstr "%s 의 수" + +#: contrib/admindocs/views.py:271 +#, python-format +msgid "Fields on %s objects" +msgstr "%s 오브젝트의 필드" + +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 +msgid "Integer" +msgstr "정수" + +#: contrib/admindocs/views.py:335 +msgid "Boolean (Either True or False)" +msgstr "boolean(참 또는 거짓)" + +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "문자열(%(max_length)s 글자까지)" + +#: contrib/admindocs/views.py:337 +msgid "Comma-separated integers" +msgstr "정수(콤마로 구분)" + +#: contrib/admindocs/views.py:338 +msgid "Date (without time)" +msgstr "날짜(시간 제외)" + +#: contrib/admindocs/views.py:339 +msgid "Date (with time)" +msgstr "날짜(시간 포함)" + +#: contrib/admindocs/views.py:340 +msgid "Decimal number" +msgstr "10진수" + +#: contrib/admindocs/views.py:341 +msgid "E-mail address" +msgstr "이메일 주소" + +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 +msgid "File path" +msgstr "파일 경로" + +#: contrib/admindocs/views.py:344 +msgid "Floating point number" +msgstr "부동소수점 숫자" + +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 +msgid "IP address" +msgstr "IP 주소" + +#: contrib/admindocs/views.py:350 +msgid "Boolean (Either True, False or None)" +msgstr "boolean (참, 거짓 또는 none)" + +#: contrib/admindocs/views.py:351 +msgid "Relation to parent model" +msgstr "부모(상위) 모델과 연계" + +#: contrib/admindocs/views.py:352 +msgid "Phone number" +msgstr "전화번호" + +#: contrib/admindocs/views.py:357 +msgid "Text" +msgstr "텍스트" + +#: contrib/admindocs/views.py:358 +msgid "Time" +msgstr "시각" + +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 +#: contrib/comments/templates/comments/moderation_queue.html:37 +#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 +msgid "URL" +msgstr "URL" + +#: contrib/admindocs/views.py:360 +msgid "U.S. state (two uppercase letters)" +msgstr "미국의 주 (두개의 대문자로)" + +#: contrib/admindocs/views.py:361 +msgid "XML text" +msgstr "XML 텍스트" + +#: contrib/admindocs/views.py:387 +#, python-format +msgid "%s does not appear to be a urlpattern object" +msgstr "%s (은)는 url 패턴의 오브젝트가 아닙니다." + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 +msgid "Bookmarklets" +msgstr "북마크릿" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:4 +msgid "Documentation bookmarklets" +msgstr "문서 북마크릿" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:8 +msgid "" +"\n" +"

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

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

                  북마크릿을 설치하시려면 링크를 북마크 툴바로 드래그 하거" +"나,\n" +"오른쪽 클릭으로 해당 링크를 북마크에 추가하세요.\n" +"이제 사이트 내의 모든 페이지에서 북마크릿 선택이 가능합니다.\n" +"북마크릿에 따라 내부 네트워크 상의 컴퓨터로부터 이 사이트를 참조해야하는 경우" +"가 있습니다.\n" +"(내부 네트워크가 있는지 불명확한 경우 시스템 관리자에게 확인하시기 바랍니다.)" +"

                  \n" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:18 +msgid "Documentation for this page" +msgstr "이 페이지의 문서" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:19 +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "각 페이지로에서 해당 페이지를 생성한 뷰의 문서로 갑니다." + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:21 +msgid "Show object ID" +msgstr "오브젝트 아이디 표시" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:22 +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." +msgstr "단일 오브젝트 페이지의 고유 아이디와 컨텐츠 타입을 표시합니다." + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:24 +msgid "Edit this object (current window)" +msgstr "오브젝트 편집(현재 창)" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:25 +msgid "Jumps to the admin page for pages that represent a single object." +msgstr "단일 오브젝트 페이지의 관리 페이지로 이동" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:27 +msgid "Edit this object (new window)" +msgstr "오브젝트 편집(새로운 창)" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:28 +msgid "As above, but opens the admin page in a new window." +msgstr "위와 동일하며, 새로운 창에서 관리 페이지를 엽니다." + +#: contrib/auth/admin.py:21 +msgid "Personal info" +msgstr "개인정보" + +#: contrib/auth/admin.py:22 +msgid "Permissions" +msgstr "권한" + +#: contrib/auth/admin.py:23 +msgid "Important dates" +msgstr "중요한 일정" + +#: contrib/auth/admin.py:24 +msgid "Groups" +msgstr "그룹" + +#: contrib/auth/admin.py:80 +msgid "Add user" +msgstr "사용자 추가" + +#: contrib/auth/admin.py:106 +msgid "Password changed successfully." +msgstr "비밀번호가 변경되었습니다." + +#: contrib/auth/admin.py:112 +#, python-format +msgid "Change password: %s" +msgstr "비밀번호 변경: %s" + +#: contrib/auth/forms.py:15 contrib/auth/forms.py:48 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." msgstr "필수항목입니다. 30자 이내로 입력하세요.(알파벳, 숫자, '_' 만 가능)" -#: contrib/auth/models.py:94 -msgid "first name" -msgstr "이름" +#: contrib/auth/forms.py:16 contrib/auth/forms.py:49 +msgid "This value must contain only letters, numbers and underscores." +msgstr "문자, 숫자, '_'만 가능합니다." -#: contrib/auth/models.py:95 -msgid "last name" -msgstr "성" +#: contrib/auth/forms.py:18 +msgid "Password confirmation" +msgstr "비밀번호 확인" -#: contrib/auth/models.py:96 -msgid "e-mail address" -msgstr "이메일 주소" - -#: contrib/auth/models.py:97 -msgid "password" -msgstr "비밀번호" - -#: contrib/auth/models.py:97 -msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." -msgstr "" -"'[algo]$[salt]$[hexdigest]' 또는 비밀번호 변경" - -#: contrib/auth/models.py:98 -msgid "staff status" -msgstr "스태프 권한" - -#: contrib/auth/models.py:98 -msgid "Designates whether the user can log into this admin site." -msgstr "사용자가 관리사이트에 로그인이 가능한지를 나타냅니다." - -#: contrib/auth/models.py:99 -msgid "active" -msgstr "활성" - -#: contrib/auth/models.py:99 -msgid "" -"Designates whether this user can log into the Django admin. Unselect this " -"instead of deleting accounts." -msgstr "사용자가 'Django 관리'에 로그인이 가능한지를 나타냅니다." - -#: contrib/auth/models.py:100 -msgid "superuser status" -msgstr "최상위 사용자 권한" - -#: contrib/auth/models.py:100 -msgid "" -"Designates that this user has all permissions without explicitly assigning " -"them." -msgstr "해당 사용자에게 모든 권한을 허가합니다." - -#: contrib/auth/models.py:101 -msgid "last login" -msgstr "마지막 로그인" - -#: contrib/auth/models.py:102 -msgid "date joined" -msgstr "등록일" - -#: contrib/auth/models.py:104 -msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "해당 사용자에게 속해있는 그룹의 모든 권한을 허가합니다." - -#: contrib/auth/models.py:105 -msgid "user permissions" -msgstr "사용자 권한" - -#: contrib/auth/models.py:109 -msgid "user" -msgstr "사용자" - -#: contrib/auth/models.py:110 -msgid "users" -msgstr "사용자(들)" - -#: contrib/auth/models.py:116 -msgid "Personal info" -msgstr "개인정보" - -#: contrib/auth/models.py:117 -msgid "Permissions" -msgstr "권한" - -#: contrib/auth/models.py:118 -msgid "Important dates" -msgstr "중요한 일정" - -#: contrib/auth/models.py:119 -msgid "Groups" -msgstr "그룹" - -#: contrib/auth/models.py:263 -msgid "message" -msgstr "메시지" - -#: contrib/auth/models.py:276 -#, fuzzy -msgid "AnonymousUser" -msgstr "익명사용자" - -#: contrib/auth/forms.py:17 contrib/auth/forms.py:138 -msgid "The two password fields didn't match." -msgstr "비밀번호가 일치하지 않습니다." - -#: contrib/auth/forms.py:25 +#: contrib/auth/forms.py:30 msgid "A user with that username already exists." msgstr "해당 사용자명은 이미 존재합니다." -#: contrib/auth/forms.py:53 +#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:197 +msgid "The two password fields didn't match." +msgstr "비밀번호가 일치하지 않습니다." + +#: contrib/auth/forms.py:82 +msgid "This account is inactive." +msgstr "이 계정은 유효하지 않습니다." + +#: contrib/auth/forms.py:87 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." @@ -1125,31 +1264,2508 @@ msgstr "" "사용하시는 브라우저가 쿠키를 허용하지 않습니다.로그인하기 위해서는 쿠키 사용" "이 필요합니다." -#: contrib/auth/forms.py:60 contrib/admin/views/decorators.py:10 -msgid "" -"Please enter a correct username and password. Note that both fields are case-" -"sensitive." -msgstr "사용자명과 비밀번호를 입력하세요.(대, 소문자 구별)" +#: contrib/auth/forms.py:100 +msgid "E-mail" +msgstr "이메일 주소" -#: contrib/auth/forms.py:62 -msgid "This account is inactive." -msgstr "이 계정은 유효하지 않습니다." - -#: contrib/auth/forms.py:85 +#: contrib/auth/forms.py:109 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" "이메일주소와 일치하는 사용자가 없습니다.이 이메일주소로 등록하셨습니까?" -#: contrib/auth/forms.py:117 -msgid "The two 'new password' fields didn't match." -msgstr "새로운 비밀번호가 일치하지 않습니다." +#: contrib/auth/forms.py:135 +#, python-format +msgid "Password reset on %s" +msgstr "%s에 대한 비밀번호 초기화" -#: contrib/auth/forms.py:124 +#: contrib/auth/forms.py:143 +msgid "New password" +msgstr "새 비밀번호:" + +#: contrib/auth/forms.py:144 +msgid "New password confirmation" +msgstr "새 비밀번호 확인:" + +#: contrib/auth/forms.py:169 +msgid "Old password" +msgstr "기존 비밀번호:" + +#: contrib/auth/forms.py:177 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "기존 비밀번호를 잘못 입력하셨습니다. 다시 입력해 주세요." +#: contrib/auth/models.py:63 contrib/auth/models.py:86 +msgid "name" +msgstr "이름" + +#: contrib/auth/models.py:65 +msgid "codename" +msgstr "코드명" + +#: contrib/auth/models.py:68 +msgid "permission" +msgstr "허가" + +#: contrib/auth/models.py:69 contrib/auth/models.py:87 +msgid "permissions" +msgstr "허가" + +#: contrib/auth/models.py:90 +msgid "group" +msgstr "그룹" + +#: contrib/auth/models.py:91 contrib/auth/models.py:138 +msgid "groups" +msgstr "그룹" + +#: contrib/auth/models.py:128 +msgid "username" +msgstr "사용자명" + +#: contrib/auth/models.py:129 +msgid "first name" +msgstr "이름" + +#: contrib/auth/models.py:130 +msgid "last name" +msgstr "성" + +#: contrib/auth/models.py:131 +msgid "e-mail address" +msgstr "이메일 주소" + +#: contrib/auth/models.py:132 +msgid "password" +msgstr "비밀번호" + +#: contrib/auth/models.py:132 +msgid "" +"Use '[algo]$[salt]$[hexdigest]' or use the change " +"password form." +msgstr "" +"'[algo]$[salt]$[hexdigest]' 또는 비밀번호 변경" + +#: contrib/auth/models.py:133 +msgid "staff status" +msgstr "스태프 권한" + +#: contrib/auth/models.py:133 +msgid "Designates whether the user can log into this admin site." +msgstr "사용자가 관리사이트에 로그인이 가능한지를 나타냅니다." + +#: contrib/auth/models.py:134 +msgid "active" +msgstr "활성" + +#: contrib/auth/models.py:134 +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "" +"사용자가 'Django 관리'에 로그인이 가능한지를 나타냅니다.계정을 삭제하는 대신 " +"이것을 선택 해제하세요." + +#: contrib/auth/models.py:135 +msgid "superuser status" +msgstr "최상위 사용자 권한" + +#: contrib/auth/models.py:135 +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "해당 사용자에게 모든 권한을 허가합니다." + +#: contrib/auth/models.py:136 +msgid "last login" +msgstr "마지막 로그인" + +#: contrib/auth/models.py:137 +msgid "date joined" +msgstr "등록일" + +#: contrib/auth/models.py:139 +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "해당 사용자에게 속해있는 그룹의 모든 권한을 허가합니다." + +#: contrib/auth/models.py:140 +msgid "user permissions" +msgstr "사용자 권한" + +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 +msgid "user" +msgstr "사용자" + +#: contrib/auth/models.py:145 +msgid "users" +msgstr "사용자(들)" + +#: contrib/auth/models.py:301 +msgid "message" +msgstr "메시지" + +#: contrib/auth/views.py:56 +msgid "Logged out" +msgstr "로그 아웃" + +#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 +msgid "Enter a valid e-mail address." +msgstr "올바른 이메일 주소를 입력하세요." + +#: contrib/comments/admin.py:11 +msgid "Content" +msgstr "내용" + +#: contrib/comments/admin.py:14 +msgid "Metadata" +msgstr "" + +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "%(site_name)s 의 코멘트" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "%(site_name)s 의 사용자 비밀번호가 초기화 되었습니다." + +#: contrib/comments/forms.py:93 +#: contrib/comments/templates/comments/moderation_queue.html:34 +msgid "Name" +msgstr "이름" + +#: contrib/comments/forms.py:94 +msgid "Email address" +msgstr "이메일 주소" + +#: contrib/comments/forms.py:96 +#: contrib/comments/templates/comments/moderation_queue.html:35 +msgid "Comment" +msgstr "코멘트:" + +#: contrib/comments/forms.py:173 +#, python-format +msgid "Watch your mouth! The word %s is not allowed here." +msgid_plural "Watch your mouth! The words %s are not allowed here." +msgstr[0] "비속어/욕설입니다. %s (은)는 사용하실 수 없습니다." +msgstr[1] "비속어/욕설입니다. %s (은)는 사용하실 수 없습니다." + +#: contrib/comments/forms.py:180 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "이 필드에 무엇이라도 입력하면 코멘트는 스팸으로 처리될 것입니다." + +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "콘텐츠 타입" + +#: contrib/comments/models.py:24 +msgid "object ID" +msgstr "오브젝트 ID" + +#: contrib/comments/models.py:52 +msgid "user's name" +msgstr "사용자명" + +#: contrib/comments/models.py:53 +msgid "user's email address" +msgstr "사용자 이메일 주소" + +#: contrib/comments/models.py:54 +msgid "user's URL" +msgstr "사용자 URL" + +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 +msgid "comment" +msgstr "코멘트" + +#: contrib/comments/models.py:59 +msgid "date/time submitted" +msgstr "날짜/시간 확인" + +#: contrib/comments/models.py:61 +msgid "is public" +msgstr "공개합니다." + +#: contrib/comments/models.py:62 +msgid "" +"Uncheck this box to make the comment effectively disappear from the site." +msgstr "이 사이트에서 코멘트가 나타나지 않게 하려면 체크 해제하세요." + +#: contrib/comments/models.py:64 +msgid "is removed" +msgstr "삭제합니다." + +#: contrib/comments/models.py:65 +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"코멘트가 부적절한 경우 체크하세요. \"코멘트가 삭제되었습니다.\" 메시지가 표시" +"됩니다." + +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "코멘트(들)" + +#: contrib/comments/models.py:119 +msgid "" +"This comment was posted by an authenticated user and thus the name is read-" +"only." +msgstr "이 코멘트는 등록된 사용자가 작성하였으므로 읽기 전용입니다." + +#: contrib/comments/models.py:128 +msgid "" +"This comment was posted by an authenticated user and thus the email is read-" +"only." +msgstr "이 코멘트는 등록된 사용자가 작성하였으므로 읽기 전용입니다." + +#: contrib/comments/models.py:153 +#, python-format +msgid "" +"Posted by %(user)s at %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" +msgstr "" +"%(user)s (이)가 %(date)s 등록\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" + +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "플래그" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "날짜" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "코멘트 플래그" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "코멘트 플래그" + +#: contrib/comments/templates/comments/approve.html:4 +msgid "Approve a comment" +msgstr "코멘트 승인" + +#: contrib/comments/templates/comments/approve.html:7 +msgid "Really make this comment public?" +msgstr "정말로 이 코멘트를 공개하시겠습니까?" + +#: contrib/comments/templates/comments/approve.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:49 +msgid "Approve" +msgstr "승인" + +#: contrib/comments/templates/comments/approved.html:4 +msgid "Thanks for approving" +msgstr "승인해주셔서 고맙습니다." + +#: contrib/comments/templates/comments/approved.html:7 +#: contrib/comments/templates/comments/deleted.html:7 +#: contrib/comments/templates/comments/flagged.html:7 +msgid "" +"Thanks for taking the time to improve the quality of discussion on our site" +msgstr "우리 사이트의 토론에 기여해주셔서 감사합니다." + +#: contrib/comments/templates/comments/delete.html:4 +msgid "Remove a comment" +msgstr "코멘트 삭제" + +#: contrib/comments/templates/comments/delete.html:7 +msgid "Really remove this comment?" +msgstr "정말로 이 코멘트를 삭제하시겠습니까?" + +#: contrib/comments/templates/comments/delete.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:53 +msgid "Remove" +msgstr "삭제합니다." + +#: contrib/comments/templates/comments/deleted.html:4 +msgid "Thanks for removing" +msgstr "삭제해주셔서 고맙습니다." + +#: contrib/comments/templates/comments/flag.html:4 +msgid "Flag this comment" +msgstr "코멘트에 플래그 달기" + +#: contrib/comments/templates/comments/flag.html:7 +msgid "Really flag this comment?" +msgstr "정말로 플래그를 다시겠습니까?" + +#: contrib/comments/templates/comments/flag.html:12 +msgid "Flag" +msgstr "플래그를 답니다." + +#: contrib/comments/templates/comments/flagged.html:4 +msgid "Thanks for flagging" +msgstr "플래그를 달아주셔서 고맙습니다." + +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 +msgid "Post" +msgstr "작성하기" + +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 +msgid "Preview" +msgstr "미리보기" + +#: contrib/comments/templates/comments/moderation_queue.html:4 +#: contrib/comments/templates/comments/moderation_queue.html:19 +msgid "Comment moderation queue" +msgstr "코멘트 관리 큐" + +#: contrib/comments/templates/comments/moderation_queue.html:26 +msgid "No comments to moderate" +msgstr "관리할 코멘트가 없습니다." + +#: contrib/comments/templates/comments/moderation_queue.html:36 +msgid "Email" +msgstr "이메일" + +#: contrib/comments/templates/comments/moderation_queue.html:38 +msgid "Authenticated?" +msgstr "로그인 여부" + +#: contrib/comments/templates/comments/moderation_queue.html:39 +msgid "IP Address" +msgstr "IP 주소" + +#: contrib/comments/templates/comments/moderation_queue.html:40 +msgid "Date posted" +msgstr "등록일" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "yes" +msgstr "예" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "no" +msgstr "아니오" + +#: contrib/comments/templates/comments/posted.html:4 +msgid "Thanks for commenting" +msgstr "코멘트 작성 완료" + +#: contrib/comments/templates/comments/posted.html:7 +msgid "Thank you for your comment" +msgstr "코멘트를 달아주셔서 고맙습니다." + +#: contrib/comments/templates/comments/preview.html:4 +#: contrib/comments/templates/comments/preview.html:13 +msgid "Preview your comment" +msgstr "코멘트 미리보기" + +#: contrib/comments/templates/comments/preview.html:11 +msgid "Please correct the error below" +msgid_plural "Please correct the errors below" +msgstr[0] "아래의 오류를 수정해 주세요." +msgstr[1] "아래의 오류들을 수정해 주세요." + +#: contrib/comments/templates/comments/preview.html:16 +msgid "Post your comment" +msgstr "코멘트 작성하기" + +#: contrib/comments/templates/comments/preview.html:16 +msgid "or make changes" +msgstr "또는 변경하기" + +#: contrib/contenttypes/models.py:70 +msgid "python model class name" +msgstr "python 모델 클래스 명" + +#: contrib/contenttypes/models.py:75 +msgid "content types" +msgstr "콘텐츠 타입(들)" + +#: contrib/flatpages/admin.py:9 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "앞, 뒤에 슬래시(/)를 넣으세요. 예:'/about/contact/' " + +#: contrib/flatpages/admin.py:11 +msgid "" +"This value must contain only letters, numbers, underscores, dashes or " +"slashes." +msgstr "문자, 숫자, '_', '-', '/'만 가능합니다." + +#: contrib/flatpages/admin.py:22 +msgid "Advanced options" +msgstr "고급 옵션" + +#: contrib/flatpages/models.py:8 +msgid "title" +msgstr "제목" + +#: contrib/flatpages/models.py:9 +msgid "content" +msgstr "내용" + +#: contrib/flatpages/models.py:10 +msgid "enable comments" +msgstr "사용 가능한 코멘트" + +#: contrib/flatpages/models.py:11 +msgid "template name" +msgstr "템플릿명" + +#: contrib/flatpages/models.py:12 +msgid "" +"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " +"will use 'flatpages/default.html'." +msgstr "" +"예: 'flatpages/contact_page.html' 를 사용할 수 없는 경우 시스템이 'flatpages/" +"default.html' (을)를 사용합니다." + +#: contrib/flatpages/models.py:13 +msgid "registration required" +msgstr "등록하세요." + +#: contrib/flatpages/models.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "체크할 경우, 로그인 사용자만 해당 페이지를 볼 수 있습니다." + +#: contrib/flatpages/models.py:18 +msgid "flat page" +msgstr "플랫 페이지" + +#: contrib/flatpages/models.py:19 +msgid "flat pages" +msgstr "플랫 페이지(들)" + +#: contrib/formtools/wizard.py:130 +msgid "" +"We apologize, but your form has expired. Please continue filling out the " +"form from this page." +msgstr "" + +#: contrib/gis/forms/fields.py:17 +msgid "No geometry value provided." +msgstr "Geometry 값이 없습니다." + +#: contrib/gis/forms/fields.py:18 +msgid "Invalid geometry value." +msgstr "Geometry 값이 부적절합니다." + +#: contrib/gis/forms/fields.py:19 +msgid "Invalid geometry type." +msgstr "Geometry 형식이 부적절합니다." + +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "Geometry를 geometry 필드의 SRID로 변환하는 도중 오류가 발생하였습니다." + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "th" +msgstr "번째" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "st" +msgstr "번째" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "nd" +msgstr "번째" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "rd" +msgstr "번째" + +#: contrib/humanize/templatetags/humanize.py:51 +#, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "(value).1f" +msgstr[1] "(value).1f" + +#: contrib/humanize/templatetags/humanize.py:54 +#, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "%(value).1f" +msgstr[1] "%(value).1f" + +#: contrib/humanize/templatetags/humanize.py:57 +#, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "%(value).1f" +msgstr[1] "%(value).1f" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "one" +msgstr "1" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "two" +msgstr "2" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "three" +msgstr "3" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "four" +msgstr "4" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "five" +msgstr "5" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "six" +msgstr "6" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "seven" +msgstr "7" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "eight" +msgstr "8" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "nine" +msgstr "9" + +#: contrib/humanize/templatetags/humanize.py:93 +msgid "today" +msgstr "오늘" + +#: contrib/humanize/templatetags/humanize.py:95 +msgid "tomorrow" +msgstr "내일" + +#: contrib/humanize/templatetags/humanize.py:97 +msgid "yesterday" +msgstr "어제" + +#: contrib/localflavor/ar/forms.py:27 +msgid "Enter a postal code in the format NNNN or ANNNNAAA." +msgstr "우편번호를 입력하세요.(NNNN 또는 ANNNNAAA)" + +#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96 +#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 +#: contrib/localflavor/pe/forms.py:51 +msgid "This field requires only numbers." +msgstr "숫자만 입력해야 합니다." + +#: contrib/localflavor/ar/forms.py:50 +msgid "This field requires 7 or 8 digits." +msgstr "7개 또는 8개의 숫자만 허용됩니다." + +#: contrib/localflavor/ar/forms.py:79 +msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." +msgstr "CUIT를 입력하세요.(XX-XXXXXXXX-X 또는 XXXXXXXXXXXX 형식)" + +#: contrib/localflavor/ar/forms.py:80 +msgid "Invalid CUIT." +msgstr "부적절한 CUIT" + +#: contrib/localflavor/at/at_states.py:5 +msgid "Burgenland" +msgstr "부르겐란트 주" + +#: contrib/localflavor/at/at_states.py:6 +msgid "Carinthia" +msgstr "케른텐 주" + +#: contrib/localflavor/at/at_states.py:7 +msgid "Lower Austria" +msgstr "니더외스터라이히 주" + +#: contrib/localflavor/at/at_states.py:8 +msgid "Upper Austria" +msgstr "오버외스터라이히 주" + +#: contrib/localflavor/at/at_states.py:9 +msgid "Salzburg" +msgstr "잘츠부르크" + +#: contrib/localflavor/at/at_states.py:10 +msgid "Styria" +msgstr "슈타이어 주" + +#: contrib/localflavor/at/at_states.py:11 +msgid "Tyrol" +msgstr "티롤 주" + +#: contrib/localflavor/at/at_states.py:12 +msgid "Vorarlberg" +msgstr "폴라를베르크 주" + +#: contrib/localflavor/at/at_states.py:13 +msgid "Vienna" +msgstr "빈" + +#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16 +#: contrib/localflavor/no/forms.py:12 +msgid "Enter a zip code in the format XXXX." +msgstr "우편번호를 입력하세요. (XXXX 형식)" + +#: contrib/localflavor/at/forms.py:48 +msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format." +msgstr "올바른 오스트리아 사회보장번호(XXXX XXXXX 형식)를 입력하세요." + +#: contrib/localflavor/au/forms.py:16 +msgid "Enter a 4 digit post code." +msgstr "4자리 숫자 우편번호를 입력하세요." + +#: contrib/localflavor/br/forms.py:21 +msgid "Enter a zip code in the format XXXXX-XXX." +msgstr "우편번호는 XXXXX-XXX 형식으로 입력하세요." + +#: contrib/localflavor/br/forms.py:30 +msgid "Phone numbers must be in XX-XXXX-XXXX format." +msgstr "전화번호는 XX-XXXX-XXXX 형식으로 입력하세요." + +#: contrib/localflavor/br/forms.py:58 +msgid "" +"Select a valid brazilian state. That state is not one of the available " +"states." +msgstr "올바르게 선택해 주세요. 선택하신 것이 선택가능항목에 없습니다." + +#: contrib/localflavor/br/forms.py:94 +msgid "Invalid CPF number." +msgstr "CPF 값이 올바르지 않습니다." + +#: contrib/localflavor/br/forms.py:95 +msgid "This field requires at most 11 digits or 14 characters." +msgstr "최대 11자 또는 14자 이하로 입력해 주세요." + +#: contrib/localflavor/br/forms.py:134 +msgid "Invalid CNPJ number." +msgstr "올바른 CNPJ 번호를 입력하세요." + +#: contrib/localflavor/br/forms.py:136 +msgid "This field requires at least 14 digits" +msgstr "이 항목은 최소한 14개의 숫자를 입력해야 합니다." + +#: contrib/localflavor/ca/forms.py:17 +msgid "Enter a postal code in the format XXX XXX." +msgstr "우편번호를 입력하세요.(XXX XXX 형식)" + +#: contrib/localflavor/ca/forms.py:88 +msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." +msgstr "올바른 캐나다 사회보장번호(XXX-XXX-XXX 형식)를 입력하세요." + +#: contrib/localflavor/ch/ch_states.py:5 +msgid "Aargau" +msgstr "아르가우 주" + +#: contrib/localflavor/ch/ch_states.py:6 +msgid "Appenzell Innerrhoden" +msgstr "아펜첼이너로덴 주" + +#: contrib/localflavor/ch/ch_states.py:7 +msgid "Appenzell Ausserrhoden" +msgstr "아펜첼아우서로덴 주" + +#: contrib/localflavor/ch/ch_states.py:8 +msgid "Basel-Stadt" +msgstr "바젤슈타트 주" + +#: contrib/localflavor/ch/ch_states.py:9 +msgid "Basel-Land" +msgstr "바젤란트 주" + +#: contrib/localflavor/ch/ch_states.py:10 +msgid "Berne" +msgstr "베른" + +#: contrib/localflavor/ch/ch_states.py:11 +msgid "Fribourg" +msgstr "프리부르 주" + +#: contrib/localflavor/ch/ch_states.py:12 +msgid "Geneva" +msgstr "제네바" + +#: contrib/localflavor/ch/ch_states.py:13 +msgid "Glarus" +msgstr "글라루스 주" + +#: contrib/localflavor/ch/ch_states.py:14 +msgid "Graubuenden" +msgstr "그라우뷘덴 주" + +#: contrib/localflavor/ch/ch_states.py:15 +msgid "Jura" +msgstr "쥐라 주" + +#: contrib/localflavor/ch/ch_states.py:16 +msgid "Lucerne" +msgstr "루체른" + +#: contrib/localflavor/ch/ch_states.py:17 +msgid "Neuchatel" +msgstr "뇌샤텔 주" + +#: contrib/localflavor/ch/ch_states.py:18 +msgid "Nidwalden" +msgstr "니트발덴 주" + +#: contrib/localflavor/ch/ch_states.py:19 +msgid "Obwalden" +msgstr "옵발덴 주" + +#: contrib/localflavor/ch/ch_states.py:20 +msgid "Schaffhausen" +msgstr "샤프하우젠 주" + +#: contrib/localflavor/ch/ch_states.py:21 +msgid "Schwyz" +msgstr "슈비츠 주" + +#: contrib/localflavor/ch/ch_states.py:22 +msgid "Solothurn" +msgstr "졸로투른 주" + +#: contrib/localflavor/ch/ch_states.py:23 +msgid "St. Gallen" +msgstr "장크트갈렌 주" + +#: contrib/localflavor/ch/ch_states.py:24 +msgid "Thurgau" +msgstr "투르가우 주" + +#: contrib/localflavor/ch/ch_states.py:25 +msgid "Ticino" +msgstr "티치노 주" + +#: contrib/localflavor/ch/ch_states.py:26 +msgid "Uri" +msgstr "우리 주" + +#: contrib/localflavor/ch/ch_states.py:27 +msgid "Valais" +msgstr "발레 주" + +#: contrib/localflavor/ch/ch_states.py:28 +msgid "Vaud" +msgstr "보 주" + +#: contrib/localflavor/ch/ch_states.py:29 +msgid "Zug" +msgstr "추크 주" + +#: contrib/localflavor/ch/ch_states.py:30 +msgid "Zurich" +msgstr "취리히" + +#: contrib/localflavor/ch/forms.py:64 +msgid "" +"Enter a valid Swiss identity or passport card number in X1234567<0 or " +"1234567890 format." +msgstr "" +"올바른 스위스 주민번호 또는 여권 번호를 입력하세요. (X1234567<0 또는 " +"1234567890 형식)" + +#: contrib/localflavor/cl/forms.py:29 +msgid "Enter a valid Chilean RUT." +msgstr "올바른 칠레 RUT를 입력하세요." + +#: contrib/localflavor/cl/forms.py:30 +msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X." +msgstr "올바른 칠레 RUT 번호 XX.XXX.XXX-X 형식으로 입력하세요." + +#: contrib/localflavor/cl/forms.py:31 +msgid "The Chilean RUT is not valid." +msgstr "칠레 RUT 값이 올바르지 않습니다." + +#: contrib/localflavor/cz/cz_regions.py:8 +msgid "Prague" +msgstr "프라하" + +#: contrib/localflavor/cz/cz_regions.py:9 +msgid "Central Bohemian Region" +msgstr "이호체스코 주" + +#: contrib/localflavor/cz/cz_regions.py:10 +msgid "South Bohemian Region" +msgstr "스트르셰도체스코 주" + +#: contrib/localflavor/cz/cz_regions.py:11 +msgid "Pilsen Region" +msgstr "플젠 주" + +#: contrib/localflavor/cz/cz_regions.py:12 +msgid "Carlsbad Region" +msgstr "카를로비바리 주" + +#: contrib/localflavor/cz/cz_regions.py:13 +msgid "Usti Region" +msgstr "우스티나트라벰 주" + +#: contrib/localflavor/cz/cz_regions.py:14 +msgid "Liberec Region" +msgstr "리베레츠 주" + +#: contrib/localflavor/cz/cz_regions.py:15 +msgid "Hradec Region" +msgstr "호라데츠 크랄로베 주" + +#: contrib/localflavor/cz/cz_regions.py:16 +msgid "Pardubice Region" +msgstr "파르두비체 주" + +#: contrib/localflavor/cz/cz_regions.py:17 +msgid "Vysocina Region" +msgstr "비소치나 주" + +#: contrib/localflavor/cz/cz_regions.py:18 +msgid "South Moravian Region" +msgstr "이호모라프스코 주" + +#: contrib/localflavor/cz/cz_regions.py:19 +msgid "Olomouc Region" +msgstr "올로모우츠 주" + +#: contrib/localflavor/cz/cz_regions.py:20 +msgid "Zlin Region" +msgstr "즐린 주" + +#: contrib/localflavor/cz/cz_regions.py:21 +msgid "Moravian-Silesian Region" +msgstr "모라바슬레스코주" + +#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "우편번호를 입력하세요. (XXXXX 또는 XXX XX 형식)" + +#: contrib/localflavor/cz/forms.py:47 +msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." +msgstr "생년월일을 입력하세요. (XXXXXX/XXXX 또는 XXXXXXXXXX 형식)" + +#: contrib/localflavor/cz/forms.py:48 +msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" +msgstr "성별은 'f' 또는 'm'으로 입력해야 합니다." + +#: contrib/localflavor/cz/forms.py:49 +msgid "Enter a valid birth number." +msgstr "올바른 생년월일을 입력하세요." + +#: contrib/localflavor/cz/forms.py:106 +msgid "Enter a valid IC number." +msgstr "올바른 IC 번호를 입력하세요." + +#: contrib/localflavor/de/de_states.py:5 +msgid "Baden-Wuerttemberg" +msgstr "바덴-뷔르템베르크 주" + +#: contrib/localflavor/de/de_states.py:6 +msgid "Bavaria" +msgstr "바이에른 자유주" + +#: contrib/localflavor/de/de_states.py:7 +msgid "Berlin" +msgstr "베를린" + +#: contrib/localflavor/de/de_states.py:8 +msgid "Brandenburg" +msgstr "브란덴부르크 주" + +#: contrib/localflavor/de/de_states.py:9 +msgid "Bremen" +msgstr "브레멘 자유 한자 도시" + +#: contrib/localflavor/de/de_states.py:10 +msgid "Hamburg" +msgstr "함부르크 자유 한자 도시" + +#: contrib/localflavor/de/de_states.py:11 +msgid "Hessen" +msgstr "헤센 주" + +#: contrib/localflavor/de/de_states.py:12 +msgid "Mecklenburg-Western Pomerania" +msgstr "메클렌부르크-포어포메른 주" + +#: contrib/localflavor/de/de_states.py:13 +msgid "Lower Saxony" +msgstr "니더작센 주" + +#: contrib/localflavor/de/de_states.py:14 +msgid "North Rhine-Westphalia" +msgstr "노르트라인-베스트팔렌 주" + +#: contrib/localflavor/de/de_states.py:15 +msgid "Rhineland-Palatinate" +msgstr "라인란트-팔츠 주" + +#: contrib/localflavor/de/de_states.py:16 +msgid "Saarland" +msgstr "자를란트 주" + +#: contrib/localflavor/de/de_states.py:17 +msgid "Saxony" +msgstr "작센 자유주" + +#: contrib/localflavor/de/de_states.py:18 +msgid "Saxony-Anhalt" +msgstr "작센-안할트 주" + +#: contrib/localflavor/de/de_states.py:19 +msgid "Schleswig-Holstein" +msgstr "슐레스비히-홀슈타인 주" + +#: contrib/localflavor/de/de_states.py:20 +msgid "Thuringia" +msgstr "튀링겐 자유주" + +#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 +#: contrib/localflavor/fr/forms.py:15 +msgid "Enter a zip code in the format XXXXX." +msgstr "우편번호를 입력하세요. (XXXXX 형식)" + +#: contrib/localflavor/de/forms.py:41 +msgid "" +"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " +"format." +msgstr "올바른 독일 주민번호(XXXXXXXXXXX-XXXXXXX-XXXXXXX-X 형식)를 입력하세요." + +#: contrib/localflavor/es/es_provinces.py:5 +msgid "Arava" +msgstr "알라바 주" + +#: contrib/localflavor/es/es_provinces.py:6 +msgid "Albacete" +msgstr "알바세테 주" + +#: contrib/localflavor/es/es_provinces.py:7 +msgid "Alacant" +msgstr "알리칸테 주" + +#: contrib/localflavor/es/es_provinces.py:8 +msgid "Almeria" +msgstr "알메리아 주" + +#: contrib/localflavor/es/es_provinces.py:9 +msgid "Avila" +msgstr "아빌라 주" + +#: contrib/localflavor/es/es_provinces.py:10 +msgid "Badajoz" +msgstr "바다호스 주" + +#: contrib/localflavor/es/es_provinces.py:11 +msgid "Illes Balears" +msgstr "발레아레스 제도" + +#: contrib/localflavor/es/es_provinces.py:12 +msgid "Barcelona" +msgstr "바르셀로나 주" + +#: contrib/localflavor/es/es_provinces.py:13 +msgid "Burgos" +msgstr "부르고스 주" + +#: contrib/localflavor/es/es_provinces.py:14 +msgid "Caceres" +msgstr "카세레스 주" + +#: contrib/localflavor/es/es_provinces.py:15 +msgid "Cadiz" +msgstr "카디스 주" + +#: contrib/localflavor/es/es_provinces.py:16 +msgid "Castello" +msgstr "카스테욘 주" + +#: contrib/localflavor/es/es_provinces.py:17 +msgid "Ciudad Real" +msgstr "시우다드레알 주" + +#: contrib/localflavor/es/es_provinces.py:18 +msgid "Cordoba" +msgstr "코르도바 주" + +#: contrib/localflavor/es/es_provinces.py:19 +msgid "A Coruna" +msgstr "라코루냐 주" + +#: contrib/localflavor/es/es_provinces.py:20 +msgid "Cuenca" +msgstr "쿠엥카 주" + +#: contrib/localflavor/es/es_provinces.py:21 +msgid "Girona" +msgstr "헤로나 주" + +#: contrib/localflavor/es/es_provinces.py:22 +msgid "Granada" +msgstr "그라나다 주" + +#: contrib/localflavor/es/es_provinces.py:23 +msgid "Guadalajara" +msgstr "과달라하라 주" + +#: contrib/localflavor/es/es_provinces.py:24 +msgid "Guipuzkoa" +msgstr "기푸스코아 주" + +#: contrib/localflavor/es/es_provinces.py:25 +msgid "Huelva" +msgstr "우엘바 주" + +#: contrib/localflavor/es/es_provinces.py:26 +msgid "Huesca" +msgstr "우에스카 주" + +#: contrib/localflavor/es/es_provinces.py:27 +msgid "Jaen" +msgstr "하엔 주" + +#: contrib/localflavor/es/es_provinces.py:28 +msgid "Leon" +msgstr "레온 주" + +#: contrib/localflavor/es/es_provinces.py:29 +msgid "Lleida" +msgstr "레리다 주" + +#: contrib/localflavor/es/es_provinces.py:30 +#: contrib/localflavor/es/es_regions.py:17 +msgid "La Rioja" +msgstr "라리오하 주" + +#: contrib/localflavor/es/es_provinces.py:31 +msgid "Lugo" +msgstr "루고 주" + +#: contrib/localflavor/es/es_provinces.py:32 +#: contrib/localflavor/es/es_regions.py:18 +msgid "Madrid" +msgstr "마드리드 주" + +#: contrib/localflavor/es/es_provinces.py:33 +msgid "Malaga" +msgstr "말라가 주" + +#: contrib/localflavor/es/es_provinces.py:34 +msgid "Murcia" +msgstr "무르시아 주" + +#: contrib/localflavor/es/es_provinces.py:35 +msgid "Navarre" +msgstr "나바라 주" + +#: contrib/localflavor/es/es_provinces.py:36 +msgid "Ourense" +msgstr "오렌세 주" + +#: contrib/localflavor/es/es_provinces.py:37 +msgid "Asturias" +msgstr "아스투리아스 주" + +#: contrib/localflavor/es/es_provinces.py:38 +msgid "Palencia" +msgstr "팔렌시아 주" + +#: contrib/localflavor/es/es_provinces.py:39 +msgid "Las Palmas" +msgstr "라스팔마스 주" + +#: contrib/localflavor/es/es_provinces.py:40 +msgid "Pontevedra" +msgstr "폰테베드라 주" + +#: contrib/localflavor/es/es_provinces.py:41 +msgid "Salamanca" +msgstr "살라망카 주" + +#: contrib/localflavor/es/es_provinces.py:42 +msgid "Santa Cruz de Tenerife" +msgstr "산타크루스데테네리페 주" + +#: contrib/localflavor/es/es_provinces.py:43 +#: contrib/localflavor/es/es_regions.py:11 +msgid "Cantabria" +msgstr "칸타브리아 주" + +#: contrib/localflavor/es/es_provinces.py:44 +msgid "Segovia" +msgstr "세고비아 주" + +#: contrib/localflavor/es/es_provinces.py:45 +msgid "Seville" +msgstr "세비야 주" + +#: contrib/localflavor/es/es_provinces.py:46 +msgid "Soria" +msgstr "소리아 주" + +#: contrib/localflavor/es/es_provinces.py:47 +msgid "Tarragona" +msgstr "타라고나 주" + +#: contrib/localflavor/es/es_provinces.py:48 +msgid "Teruel" +msgstr "테루엘 주" + +#: contrib/localflavor/es/es_provinces.py:49 +msgid "Toledo" +msgstr "톨레도 주" + +#: contrib/localflavor/es/es_provinces.py:50 +msgid "Valencia" +msgstr "발렌시아 주" + +#: contrib/localflavor/es/es_provinces.py:51 +msgid "Valladolid" +msgstr "바야돌리드 주" + +#: contrib/localflavor/es/es_provinces.py:52 +msgid "Bizkaia" +msgstr "비스카야 주" + +#: contrib/localflavor/es/es_provinces.py:53 +msgid "Zamora" +msgstr "사모라 주" + +#: contrib/localflavor/es/es_provinces.py:54 +msgid "Zaragoza" +msgstr "사라고사 주" + +#: contrib/localflavor/es/es_provinces.py:55 +msgid "Ceuta" +msgstr "세우타 자치주" + +#: contrib/localflavor/es/es_provinces.py:56 +msgid "Melilla" +msgstr "멜리야 주" + +#: contrib/localflavor/es/es_regions.py:5 +msgid "Andalusia" +msgstr "안달루시아 주" + +#: contrib/localflavor/es/es_regions.py:6 +msgid "Aragon" +msgstr "아라곤 주" + +#: contrib/localflavor/es/es_regions.py:7 +msgid "Principality of Asturias" +msgstr "아스투리아스 지방" + +#: contrib/localflavor/es/es_regions.py:8 +msgid "Balearic Islands" +msgstr "발레아레스 제도" + +#: contrib/localflavor/es/es_regions.py:9 +msgid "Basque Country" +msgstr "바스크 지방" + +#: contrib/localflavor/es/es_regions.py:10 +msgid "Canary Islands" +msgstr "카나리 제도" + +#: contrib/localflavor/es/es_regions.py:12 +msgid "Castile-La Mancha" +msgstr "카스티야라만차 지방" + +#: contrib/localflavor/es/es_regions.py:13 +msgid "Castile and Leon" +msgstr "카스티야레온 지방" + +#: contrib/localflavor/es/es_regions.py:14 +msgid "Catalonia" +msgstr "카탈로니아 지방" + +#: contrib/localflavor/es/es_regions.py:15 +msgid "Extremadura" +msgstr "에스트레마두라 지방" + +#: contrib/localflavor/es/es_regions.py:16 +msgid "Galicia" +msgstr "갈리시아 지방" + +#: contrib/localflavor/es/es_regions.py:19 +msgid "Region of Murcia" +msgstr "무르시아 지방" + +#: contrib/localflavor/es/es_regions.py:20 +msgid "Foral Community of Navarre" +msgstr "나바라 지방" + +#: contrib/localflavor/es/es_regions.py:21 +msgid "Valencian Community" +msgstr "발렌시아 지방" + +#: contrib/localflavor/es/forms.py:19 +msgid "Enter a valid postal code in the range and format 01XXX - 52XXX." +msgstr "우편번호를 입력하세요. (01XXX - 52XXX 형식)" + +#: contrib/localflavor/es/forms.py:39 +msgid "" +"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or " +"9XXXXXXXX." +msgstr "" +"올바른 전화번호를 입력하세요. (6XXXXXXXX, 8XXXXXXXX 또는 9XXXXXXXX 형식)" + +#: contrib/localflavor/es/forms.py:66 +msgid "Please enter a valid NIF, NIE, or CIF." +msgstr "올바른 NIF, NIE 또는 CIF를 입력하세요." + +#: contrib/localflavor/es/forms.py:67 +msgid "Please enter a valid NIF or NIE." +msgstr "올바른 NIF 또는 NIE를 입력하세요." + +#: contrib/localflavor/es/forms.py:68 +msgid "Invalid checksum for NIF." +msgstr "NIF의 체크섬이 틀립니다." + +#: contrib/localflavor/es/forms.py:69 +msgid "Invalid checksum for NIE." +msgstr "NIE의 체크섬이 틀립니다." + +#: contrib/localflavor/es/forms.py:70 +msgid "Invalid checksum for CIF." +msgstr "CIF의 체크섬이 틀립니다." + +#: contrib/localflavor/es/forms.py:142 +msgid "" +"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." +msgstr "올바른 계좌번호를 입력하세요. (XXXX-XXXX-XX-XXXXXXXXXX 형식)" + +#: contrib/localflavor/es/forms.py:143 +msgid "Invalid checksum for bank account number." +msgstr "계좌번호의 체크섬이 틀립니다." + +#: contrib/localflavor/fi/forms.py:28 +msgid "Enter a valid Finnish social security number." +msgstr "올바른 핀란드 사회보장 번호를 입력하세요." + +#: contrib/localflavor/in_/forms.py:14 +msgid "Enter a zip code in the format XXXXXXX." +msgstr "우편번호는 XXXXXXX 형식으로 입력하세요." + +#: contrib/localflavor/is_/forms.py:17 +msgid "" +"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." +msgstr "올바른 아이슬란드 주민번호를 입력하세요. (XXXXXX-XXXX 형식)" + +#: contrib/localflavor/is_/forms.py:18 +msgid "The Icelandic identification number is not valid." +msgstr "아이슬란드 주민번호가 올바르지 않습니다." + +#: contrib/localflavor/it/forms.py:14 +msgid "Enter a valid zip code." +msgstr "올바른 우편번호를 입력하세요." + +#: contrib/localflavor/it/forms.py:43 +msgid "Enter a valid Social Security number." +msgstr "올바른 사회보장번호를 입력하세요." + +#: contrib/localflavor/it/forms.py:68 +msgid "Enter a valid VAT number." +msgstr "올바른 VAT 번호를 입력하세요." + +#: contrib/localflavor/jp/forms.py:16 +msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX." +msgstr "우편번호를 입력하세요. (XXXXXXX or XXX-XXXX 형식)" + +#: contrib/localflavor/jp/jp_prefectures.py:4 +msgid "Hokkaido" +msgstr "홋카이도" + +#: contrib/localflavor/jp/jp_prefectures.py:5 +msgid "Aomori" +msgstr "아오모리 현" + +#: contrib/localflavor/jp/jp_prefectures.py:6 +msgid "Iwate" +msgstr "이와테 현" + +#: contrib/localflavor/jp/jp_prefectures.py:7 +msgid "Miyagi" +msgstr "미야기 현" + +#: contrib/localflavor/jp/jp_prefectures.py:8 +msgid "Akita" +msgstr "아키타 현" + +#: contrib/localflavor/jp/jp_prefectures.py:9 +msgid "Yamagata" +msgstr "야마가타 현" + +#: contrib/localflavor/jp/jp_prefectures.py:10 +msgid "Fukushima" +msgstr "후쿠시마 현" + +#: contrib/localflavor/jp/jp_prefectures.py:11 +msgid "Ibaraki" +msgstr "이바라키 현" + +#: contrib/localflavor/jp/jp_prefectures.py:12 +msgid "Tochigi" +msgstr "도치기 현" + +#: contrib/localflavor/jp/jp_prefectures.py:13 +msgid "Gunma" +msgstr "군마 현" + +#: contrib/localflavor/jp/jp_prefectures.py:14 +msgid "Saitama" +msgstr "사이타마 현" + +#: contrib/localflavor/jp/jp_prefectures.py:15 +msgid "Chiba" +msgstr "지바 현" + +#: contrib/localflavor/jp/jp_prefectures.py:16 +msgid "Tokyo" +msgstr "도쿄 도" + +#: contrib/localflavor/jp/jp_prefectures.py:17 +msgid "Kanagawa" +msgstr "카나가와 현" + +#: contrib/localflavor/jp/jp_prefectures.py:18 +msgid "Yamanashi" +msgstr "야마나시 현" + +#: contrib/localflavor/jp/jp_prefectures.py:19 +msgid "Nagano" +msgstr "나가노 현" + +#: contrib/localflavor/jp/jp_prefectures.py:20 +msgid "Niigata" +msgstr "니가타 현" + +#: contrib/localflavor/jp/jp_prefectures.py:21 +msgid "Toyama" +msgstr "도야마 현" + +#: contrib/localflavor/jp/jp_prefectures.py:22 +msgid "Ishikawa" +msgstr "이시카와 현" + +#: contrib/localflavor/jp/jp_prefectures.py:23 +msgid "Fukui" +msgstr "후쿠이 현" + +#: contrib/localflavor/jp/jp_prefectures.py:24 +msgid "Gifu" +msgstr "기후 현" + +#: contrib/localflavor/jp/jp_prefectures.py:25 +msgid "Shizuoka" +msgstr "시즈오카 현" + +#: contrib/localflavor/jp/jp_prefectures.py:26 +msgid "Aichi" +msgstr "아이치 현" + +#: contrib/localflavor/jp/jp_prefectures.py:27 +msgid "Mie" +msgstr "미에 현" + +#: contrib/localflavor/jp/jp_prefectures.py:28 +msgid "Shiga" +msgstr "시가 현" + +#: contrib/localflavor/jp/jp_prefectures.py:29 +msgid "Kyoto" +msgstr "교토 부" + +#: contrib/localflavor/jp/jp_prefectures.py:30 +msgid "Osaka" +msgstr "오사카 부" + +#: contrib/localflavor/jp/jp_prefectures.py:31 +msgid "Hyogo" +msgstr "효고 현" + +#: contrib/localflavor/jp/jp_prefectures.py:32 +msgid "Nara" +msgstr "나라 현" + +#: contrib/localflavor/jp/jp_prefectures.py:33 +msgid "Wakayama" +msgstr "와카야마 현" + +#: contrib/localflavor/jp/jp_prefectures.py:34 +msgid "Tottori" +msgstr "돗토리 현" + +#: contrib/localflavor/jp/jp_prefectures.py:35 +msgid "Shimane" +msgstr "시마네 현" + +#: contrib/localflavor/jp/jp_prefectures.py:36 +msgid "Okayama" +msgstr "아카야마 현" + +#: contrib/localflavor/jp/jp_prefectures.py:37 +msgid "Hiroshima" +msgstr "히로시마 현" + +#: contrib/localflavor/jp/jp_prefectures.py:38 +msgid "Yamaguchi" +msgstr "야마구치 현" + +#: contrib/localflavor/jp/jp_prefectures.py:39 +msgid "Tokushima" +msgstr "도구시마 현" + +#: contrib/localflavor/jp/jp_prefectures.py:40 +msgid "Kagawa" +msgstr "카가와 현" + +#: contrib/localflavor/jp/jp_prefectures.py:41 +msgid "Ehime" +msgstr "에히메 현" + +#: contrib/localflavor/jp/jp_prefectures.py:42 +msgid "Kochi" +msgstr "고치 현" + +#: contrib/localflavor/jp/jp_prefectures.py:43 +msgid "Fukuoka" +msgstr "후쿠오카 현" + +#: contrib/localflavor/jp/jp_prefectures.py:44 +msgid "Saga" +msgstr "사가 현" + +#: contrib/localflavor/jp/jp_prefectures.py:45 +msgid "Nagasaki" +msgstr "나가사키 현" + +#: contrib/localflavor/jp/jp_prefectures.py:46 +msgid "Kumamoto" +msgstr "구마모토 현" + +#: contrib/localflavor/jp/jp_prefectures.py:47 +msgid "Oita" +msgstr "오이타 현" + +#: contrib/localflavor/jp/jp_prefectures.py:48 +msgid "Miyazaki" +msgstr "미야자키 현" + +#: contrib/localflavor/jp/jp_prefectures.py:49 +msgid "Kagoshima" +msgstr "가고시마 현" + +#: contrib/localflavor/jp/jp_prefectures.py:50 +msgid "Okinawa" +msgstr "오키나와 현" + +#: contrib/localflavor/mx/mx_states.py:12 +msgid "Aguascalientes" +msgstr "아과스칼리엔테스 주" + +#: contrib/localflavor/mx/mx_states.py:13 +msgid "Baja California" +msgstr "바하칼리포르니아 주" + +#: contrib/localflavor/mx/mx_states.py:14 +msgid "Baja California Sur" +msgstr "바하칼리포르니아수르 주" + +#: contrib/localflavor/mx/mx_states.py:15 +msgid "Campeche" +msgstr "캄페체 주" + +#: contrib/localflavor/mx/mx_states.py:16 +msgid "Chihuahua" +msgstr "치와와 주" + +#: contrib/localflavor/mx/mx_states.py:17 +msgid "Chiapas" +msgstr "치아파스 주" + +#: contrib/localflavor/mx/mx_states.py:18 +msgid "Coahuila" +msgstr "코아우일라 주" + +#: contrib/localflavor/mx/mx_states.py:19 +msgid "Colima" +msgstr "콜리마 주" + +#: contrib/localflavor/mx/mx_states.py:20 +msgid "Distrito Federal" +msgstr "연방구 (멕시코시)" + +#: contrib/localflavor/mx/mx_states.py:21 +msgid "Durango" +msgstr "두랑고 주" + +#: contrib/localflavor/mx/mx_states.py:22 +msgid "Guerrero" +msgstr "게레로 주" + +#: contrib/localflavor/mx/mx_states.py:23 +msgid "Guanajuato" +msgstr "과나후아토 주" + +#: contrib/localflavor/mx/mx_states.py:24 +msgid "Hidalgo" +msgstr "이달고 주" + +#: contrib/localflavor/mx/mx_states.py:25 +msgid "Jalisco" +msgstr "할리스코 주" + +#: contrib/localflavor/mx/mx_states.py:26 +msgid "Estado de México" +msgstr "멕시코 주" + +#: contrib/localflavor/mx/mx_states.py:27 +msgid "Michoacán" +msgstr "미초아칸 주" + +#: contrib/localflavor/mx/mx_states.py:28 +msgid "Morelos" +msgstr "모렐로스 주" + +#: contrib/localflavor/mx/mx_states.py:29 +msgid "Nayarit" +msgstr "나야리트 주" + +#: contrib/localflavor/mx/mx_states.py:30 +msgid "Nuevo León" +msgstr "누에보레온 주" + +#: contrib/localflavor/mx/mx_states.py:31 +msgid "Oaxaca" +msgstr "오아하카 주" + +#: contrib/localflavor/mx/mx_states.py:32 +msgid "Puebla" +msgstr "푸에블라 주" + +#: contrib/localflavor/mx/mx_states.py:33 +msgid "Querétaro" +msgstr "케레타로 주" + +#: contrib/localflavor/mx/mx_states.py:34 +msgid "Quintana Roo" +msgstr "킨타나로오 주" + +#: contrib/localflavor/mx/mx_states.py:35 +msgid "Sinaloa" +msgstr "시날로아 주" + +#: contrib/localflavor/mx/mx_states.py:36 +msgid "San Luis Potosí" +msgstr "산루이스포토시 주" + +#: contrib/localflavor/mx/mx_states.py:37 +msgid "Sonora" +msgstr "소노라 주" + +#: contrib/localflavor/mx/mx_states.py:38 +msgid "Tabasco" +msgstr "타바스코 주" + +#: contrib/localflavor/mx/mx_states.py:39 +msgid "Tamaulipas" +msgstr "타마울리파스 주" + +#: contrib/localflavor/mx/mx_states.py:40 +msgid "Tlaxcala" +msgstr "틀락스칼라 주" + +#: contrib/localflavor/mx/mx_states.py:41 +msgid "Veracruz" +msgstr "베라크루스 주" + +#: contrib/localflavor/mx/mx_states.py:42 +msgid "Yucatán" +msgstr "유카탄 주" + +#: contrib/localflavor/mx/mx_states.py:43 +msgid "Zacatecas" +msgstr "사카테카스 주" + +#: contrib/localflavor/nl/forms.py:21 +msgid "Enter a valid postal code" +msgstr "올바른 우편번호를 입력하세요." + +#: contrib/localflavor/nl/forms.py:52 +msgid "Enter a valid phone number" +msgstr "올바른 전화번호를 입력하세요." + +#: contrib/localflavor/nl/forms.py:78 +msgid "Enter a valid SoFi number" +msgstr "올바른 SoFi 번호를 입력하세요." + +#: contrib/localflavor/nl/nl_provinces.py:4 +msgid "Drenthe" +msgstr "드렌터 주" + +#: contrib/localflavor/nl/nl_provinces.py:5 +msgid "Flevoland" +msgstr "플레볼란트 주" + +#: contrib/localflavor/nl/nl_provinces.py:6 +msgid "Friesland" +msgstr "프리슬란트 주" + +#: contrib/localflavor/nl/nl_provinces.py:7 +msgid "Gelderland" +msgstr "힐데를란트 주" + +#: contrib/localflavor/nl/nl_provinces.py:8 +msgid "Groningen" +msgstr "흐로닝언 주" + +#: contrib/localflavor/nl/nl_provinces.py:9 +msgid "Limburg" +msgstr "림뷔르흐 주" + +#: contrib/localflavor/nl/nl_provinces.py:10 +msgid "Noord-Brabant" +msgstr "노르트브라반트 주" + +#: contrib/localflavor/nl/nl_provinces.py:11 +msgid "Noord-Holland" +msgstr "노르트홀란트 주" + +#: contrib/localflavor/nl/nl_provinces.py:12 +msgid "Overijssel" +msgstr "오버레이셜 주" + +#: contrib/localflavor/nl/nl_provinces.py:13 +msgid "Utrecht" +msgstr "위트레흐트 주" + +#: contrib/localflavor/nl/nl_provinces.py:14 +msgid "Zeeland" +msgstr "제일란트 주" + +#: contrib/localflavor/nl/nl_provinces.py:15 +msgid "Zuid-Holland" +msgstr "자위트홀란트 주" + +#: contrib/localflavor/no/forms.py:33 +msgid "Enter a valid Norwegian social security number." +msgstr "올바른 노르웨이 사회보장번호를 입력해 주세요." + +#: contrib/localflavor/pe/forms.py:24 +msgid "This field requires 8 digits." +msgstr "이 항목은 8자리 숫자로 필요합니다." + +#: contrib/localflavor/pe/forms.py:52 +msgid "This field requires 11 digits." +msgstr "이 항목은 11자리 숫자가 필요합니다." + +#: contrib/localflavor/pl/forms.py:38 +msgid "National Identification Number consists of 11 digits." +msgstr "주민번호는 11자리 숫자로 구성됩니다." + +#: contrib/localflavor/pl/forms.py:39 +msgid "Wrong checksum for the National Identification Number." +msgstr "주민번호 체크섬이 올바르지 않습니다." + +#: contrib/localflavor/pl/forms.py:71 +msgid "" +"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." +msgstr "" +"올바른 Tax 번호(NIP)를 입력하세요. (XXX-XXX-XX-XX 또는 XX-XX-XXX-XXX 형식)" + +#: contrib/localflavor/pl/forms.py:72 +msgid "Wrong checksum for the Tax Number (NIP)." +msgstr "Tax 번호(NIP)의 체크섬이 올바르지 않습니다." + +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." +msgstr "사업자 등록번호(REGON)은 9자리 또는 14자리의 숫자로 구성됩니다." + +#: contrib/localflavor/pl/forms.py:110 +msgid "Wrong checksum for the National Business Register Number (REGON)." +msgstr "사업자 등록번호(REGON)의 체크섬이 올바르지 않습니다." + +#: contrib/localflavor/pl/forms.py:148 +msgid "Enter a postal code in the format XX-XXX." +msgstr "우편번호를 입력하세요. (XX-XXX 형식)" + +#: contrib/localflavor/pl/pl_voivodeships.py:8 +msgid "Lower Silesia" +msgstr "Lower Silesia" + +#: contrib/localflavor/pl/pl_voivodeships.py:9 +msgid "Kuyavia-Pomerania" +msgstr "Kuyavia-Pomerania" + +#: contrib/localflavor/pl/pl_voivodeships.py:10 +msgid "Lublin" +msgstr "Lublin" + +#: contrib/localflavor/pl/pl_voivodeships.py:11 +msgid "Lubusz" +msgstr "Lubusz" + +#: contrib/localflavor/pl/pl_voivodeships.py:12 +msgid "Lodz" +msgstr "Lodz" + +#: contrib/localflavor/pl/pl_voivodeships.py:13 +msgid "Lesser Poland" +msgstr "Lesser Poland" + +#: contrib/localflavor/pl/pl_voivodeships.py:14 +msgid "Masovia" +msgstr "Masovia" + +#: contrib/localflavor/pl/pl_voivodeships.py:15 +msgid "Opole" +msgstr "Opole" + +#: contrib/localflavor/pl/pl_voivodeships.py:16 +msgid "Subcarpatia" +msgstr "Subcarpatia" + +#: contrib/localflavor/pl/pl_voivodeships.py:17 +msgid "Podlasie" +msgstr "Podlasie" + +#: contrib/localflavor/pl/pl_voivodeships.py:18 +msgid "Pomerania" +msgstr "Pomerania" + +#: contrib/localflavor/pl/pl_voivodeships.py:19 +msgid "Silesia" +msgstr "Silesia" + +#: contrib/localflavor/pl/pl_voivodeships.py:20 +msgid "Swietokrzyskie" +msgstr "Swietokrzyskie" + +#: contrib/localflavor/pl/pl_voivodeships.py:21 +msgid "Warmia-Masuria" +msgstr "Warmia-Masuria" + +#: contrib/localflavor/pl/pl_voivodeships.py:22 +msgid "Greater Poland" +msgstr "Greater Poland" + +#: contrib/localflavor/pl/pl_voivodeships.py:23 +msgid "West Pomerania" +msgstr "West Pomerania" + +#: contrib/localflavor/ro/forms.py:19 +msgid "Enter a valid CIF." +msgstr "올바른 CIF를 입력하세요." + +#: contrib/localflavor/ro/forms.py:56 +msgid "Enter a valid CNP." +msgstr "올바른 CNP를 입력하세요." + +#: contrib/localflavor/ro/forms.py:141 +msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format" +msgstr "올바른 IBAN을 입력하세요. (ROXX-XXXX-XXXX-XXXX-XXXX-XXXX 형식)" + +#: contrib/localflavor/ro/forms.py:171 +msgid "Phone numbers must be in XXXX-XXXXXX format." +msgstr "전화번호는 XXXX-XXXXXX 형식이어야 합니다." + +#: contrib/localflavor/ro/forms.py:194 +msgid "Enter a valid postal code in the format XXXXXX" +msgstr "올바른 우편번호를 입력하세요. (XXXXXX 형식)" + +#: contrib/localflavor/sk/sk_districts.py:8 +msgid "Banska Bystrica" +msgstr "Banska Bystrica" + +#: contrib/localflavor/sk/sk_districts.py:9 +msgid "Banska Stiavnica" +msgstr "Banska Stiavnica" + +#: contrib/localflavor/sk/sk_districts.py:10 +msgid "Bardejov" +msgstr "Bardejov" + +#: contrib/localflavor/sk/sk_districts.py:11 +msgid "Banovce nad Bebravou" +msgstr "Banovce nad Bebravou" + +#: contrib/localflavor/sk/sk_districts.py:12 +msgid "Brezno" +msgstr "Brezno" + +#: contrib/localflavor/sk/sk_districts.py:13 +msgid "Bratislava I" +msgstr "Bratislava I" + +#: contrib/localflavor/sk/sk_districts.py:14 +msgid "Bratislava II" +msgstr "Bratislava II" + +#: contrib/localflavor/sk/sk_districts.py:15 +msgid "Bratislava III" +msgstr "Bratislava III" + +#: contrib/localflavor/sk/sk_districts.py:16 +msgid "Bratislava IV" +msgstr "Bratislava IV" + +#: contrib/localflavor/sk/sk_districts.py:17 +msgid "Bratislava V" +msgstr "Bratislava V" + +#: contrib/localflavor/sk/sk_districts.py:18 +msgid "Bytca" +msgstr "Bytca" + +#: contrib/localflavor/sk/sk_districts.py:19 +msgid "Cadca" +msgstr "Cadca" + +#: contrib/localflavor/sk/sk_districts.py:20 +msgid "Detva" +msgstr "Detva" + +#: contrib/localflavor/sk/sk_districts.py:21 +msgid "Dolny Kubin" +msgstr "Dolny Kubin" + +#: contrib/localflavor/sk/sk_districts.py:22 +msgid "Dunajska Streda" +msgstr "Dunajska Streda" + +#: contrib/localflavor/sk/sk_districts.py:23 +msgid "Galanta" +msgstr "Galanta" + +#: contrib/localflavor/sk/sk_districts.py:24 +msgid "Gelnica" +msgstr "Gelnica" + +#: contrib/localflavor/sk/sk_districts.py:25 +msgid "Hlohovec" +msgstr "Hlohovec" + +#: contrib/localflavor/sk/sk_districts.py:26 +msgid "Humenne" +msgstr "Humenne" + +#: contrib/localflavor/sk/sk_districts.py:27 +msgid "Ilava" +msgstr "Ilava" + +#: contrib/localflavor/sk/sk_districts.py:28 +msgid "Kezmarok" +msgstr "Kezmarok" + +#: contrib/localflavor/sk/sk_districts.py:29 +msgid "Komarno" +msgstr "Komarno" + +#: contrib/localflavor/sk/sk_districts.py:30 +msgid "Kosice I" +msgstr "Kosice I" + +#: contrib/localflavor/sk/sk_districts.py:31 +msgid "Kosice II" +msgstr "Kosice II" + +#: contrib/localflavor/sk/sk_districts.py:32 +msgid "Kosice III" +msgstr "Kosice III" + +#: contrib/localflavor/sk/sk_districts.py:33 +msgid "Kosice IV" +msgstr "Kosice IV" + +#: contrib/localflavor/sk/sk_districts.py:34 +msgid "Kosice - okolie" +msgstr "Kosice - okolie" + +#: contrib/localflavor/sk/sk_districts.py:35 +msgid "Krupina" +msgstr "Krupina" + +#: contrib/localflavor/sk/sk_districts.py:36 +msgid "Kysucke Nove Mesto" +msgstr "Kysucke Nove Mesto" + +#: contrib/localflavor/sk/sk_districts.py:37 +msgid "Levice" +msgstr "Levice" + +#: contrib/localflavor/sk/sk_districts.py:38 +msgid "Levoca" +msgstr "Levoca" + +#: contrib/localflavor/sk/sk_districts.py:39 +msgid "Liptovsky Mikulas" +msgstr "Liptovsky Mikulas" + +#: contrib/localflavor/sk/sk_districts.py:40 +msgid "Lucenec" +msgstr "Lucenec" + +#: contrib/localflavor/sk/sk_districts.py:41 +msgid "Malacky" +msgstr "Malacky" + +#: contrib/localflavor/sk/sk_districts.py:42 +msgid "Martin" +msgstr "Martin" + +#: contrib/localflavor/sk/sk_districts.py:43 +msgid "Medzilaborce" +msgstr "Medzilaborce" + +#: contrib/localflavor/sk/sk_districts.py:44 +msgid "Michalovce" +msgstr "Michalovce" + +#: contrib/localflavor/sk/sk_districts.py:45 +msgid "Myjava" +msgstr "Myjava" + +#: contrib/localflavor/sk/sk_districts.py:46 +msgid "Namestovo" +msgstr "Namestovo" + +#: contrib/localflavor/sk/sk_districts.py:47 +msgid "Nitra" +msgstr "Nitra" + +#: contrib/localflavor/sk/sk_districts.py:48 +msgid "Nove Mesto nad Vahom" +msgstr "Nove Mesto nad Vahom" + +#: contrib/localflavor/sk/sk_districts.py:49 +msgid "Nove Zamky" +msgstr "Nove Zamky" + +#: contrib/localflavor/sk/sk_districts.py:50 +msgid "Partizanske" +msgstr "Partizanske" + +#: contrib/localflavor/sk/sk_districts.py:51 +msgid "Pezinok" +msgstr "Pezinok" + +#: contrib/localflavor/sk/sk_districts.py:52 +msgid "Piestany" +msgstr "Piestany" + +#: contrib/localflavor/sk/sk_districts.py:53 +msgid "Poltar" +msgstr "Poltar" + +#: contrib/localflavor/sk/sk_districts.py:54 +msgid "Poprad" +msgstr "Poprad" + +#: contrib/localflavor/sk/sk_districts.py:55 +msgid "Povazska Bystrica" +msgstr "Povazska Bystrica" + +#: contrib/localflavor/sk/sk_districts.py:56 +msgid "Presov" +msgstr "Presov" + +#: contrib/localflavor/sk/sk_districts.py:57 +msgid "Prievidza" +msgstr "Prievidza" + +#: contrib/localflavor/sk/sk_districts.py:58 +msgid "Puchov" +msgstr "Puchov" + +#: contrib/localflavor/sk/sk_districts.py:59 +msgid "Revuca" +msgstr "Revuca" + +#: contrib/localflavor/sk/sk_districts.py:60 +msgid "Rimavska Sobota" +msgstr "Rimavska Sobota" + +#: contrib/localflavor/sk/sk_districts.py:61 +msgid "Roznava" +msgstr "Roznava" + +#: contrib/localflavor/sk/sk_districts.py:62 +msgid "Ruzomberok" +msgstr "Ruzomberok" + +#: contrib/localflavor/sk/sk_districts.py:63 +msgid "Sabinov" +msgstr "Sabinov" + +#: contrib/localflavor/sk/sk_districts.py:64 +msgid "Senec" +msgstr "Senec" + +#: contrib/localflavor/sk/sk_districts.py:65 +msgid "Senica" +msgstr "Senica" + +#: contrib/localflavor/sk/sk_districts.py:66 +msgid "Skalica" +msgstr "Skalica" + +#: contrib/localflavor/sk/sk_districts.py:67 +msgid "Snina" +msgstr "Shina" + +#: contrib/localflavor/sk/sk_districts.py:68 +msgid "Sobrance" +msgstr "Sobrance" + +#: contrib/localflavor/sk/sk_districts.py:69 +msgid "Spisska Nova Ves" +msgstr "Spisska Nova Ves" + +#: contrib/localflavor/sk/sk_districts.py:70 +msgid "Stara Lubovna" +msgstr "Stara Lubovna" + +#: contrib/localflavor/sk/sk_districts.py:71 +msgid "Stropkov" +msgstr "Stropkov" + +#: contrib/localflavor/sk/sk_districts.py:72 +msgid "Svidnik" +msgstr "Svidnik" + +#: contrib/localflavor/sk/sk_districts.py:73 +msgid "Sala" +msgstr "Sala" + +#: contrib/localflavor/sk/sk_districts.py:74 +msgid "Topolcany" +msgstr "Topolcany" + +#: contrib/localflavor/sk/sk_districts.py:75 +msgid "Trebisov" +msgstr "Trebisov" + +#: contrib/localflavor/sk/sk_districts.py:76 +msgid "Trencin" +msgstr "Trencin" + +#: contrib/localflavor/sk/sk_districts.py:77 +msgid "Trnava" +msgstr "Trnava" + +#: contrib/localflavor/sk/sk_districts.py:78 +msgid "Turcianske Teplice" +msgstr "Turcianske Teplice" + +#: contrib/localflavor/sk/sk_districts.py:79 +msgid "Tvrdosin" +msgstr "Tvrdosin" + +#: contrib/localflavor/sk/sk_districts.py:80 +msgid "Velky Krtis" +msgstr "Velky Krtis" + +#: contrib/localflavor/sk/sk_districts.py:81 +msgid "Vranov nad Toplou" +msgstr "Vranov nad Toplou" + +#: contrib/localflavor/sk/sk_districts.py:82 +msgid "Zlate Moravce" +msgstr "Zlate Moravce" + +#: contrib/localflavor/sk/sk_districts.py:83 +msgid "Zvolen" +msgstr "Zvolen" + +#: contrib/localflavor/sk/sk_districts.py:84 +msgid "Zarnovica" +msgstr "Zarnovica" + +#: contrib/localflavor/sk/sk_districts.py:85 +msgid "Ziar nad Hronom" +msgstr "Ziar nad Hronom" + +#: contrib/localflavor/sk/sk_districts.py:86 +msgid "Zilina" +msgstr "Zilina" + +#: contrib/localflavor/sk/sk_regions.py:8 +msgid "Banska Bystrica region" +msgstr "Banska Bystrica region" + +#: contrib/localflavor/sk/sk_regions.py:9 +msgid "Bratislava region" +msgstr "Bratislava region" + +#: contrib/localflavor/sk/sk_regions.py:10 +msgid "Kosice region" +msgstr "Kosice region" + +#: contrib/localflavor/sk/sk_regions.py:11 +msgid "Nitra region" +msgstr "Nitra region" + +#: contrib/localflavor/sk/sk_regions.py:12 +msgid "Presov region" +msgstr "Presov region" + +#: contrib/localflavor/sk/sk_regions.py:13 +msgid "Trencin region" +msgstr "Trencin region" + +#: contrib/localflavor/sk/sk_regions.py:14 +msgid "Trnava region" +msgstr "Trnava region" + +#: contrib/localflavor/sk/sk_regions.py:15 +msgid "Zilina region" +msgstr "Zilina region" + +#: contrib/localflavor/uk/forms.py:21 +msgid "Enter a valid postcode." +msgstr "올바른 우편번호를 입력하세요." + +#: contrib/localflavor/uk/uk_regions.py:11 +msgid "Bedfordshire" +msgstr "베드퍼드셔 주" + +#: contrib/localflavor/uk/uk_regions.py:12 +msgid "Buckinghamshire" +msgstr "버킹엄셔 주" + +#: contrib/localflavor/uk/uk_regions.py:14 +msgid "Cheshire" +msgstr "체셔 주" + +#: contrib/localflavor/uk/uk_regions.py:15 +msgid "Cornwall and Isles of Scilly" +msgstr "콘월 주 (시실리 섬)" + +#: contrib/localflavor/uk/uk_regions.py:16 +msgid "Cumbria" +msgstr "컴브리아 주" + +#: contrib/localflavor/uk/uk_regions.py:17 +msgid "Derbyshire" +msgstr "더비셔 주" + +#: contrib/localflavor/uk/uk_regions.py:18 +msgid "Devon" +msgstr "데번 주" + +#: contrib/localflavor/uk/uk_regions.py:19 +msgid "Dorset" +msgstr "Dorest 주" + +#: contrib/localflavor/uk/uk_regions.py:20 +msgid "Durham" +msgstr "카운티 더럼 주" + +#: contrib/localflavor/uk/uk_regions.py:21 +msgid "East Sussex" +msgstr "이스트 서섹스 주" + +#: contrib/localflavor/uk/uk_regions.py:22 +msgid "Essex" +msgstr "에섹스 주" + +#: contrib/localflavor/uk/uk_regions.py:23 +msgid "Gloucestershire" +msgstr "글로스터셔 주" + +#: contrib/localflavor/uk/uk_regions.py:24 +msgid "Greater London" +msgstr "그레이터 런던" + +#: contrib/localflavor/uk/uk_regions.py:25 +msgid "Greater Manchester" +msgstr "그레이터 멘체스터 주" + +#: contrib/localflavor/uk/uk_regions.py:26 +msgid "Hampshire" +msgstr "햄프셔 주" + +#: contrib/localflavor/uk/uk_regions.py:27 +msgid "Hertfordshire" +msgstr "허트퍼드셔 주" + +#: contrib/localflavor/uk/uk_regions.py:28 +msgid "Kent" +msgstr "켄트 주" + +#: contrib/localflavor/uk/uk_regions.py:29 +msgid "Lancashire" +msgstr "랭커셔 주" + +#: contrib/localflavor/uk/uk_regions.py:30 +msgid "Leicestershire" +msgstr "레스터셔 주" + +#: contrib/localflavor/uk/uk_regions.py:31 +msgid "Lincolnshire" +msgstr "링컨셔 주" + +#: contrib/localflavor/uk/uk_regions.py:32 +msgid "Merseyside" +msgstr "머시사이드 주" + +#: contrib/localflavor/uk/uk_regions.py:33 +msgid "Norfolk" +msgstr "노퍽 주" + +#: contrib/localflavor/uk/uk_regions.py:34 +msgid "North Yorkshire" +msgstr "노스요크셔 주" + +#: contrib/localflavor/uk/uk_regions.py:35 +msgid "Northamptonshire" +msgstr "노스햄프턴 주" + +#: contrib/localflavor/uk/uk_regions.py:36 +msgid "Northumberland" +msgstr "노섬벌랜드 주" + +#: contrib/localflavor/uk/uk_regions.py:37 +msgid "Nottinghamshire" +msgstr "노팅험셔 주" + +#: contrib/localflavor/uk/uk_regions.py:38 +msgid "Oxfordshire" +msgstr "옥스포드셔 주" + +#: contrib/localflavor/uk/uk_regions.py:39 +msgid "Shropshire" +msgstr "시롭셔 주" + +#: contrib/localflavor/uk/uk_regions.py:40 +msgid "Somerset" +msgstr "서머셋 주" + +#: contrib/localflavor/uk/uk_regions.py:41 +msgid "South Yorkshire" +msgstr "사우스요크셔 주" + +#: contrib/localflavor/uk/uk_regions.py:42 +msgid "Staffordshire" +msgstr "스태포드셔 주" + +#: contrib/localflavor/uk/uk_regions.py:43 +msgid "Suffolk" +msgstr "서퍽 주" + +#: contrib/localflavor/uk/uk_regions.py:44 +msgid "Surrey" +msgstr "서리 주" + +#: contrib/localflavor/uk/uk_regions.py:45 +msgid "Tyne and Wear" +msgstr "타인-웨어 주" + +#: contrib/localflavor/uk/uk_regions.py:46 +msgid "Warwickshire" +msgstr "워릭셔 주" + +#: contrib/localflavor/uk/uk_regions.py:47 +msgid "West Midlands" +msgstr "웨스트미들랜즈" + +#: contrib/localflavor/uk/uk_regions.py:48 +msgid "West Sussex" +msgstr "웨스트서섹스 주" + +#: contrib/localflavor/uk/uk_regions.py:49 +msgid "West Yorkshire" +msgstr "웨스트요크셔 주" + +#: contrib/localflavor/uk/uk_regions.py:50 +msgid "Wiltshire" +msgstr "윌트셔 주" + +#: contrib/localflavor/uk/uk_regions.py:51 +msgid "Worcestershire" +msgstr "우스터셔 주" + +#: contrib/localflavor/uk/uk_regions.py:55 +msgid "County Antrim" +msgstr "앤트림 카운티" + +#: contrib/localflavor/uk/uk_regions.py:56 +msgid "County Armagh" +msgstr "아마 카운티" + +#: contrib/localflavor/uk/uk_regions.py:57 +msgid "County Down" +msgstr "다운 카운티" + +#: contrib/localflavor/uk/uk_regions.py:58 +msgid "County Fermanagh" +msgstr "퍼매너 카운티" + +#: contrib/localflavor/uk/uk_regions.py:59 +msgid "County Londonderry" +msgstr "런던데리 카운티" + +#: contrib/localflavor/uk/uk_regions.py:60 +msgid "County Tyrone" +msgstr "티론 카운티" + +#: contrib/localflavor/uk/uk_regions.py:64 +msgid "Clwyd" +msgstr "클루이드 주" + +#: contrib/localflavor/uk/uk_regions.py:65 +msgid "Dyfed" +msgstr "디버드 주" + +#: contrib/localflavor/uk/uk_regions.py:66 +msgid "Gwent" +msgstr "궨트 주" + +#: contrib/localflavor/uk/uk_regions.py:67 +msgid "Gwynedd" +msgstr "귀네드 주" + +#: contrib/localflavor/uk/uk_regions.py:68 +msgid "Mid Glamorgan" +msgstr "미드글라모건 주" + +#: contrib/localflavor/uk/uk_regions.py:69 +msgid "Powys" +msgstr "포이스 주" + +#: contrib/localflavor/uk/uk_regions.py:70 +msgid "South Glamorgan" +msgstr "사우스글라모건 주" + +#: contrib/localflavor/uk/uk_regions.py:71 +msgid "West Glamorgan" +msgstr "웨스트글라모건 주" + +#: contrib/localflavor/uk/uk_regions.py:75 +msgid "Borders" +msgstr "보더스 주" + +#: contrib/localflavor/uk/uk_regions.py:76 +msgid "Central Scotland" +msgstr "센트럴스코틀랜드" + +#: contrib/localflavor/uk/uk_regions.py:77 +msgid "Dumfries and Galloway" +msgstr "덤프리스갤러웨이 주" + +#: contrib/localflavor/uk/uk_regions.py:78 +msgid "Fife" +msgstr "파이프 주" + +#: contrib/localflavor/uk/uk_regions.py:79 +msgid "Grampian" +msgstr "그램피언 주" + +#: contrib/localflavor/uk/uk_regions.py:80 +msgid "Highland" +msgstr "하이랜드 주" + +#: contrib/localflavor/uk/uk_regions.py:81 +msgid "Lothian" +msgstr "로디언 주" + +#: contrib/localflavor/uk/uk_regions.py:82 +msgid "Orkney Islands" +msgstr "오크니 제도" + +#: contrib/localflavor/uk/uk_regions.py:83 +msgid "Shetland Islands" +msgstr "셰틀랜드 제도" + +#: contrib/localflavor/uk/uk_regions.py:84 +msgid "Strathclyde" +msgstr "스트래스클라이드 주" + +#: contrib/localflavor/uk/uk_regions.py:85 +msgid "Tayside" +msgstr "태이사이드 주" + +#: contrib/localflavor/uk/uk_regions.py:86 +msgid "Western Isles" +msgstr "웨스턴아일 주" + +#: contrib/localflavor/uk/uk_regions.py:90 +msgid "England" +msgstr "잉글랜드 주" + +#: contrib/localflavor/uk/uk_regions.py:91 +msgid "Northern Ireland" +msgstr "노던아일랜드 주" + +#: contrib/localflavor/uk/uk_regions.py:92 +msgid "Scotland" +msgstr "스코틀랜드 주" + +#: contrib/localflavor/uk/uk_regions.py:93 +msgid "Wales" +msgstr "웨일즈 주" + +#: contrib/localflavor/us/forms.py:16 +msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." +msgstr "우편번호를 입력하세요. (XXXXX 또는 XXXXX-XXXX 형식)" + +#: contrib/localflavor/us/forms.py:54 +msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." +msgstr "올바른 미국 사회보장번호를 입력하세요. (XXX-XX-XXXX 형식)" + +#: contrib/localflavor/za/forms.py:20 +msgid "Enter a valid South African ID number" +msgstr "올바른 남아프리카 주민번호를 입력하세요." + +#: contrib/localflavor/za/forms.py:54 +msgid "Enter a valid South African postal code" +msgstr "올바른 남아프리카 우편번호를 입력하세요." + +#: contrib/localflavor/za/za_provinces.py:4 +msgid "Eastern Cape" +msgstr "이스턴케이프 주" + +#: contrib/localflavor/za/za_provinces.py:5 +msgid "Free State" +msgstr "프리스테이트 주" + +#: contrib/localflavor/za/za_provinces.py:6 +msgid "Gauteng" +msgstr "가우텡 주" + +#: contrib/localflavor/za/za_provinces.py:7 +msgid "KwaZulu-Natal" +msgstr "크와줄루나탈 주" + +#: contrib/localflavor/za/za_provinces.py:8 +msgid "Limpopo" +msgstr "림포포 주" + +#: contrib/localflavor/za/za_provinces.py:9 +msgid "Mpumalanga" +msgstr "음푸말랑가 주" + +#: contrib/localflavor/za/za_provinces.py:10 +msgid "Northern Cape" +msgstr "노던케이프 주" + +#: contrib/localflavor/za/za_provinces.py:11 +msgid "North West" +msgstr "노스웨스트 주" + +#: contrib/localflavor/za/za_provinces.py:12 +msgid "Western Cape" +msgstr "웨스턴케이프 주" + #: contrib/redirects/models.py:7 msgid "redirect from" msgstr "에서 재전송" @@ -1178,1620 +3794,587 @@ msgstr "재전송" msgid "redirects" msgstr "재전송" -#: contrib/comments/models.py:67 contrib/comments/models.py:166 -msgid "object ID" -msgstr "오브젝트 ID" - -#: contrib/comments/models.py:68 -msgid "headline" -msgstr "최근 정보" - -#: contrib/comments/models.py:69 contrib/comments/models.py:90 -#: contrib/comments/models.py:167 -msgid "comment" -msgstr "코멘트" - -#: contrib/comments/models.py:70 -msgid "rating #1" -msgstr "rating #1" - -#: contrib/comments/models.py:71 -msgid "rating #2" -msgstr "rating #2" - -#: contrib/comments/models.py:72 -msgid "rating #3" -msgstr "rating #3" - -#: contrib/comments/models.py:73 -msgid "rating #4" -msgstr "rating #4" - -#: contrib/comments/models.py:74 -msgid "rating #5" -msgstr "rating #5" - -#: contrib/comments/models.py:75 -msgid "rating #6" -msgstr "rating #6" - -#: contrib/comments/models.py:76 -msgid "rating #7" -msgstr "rating #7" - -#: contrib/comments/models.py:77 -msgid "rating #8" -msgstr "rating #8" - -#: contrib/comments/models.py:82 -msgid "is valid rating" -msgstr "올바른 레이팅입니다." - -#: contrib/comments/models.py:83 contrib/comments/models.py:169 -msgid "date/time submitted" -msgstr "날짜/시간 확인" - -#: contrib/comments/models.py:84 contrib/comments/models.py:170 -msgid "is public" -msgstr "공개합니다." - -#: contrib/comments/models.py:85 contrib/admin/views/doc.py:304 -msgid "IP address" -msgstr "IP 주소" - -#: contrib/comments/models.py:86 -msgid "is removed" -msgstr "삭제합니다." - -#: contrib/comments/models.py:86 -msgid "" -"Check this box if the comment is inappropriate. A \"This comment has been " -"removed\" message will be displayed instead." -msgstr "" -"코멘트가 부적절한 경우 체크하세요. \"코멘트가 삭제되었습니다.\" 메시지가 표시" -"됩니다." - -#: contrib/comments/models.py:91 -msgid "comments" -msgstr "코멘트(들)" - -#: contrib/comments/models.py:131 contrib/comments/models.py:207 -msgid "Content object" -msgstr "콘텐츠 오브젝트" - -#: contrib/comments/models.py:159 -#, python-format -msgid "" -"Posted by %(user)s at %(date)s\n" -"\n" -"%(comment)s\n" -"\n" -"http://%(domain)s%(url)s" -msgstr "" -"%(user)s (이)가 %(date)s 등록\n" -"\n" -"%(comment)s\n" -"\n" -"http://%(domain)s%(url)s" - -#: contrib/comments/models.py:168 -msgid "person's name" -msgstr "사용자 이름" - -#: contrib/comments/models.py:171 -msgid "ip address" -msgstr "IP 주소" - -#: contrib/comments/models.py:173 -msgid "approved by staff" -msgstr "스태프 승인" - -#: contrib/comments/models.py:176 -msgid "free comment" -msgstr "프리 코멘트" - -#: contrib/comments/models.py:177 -msgid "free comments" -msgstr "프리 코멘트(들)" - -#: contrib/comments/models.py:233 -msgid "score" -msgstr "스코어" - -#: contrib/comments/models.py:234 -msgid "score date" -msgstr "스코어 날짜" - -#: contrib/comments/models.py:237 -msgid "karma score" -msgstr "카르마 스코어" - -#: contrib/comments/models.py:238 -msgid "karma scores" -msgstr "카르마 스코어" - -#: contrib/comments/models.py:242 -#, python-format -msgid "%(score)d rating by %(user)s" -msgstr "%(user)s (이)가 %(score)d 점 부여했습니다." - -#: contrib/comments/models.py:258 -#, python-format -msgid "" -"This comment was flagged by %(user)s:\n" -"\n" -"%(text)s" -msgstr "" -"%(user)s:\n" -"\n" -"%(text)s" - -#: contrib/comments/models.py:265 -msgid "flag date" -msgstr "플래그 날짜" - -#: contrib/comments/models.py:268 -msgid "user flag" -msgstr "사용자 플래그" - -#: contrib/comments/models.py:269 -msgid "user flags" -msgstr "사용자 플래그" - -#: contrib/comments/models.py:273 -#, python-format -msgid "Flag by %r" -msgstr "%r (으)로 플래그" - -#: contrib/comments/models.py:278 -msgid "deletion date" -msgstr "삭제일" - -#: contrib/comments/models.py:280 -msgid "moderator deletion" -msgstr "" - -#: contrib/comments/models.py:281 -msgid "moderator deletions" -msgstr "" - -#: contrib/comments/models.py:285 -#, python-format -msgid "Moderator deletion by %r" -msgstr "" - -#: contrib/comments/views/karma.py:19 -msgid "Anonymous users cannot vote" -msgstr "미등록 사용자는 투표할 수 없습니다." - -#: contrib/comments/views/karma.py:23 -msgid "Invalid comment ID" -msgstr "코멘트 ID가 부적절합니다." - -#: contrib/comments/views/karma.py:25 -msgid "No voting for yourself" -msgstr "자신이 직접 투표할 수 없습니다." - -#: contrib/comments/views/comments.py:27 -msgid "" -"This rating is required because you've entered at least one other rating." -msgstr "다른 레이팅을 입력했을 경우, 이 레이팅은 필히 입력하셔야 합니다." - -#: contrib/comments/views/comments.py:111 -#, python-format -msgid "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comment:\n" -"\n" -"%(text)s" -msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comments:\n" -"\n" -"%(text)s" -msgstr[0] "" -"이 코멘트를 작성한 사용자의 코멘트 포스팅은 %(count)s 번 이하입니다.:\n" -"\n" -"%(text)s" -msgstr[1] "" -"이 코멘트를 작성한 사용자의 코멘트 포스팅은 %(count)s 번 이하입니다.:\n" -"\n" -"%(text)s" - -#: contrib/comments/views/comments.py:116 -#, python-format -msgid "" -"This comment was posted by a sketchy user:\n" -"\n" -"%(text)s" -msgstr "" -"이 코멘트는 알수 없는 사용자가 작성했습니다.:\n" -"\n" -"%(text)s" - -#: contrib/comments/views/comments.py:188 -#: contrib/comments/views/comments.py:280 -msgid "Only POSTs are allowed" -msgstr "POST만 가능합니다." - -#: contrib/comments/views/comments.py:192 -#: contrib/comments/views/comments.py:284 -msgid "One or more of the required fields wasn't submitted" -msgstr "하나 이상의 필수항목이 누락되었습니다." - -#: contrib/comments/views/comments.py:196 -#: contrib/comments/views/comments.py:286 -msgid "Somebody tampered with the comment form (security violation)" -msgstr "해당 코멘트가 누군가에 의해 변경되었습니다." - -#: contrib/comments/views/comments.py:206 -#: contrib/comments/views/comments.py:292 -msgid "" -"The comment form had an invalid 'target' parameter -- the object ID was " -"invalid" -msgstr "" -"'target' 파라미터가 코멘트 폼에 적합하지 않습니다.오브젝트 ID가 부적절합니다." - -#: contrib/comments/views/comments.py:257 -#: contrib/comments/views/comments.py:321 -msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "해당 코멘트 폼은 '미리보기'와 'post' 기능을 제공하지 않습니다." - -#: contrib/comments/templates/comments/freeform.html:4 -msgid "Your name:" -msgstr "이름:" - -#: contrib/comments/templates/comments/freeform.html:5 -#: contrib/comments/templates/comments/form.html:28 -msgid "Comment:" -msgstr "코멘트:" - -#: contrib/comments/templates/comments/freeform.html:10 -#: contrib/comments/templates/comments/form.html:35 -msgid "Preview comment" -msgstr "코멘트 미리보기" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/login.html:17 -msgid "Username:" -msgstr "사용자명" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "로그아웃" - -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/login.html:20 -msgid "Password:" -msgstr "비밀번호" - -#: contrib/comments/templates/comments/form.html:8 -msgid "Forgotten your password?" -msgstr "비밀번호를 잊으셨습니까?" - -#: contrib/comments/templates/comments/form.html:12 -msgid "Ratings" -msgstr "레이팅" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Required" -msgstr "필수항목" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Optional" -msgstr "옵션" - -#: contrib/comments/templates/comments/form.html:23 -msgid "Post a photo" -msgstr "사진 등록" - -#: contrib/flatpages/models.py:7 contrib/admin/views/doc.py:315 -msgid "URL" -msgstr "URL" - -#: contrib/flatpages/models.py:8 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "앞, 뒤에 슬래시(/)를 넣으세요. 예:'/about/contact/' " - -#: contrib/flatpages/models.py:9 -msgid "title" -msgstr "제목" - -#: contrib/flatpages/models.py:10 -msgid "content" -msgstr "내용" - -#: contrib/flatpages/models.py:11 -msgid "enable comments" -msgstr "사용 가능한 코멘트" - -#: contrib/flatpages/models.py:12 -msgid "template name" -msgstr "템플릿명" - -#: contrib/flatpages/models.py:13 -msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." -msgstr "" -"예: 'flatpages/contact_page.html' 를 사용할 수 없는 경우 시스템이 'flatpages/" -"default.html' (을)를 사용합니다." - -#: contrib/flatpages/models.py:14 -msgid "registration required" -msgstr "등록하세요." - -#: contrib/flatpages/models.py:14 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "체크할 경우, 로그인 사용자만 해당 페이지를 볼 수 있습니다." - -#: contrib/flatpages/models.py:18 -msgid "flat page" -msgstr "플랫 페이지" - -#: contrib/flatpages/models.py:19 -msgid "flat pages" -msgstr "플랫 페이지(들)" - -#: contrib/sessions/models.py:68 +#: contrib/sessions/models.py:45 msgid "session key" msgstr "세션 키" -#: contrib/sessions/models.py:69 +#: contrib/sessions/models.py:47 msgid "session data" msgstr "세션 날짜" -#: contrib/sessions/models.py:70 +#: contrib/sessions/models.py:48 msgid "expire date" msgstr "유효날짜" -#: contrib/sessions/models.py:74 +#: contrib/sessions/models.py:53 msgid "session" msgstr "세션" -#: contrib/sessions/models.py:75 +#: contrib/sessions/models.py:54 msgid "sessions" msgstr "세션" -#: contrib/sites/models.py:10 +#: contrib/sites/models.py:32 msgid "domain name" msgstr "도메인 명" -#: contrib/sites/models.py:11 +#: contrib/sites/models.py:33 msgid "display name" msgstr "표시명" -#: contrib/sites/models.py:15 -msgid "site" -msgstr "사이트" - -#: contrib/sites/models.py:16 +#: contrib/sites/models.py:39 msgid "sites" msgstr "사이트(들)" -#: contrib/admin/filterspecs.py:40 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 +msgid "This value must be an integer." +msgstr "정수 값을 사용하세요." + +#: db/models/fields/__init__.py:388 +msgid "This value must be either True or False." +msgstr "True 또는 False 값을 사용하세요." + +#: db/models/fields/__init__.py:427 +msgid "This field cannot be null." +msgstr "이 필드는 null 값은 사용할 수 없습니다. " + +#: db/models/fields/__init__.py:443 +msgid "Enter only digits separated by commas." +msgstr "콤마로 구분된 숫자만 입력하세요." + +#: db/models/fields/__init__.py:474 +msgid "Enter a valid date in YYYY-MM-DD format." +msgstr "날짜는 YYYY-MM-DD 형식으로 입력하세요." + +#: db/models/fields/__init__.py:483 #, python-format +msgid "Invalid date: %s" +msgstr "날짜가 부적절합니다.: %s" + +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 +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:601 +msgid "This value must be a decimal number." +msgstr "십진수 실수(decimal) 값을 사용하세요." + +#: db/models/fields/__init__.py:686 +msgid "This value must be a float." +msgstr "부동소수점 실수(float) 값을 사용해 주세요." + +#: db/models/fields/__init__.py:746 +msgid "This value must be either None, True or False." +msgstr "None, True 또는 False 값을 사용하세요." + +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 +msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." +msgstr "시각은 HH:MM[:ss[.uuuuuu]] 형식으로 입력하세요." + +#: db/models/fields/related.py:816 msgid "" -"

                  By %s:

                  \n" -"
                    \n" +"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" -"

                    %s(으)로:

                    \n" -"
                      \n" +"복수 선택 시에는 \"Control\" 키를 누른 상태에서 선택해 주세요.(Mac은 " +"\"Command\" 키)" -#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 -#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169 -msgid "All" -msgstr "모두" - -#: contrib/admin/filterspecs.py:109 -msgid "Any date" -msgstr "언제나" - -#: contrib/admin/filterspecs.py:110 -msgid "Today" -msgstr "오늘" - -#: contrib/admin/filterspecs.py:113 -msgid "Past 7 days" -msgstr "지난 7일" - -#: contrib/admin/filterspecs.py:115 -msgid "This month" -msgstr "이번 달" - -#: contrib/admin/filterspecs.py:117 -msgid "This year" -msgstr "이번 해" - -#: contrib/admin/models.py:16 -msgid "action time" -msgstr "액션 타임" - -#: contrib/admin/models.py:19 -msgid "object id" -msgstr "오브젝트 아이디" - -#: contrib/admin/models.py:20 -msgid "object repr" -msgstr "오브젝트 표현" - -#: contrib/admin/models.py:21 -msgid "action flag" -msgstr "액션 플래그" - -#: contrib/admin/models.py:22 -msgid "change message" -msgstr "메시지 변경" - -#: contrib/admin/models.py:25 -msgid "log entry" -msgstr "로그 엔트리" - -#: contrib/admin/models.py:26 -msgid "log entries" -msgstr "로그 엔트리" - -#: contrib/admin/templatetags/admin_list.py:247 -msgid "All dates" -msgstr "언제나" - -#: contrib/admin/views/decorators.py:24 -#: contrib/admin/templates/admin/login.html:25 -msgid "Log in" -msgstr "로그인" - -#: contrib/admin/views/decorators.py:62 -msgid "" -"Please log in again, because your session has expired. Don't worry: Your " -"submission has been saved." -msgstr "로그인 세션이 끊겼습니다. 다시 로그인 하세요." - -#: contrib/admin/views/decorators.py:69 -msgid "" -"Looks like your browser isn't configured to accept cookies. Please enable " -"cookies, reload this page, and try again." -msgstr "" -"사용하시는 브라우저가 쿠키 사용을 허가하고 있지 않습니다.쿠키 사용을 체크하시" -"고 다시 시도해 주세요." - -#: contrib/admin/views/decorators.py:83 -msgid "Usernames cannot contain the '@' character." -msgstr "사용자명에는 '@'을 사용할 수 없습니다." - -#: contrib/admin/views/decorators.py:85 +#: db/models/fields/related.py:894 #, python-format -msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "이메일 주소와 사용자명은 다릅니다. '%s'를 사용하세요." - -#: contrib/admin/views/auth.py:19 contrib/admin/views/main.py:257 -#, python-format -msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다." - -#: contrib/admin/views/auth.py:24 contrib/admin/views/main.py:261 -#: contrib/admin/views/main.py:347 -msgid "You may edit it again below." -msgstr "계속해서 편집하실 수 있습니다." - -#: contrib/admin/views/auth.py:30 -msgid "Add user" -msgstr "사용자 추가" - -#: contrib/admin/views/auth.py:57 -msgid "Password changed successfully." -msgstr "비밀번호가 변경되었습니다." - -#: contrib/admin/views/auth.py:64 -#, python-format -msgid "Change password: %s" -msgstr "비밀번호 변경: %s" - -#: contrib/admin/views/main.py:223 -msgid "Site administration" -msgstr "사이트 관리" - -#: contrib/admin/views/main.py:271 contrib/admin/views/main.py:356 -#, python-format -msgid "You may add another %s below." -msgstr "계속해서 다른 %s (을)를 추가하세요." - -#: contrib/admin/views/main.py:289 -#, python-format -msgid "Add %s" -msgstr "%s 추가" - -#: contrib/admin/views/main.py:335 -#, python-format -msgid "Added %s." -msgstr "%s (이)가 추가되었습니다." - -#: contrib/admin/views/main.py:337 -#, python-format -msgid "Changed %s." -msgstr "%s (이)가 변경되었습니다." - -#: contrib/admin/views/main.py:339 -#, python-format -msgid "Deleted %s." -msgstr "%s (이)가 삭제되었습니다." - -#: contrib/admin/views/main.py:342 -msgid "No fields changed." -msgstr "변경된 필드가 없습니다." - -#: contrib/admin/views/main.py:345 -#, python-format -msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "%(name)s \"%(obj)s\" (이)가 변경되었습니다." - -#: contrib/admin/views/main.py:353 -#, python-format -msgid "" -"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다. 계속해서 편집하세요." - -#: contrib/admin/views/main.py:391 -#, python-format -msgid "Change %s" -msgstr "%s 변경" - -#: contrib/admin/views/main.py:476 -#, python-format -msgid "One or more %(fieldname)s in %(name)s: %(obj)s" -msgstr "%(name)s 에 %(fieldname)s (이)가 하나 이상 있는 %(obj)s" - -#: contrib/admin/views/main.py:481 -#, python-format -msgid "One or more %(fieldname)s in %(name)s:" -msgstr "%(name)s 에 %(fieldname)s (이)가 하나 이상 있는" - -#: contrib/admin/views/main.py:514 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" (이)가 삭제되었습니다." - -#: contrib/admin/views/main.py:517 -msgid "Are you sure?" -msgstr "확실합니까?" - -#: contrib/admin/views/main.py:539 -#, python-format -msgid "Change history: %s" -msgstr "변경 히스토리: %s" - -#: contrib/admin/views/main.py:573 -#, python-format -msgid "Select %s" -msgstr "%s 선택" - -#: contrib/admin/views/main.py:573 -#, python-format -msgid "Select %s to change" -msgstr "변경할 %s 선택" - -#: contrib/admin/views/main.py:768 -msgid "Database error" -msgstr "데이터베이스 오류" - -#: contrib/admin/views/doc.py:46 contrib/admin/views/doc.py:48 -#: contrib/admin/views/doc.py:50 -msgid "tag:" -msgstr "태그:" - -#: contrib/admin/views/doc.py:77 contrib/admin/views/doc.py:79 -#: contrib/admin/views/doc.py:81 -msgid "filter:" -msgstr "필터:" - -#: contrib/admin/views/doc.py:135 contrib/admin/views/doc.py:137 -#: contrib/admin/views/doc.py:139 -msgid "view:" -msgstr "뷰:" - -#: contrib/admin/views/doc.py:164 -#, python-format -msgid "App %r not found" -msgstr "어플리케이션 %r (이)가 없습니다." - -#: contrib/admin/views/doc.py:171 -#, python-format -msgid "Model %(name)r not found in app %(label)r" -msgstr "모델 %(name)r (이)가 어플리케이션 %(label)r 에 없습니다." - -#: contrib/admin/views/doc.py:183 -#, python-format -msgid "the related `%(label)s.%(type)s` object" -msgstr "`%(label)s.%(type)s` 관련 오브젝트" - -#: contrib/admin/views/doc.py:183 contrib/admin/views/doc.py:205 -#: contrib/admin/views/doc.py:219 contrib/admin/views/doc.py:224 -msgid "model:" -msgstr "모델:" - -#: contrib/admin/views/doc.py:214 -#, python-format -msgid "related `%(label)s.%(name)s` objects" -msgstr "`%(label)s.%(name)s` 관련 오브젝트(들)" - -#: contrib/admin/views/doc.py:219 -#, python-format -msgid "all %s" -msgstr "모든 %s" - -#: contrib/admin/views/doc.py:224 -#, python-format -msgid "number of %s" -msgstr "%s 의 수" - -#: contrib/admin/views/doc.py:229 -#, python-format -msgid "Fields on %s objects" -msgstr "%s 오브젝트의 필드" - -#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:301 -#: contrib/admin/views/doc.py:303 contrib/admin/views/doc.py:309 -#: contrib/admin/views/doc.py:310 contrib/admin/views/doc.py:312 -msgid "Integer" -msgstr "정수" - -#: contrib/admin/views/doc.py:292 -msgid "Boolean (Either True or False)" -msgstr "boolean(참 또는 거짓)" - -#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:311 -#, python-format -msgid "String (up to %(maxlength)s)" -msgstr "문자열(%(maxlength)s 까지)" - -#: contrib/admin/views/doc.py:294 -msgid "Comma-separated integers" -msgstr "정수(콤마로 구분)" - -#: contrib/admin/views/doc.py:295 -msgid "Date (without time)" -msgstr "날짜(시간 제외)" - -#: contrib/admin/views/doc.py:296 -msgid "Date (with time)" -msgstr "날짜(시간 포함)" - -#: contrib/admin/views/doc.py:297 -msgid "E-mail address" -msgstr "이메일 주소" - -#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:299 -#: contrib/admin/views/doc.py:302 -msgid "File path" -msgstr "파일 경로" - -#: contrib/admin/views/doc.py:300 -msgid "Decimal number" -msgstr "10진수" - -#: contrib/admin/views/doc.py:306 -msgid "Boolean (Either True, False or None)" -msgstr "boolean (참, 거짓 또는 none)" - -#: contrib/admin/views/doc.py:307 -msgid "Relation to parent model" -msgstr "부모(상위) 모델과 연계" - -#: contrib/admin/views/doc.py:308 -msgid "Phone number" -msgstr "전화번호" - -#: contrib/admin/views/doc.py:313 -msgid "Text" -msgstr "텍스트" - -#: contrib/admin/views/doc.py:314 -msgid "Time" -msgstr "시각" - -#: contrib/admin/views/doc.py:316 -msgid "U.S. state (two uppercase letters)" -msgstr "미국의 주 (두개의 대문자로)" - -#: contrib/admin/views/doc.py:317 -msgid "XML text" -msgstr "XML 텍스트" - -#: contrib/admin/views/doc.py:343 -#, python-format -msgid "%s does not appear to be a urlpattern object" -msgstr "%s (은)는 url 패턴의 오브젝트가 아닙니다." - -#: contrib/admin/templates/widget/file.html:2 -msgid "Currently:" -msgstr "현재:" - -#: contrib/admin/templates/widget/file.html:3 -msgid "Change:" -msgstr "변경:" - -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "날짜:" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "시각:" - -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "문서" - -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/admin/auth/user/change_password.html:15 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Change password" -msgstr "비밀번호 변경" - -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/change_list.html:6 -#: contrib/admin/templates/admin/500.html:4 -#: contrib/admin/templates/admin/invalid_setup.html:4 -#: contrib/admin/templates/admin/change_form.html:13 -#: contrib/admin/templates/admin/base.html:30 -#: contrib/admin/templates/admin/delete_confirmation.html:6 -#: contrib/admin/templates/admin/auth/user/change_password.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 -#: contrib/admin/templates/registration/password_change_form.html:4 -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Home" -msgstr "홈" - -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/change_form.html:21 -msgid "History" -msgstr "히스토리" - -#: contrib/admin/templates/admin/object_history.html:18 -msgid "Date/time" -msgstr "날짜/시간" - -#: contrib/admin/templates/admin/object_history.html:19 -msgid "User" -msgstr "사용자" - -#: contrib/admin/templates/admin/object_history.html:20 -msgid "Action" -msgstr "액션" - -#: contrib/admin/templates/admin/object_history.html:26 -msgid "DATE_WITH_TIME_FULL" -msgstr "년/월/일 시:분:초" - -#: contrib/admin/templates/admin/object_history.html:36 -msgid "" -"This object doesn't have a change history. It probably wasn't added via this " -"admin site." -msgstr "" -"오브젝트에 변경사항이 없습니다.이 admin 사이트를 통해 추가된 사항이 아닙니다." - -#: contrib/admin/templates/admin/change_list.html:12 -#, python-format -msgid "Add %(name)s" -msgstr "%(name)s 추가" - -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(filter_title)s " -msgstr "%(filter_title)s (으)로" - -#: contrib/admin/templates/admin/500.html:4 -msgid "Server error" -msgstr "서버 오류" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "서버 오류 (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "서버 오류 (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"오류가 발생했습니다. 사이트 관리자에게 이메일로 에러를 보고 했습니다.조속히 " -"수정하도록 하겠습니다. 고맙습니다." - -#: contrib/admin/templates/admin/invalid_setup.html:8 -msgid "" -"Something's wrong with your database installation. Make sure the appropriate " -"database tables have been created, and make sure the database is readable by " -"the appropriate user." -msgstr "" -"데이터베이스 설정에 문제가 발생했습니다. 해당 데이터베이스 테이블이 생성되었" -"는지,해당 유저가 데이터베이스를 읽어 들일 수 있는지 확인하세요." - -#: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "실행" - -#: contrib/admin/templates/admin/search_form.html:10 -#, python-format -msgid "1 result" -msgid_plural "%(counter)s results" -msgstr[0] "1건" -msgstr[1] "%(counter)s 건" - -#: contrib/admin/templates/admin/search_form.html:10 -#, python-format -msgid "%(full_result_count)s total" -msgstr "모두 %(full_result_count)s 건" - -#: contrib/admin/templates/admin/pagination.html:10 -msgid "Show all" -msgstr "모두 표시" - -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django 사이트 관리" - -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django 관리" - -#: contrib/admin/templates/admin/filters.html:4 -msgid "Filter" -msgstr "필터" - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "해당 페이지가 없습니다." - -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "죄송합니다, 요청하신 페이지를 찾을 수 없습니다." - -#: contrib/admin/templates/admin/index.html:17 -#, python-format -msgid "Models available in the %(name)s application." -msgstr "%(name)s 어플리케이션으로 이용 가능한 모델" - -#: contrib/admin/templates/admin/index.html:18 -#, python-format -msgid "%(name)s" -msgstr "%(name)s" - -#: contrib/admin/templates/admin/index.html:28 -#: contrib/admin/templates/admin/change_form.html:15 -msgid "Add" -msgstr "추가" - -#: contrib/admin/templates/admin/index.html:34 -msgid "Change" -msgstr "변경" - -#: contrib/admin/templates/admin/index.html:44 -msgid "You don't have permission to edit anything." -msgstr "수정할 권한이 없습니다." - -#: contrib/admin/templates/admin/index.html:52 -msgid "Recent Actions" -msgstr "최근 액션" - -#: contrib/admin/templates/admin/index.html:53 -msgid "My Actions" -msgstr "나의 액션" - -#: contrib/admin/templates/admin/index.html:57 -msgid "None available" -msgstr "이용할 수 없습니다." - -#: contrib/admin/templates/admin/change_form.html:22 -msgid "View on site" -msgstr "사이트에서 보기" - -#: contrib/admin/templates/admin/change_form.html:32 -#: contrib/admin/templates/admin/auth/user/change_password.html:24 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "아래의 오류를 수정해 주세요." -msgstr[1] "아래의 오류들을 수정해 주세요." - -#: contrib/admin/templates/admin/change_form.html:50 -msgid "Ordering" -msgstr "순서" - -#: contrib/admin/templates/admin/change_form.html:53 -msgid "Order:" -msgstr "순서:" - -#: contrib/admin/templates/admin/base.html:25 -msgid "Welcome," -msgstr "환영합니다," - -#: contrib/admin/templates/admin/delete_confirmation.html:9 -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Delete" -msgstr "삭제" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " -"related objects, but your account doesn't have permission to delete the " -"following types of objects:" -msgstr "" -"%(object_name)s \"%(escaped_object)s\" (을)를 삭제하면서관련 오브젝트를 제거" -"하고자 했으나, 지금 사용하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없" -"습니다. :" - -#: contrib/admin/templates/admin/delete_confirmation.html:21 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " -"All of the following related items will be deleted:" -msgstr "" -"정말로 %(object_name)s \"%(escaped_object)s\" (을)를 삭제하시겠습니까?다음의 " -"관련 아이템들이 모두 삭제됩니다. :" - -#: contrib/admin/templates/admin/delete_confirmation.html:26 -msgid "Yes, I'm sure" -msgstr "네, 확실합니다." - -#: contrib/admin/templates/admin/submit_line.html:4 -msgid "Save as new" -msgstr "새로 저장" - -#: contrib/admin/templates/admin/submit_line.html:5 -msgid "Save and add another" -msgstr "저장 및 다른 이름으로 추가" - -#: contrib/admin/templates/admin/submit_line.html:6 -msgid "Save and continue editing" -msgstr "저장 및 편집 계속" - -#: contrib/admin/templates/admin/submit_line.html:7 -msgid "Save" -msgstr "저장" - -#: contrib/admin/templates/admin/auth/user/change_password.html:28 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s 새로운 비밀번호를 입력하세요." - -#: contrib/admin/templates/admin/auth/user/change_password.html:34 -#: contrib/admin/templates/admin/auth/user/add_form.html:18 -msgid "Password" -msgstr "비밀번호" - -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/admin/templates/admin/auth/user/add_form.html:23 -msgid "Password (again)" -msgstr "비밀번호 (확인)" - -#: contrib/admin/templates/admin/auth/user/change_password.html:40 -#: contrib/admin/templates/admin/auth/user/add_form.html:24 -msgid "Enter the same password as above, for verification." -msgstr "확인을 위해 위와 동일한 비밀번호를 입력하세요. " - -#: contrib/admin/templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"사용자명와 비밀번호를 입력하세요.더 많은 사용자 옵션을 사용하실 수 있습니다." - -#: contrib/admin/templates/admin/auth/user/add_form.html:12 -msgid "Username" -msgstr "사용자명" - -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_change_form.html:4 -#: contrib/admin/templates/registration/password_change_form.html:6 -#: contrib/admin/templates/registration/password_change_form.html:10 -msgid "Password change" -msgstr "비밀번호 변경" - -#: contrib/admin/templates/registration/password_change_done.html:6 -#: contrib/admin/templates/registration/password_change_done.html:10 -msgid "Password change successful" -msgstr "비밀번호를 변경하였습니다." - -#: contrib/admin/templates/registration/password_change_done.html:12 -msgid "Your password was changed." -msgstr "비밀번호가 변경되었습니다." - -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_form.html:10 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "비밀번호 초기화" - -#: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll reset " -"your password and e-mail the new one to you." -msgstr "" -"비밀번호를 잊으셨나요? 아래에 비밀번호를 입력하시면비밀전호를 초기화 한 후, " -"새로운 비밀번호를 보내드리겠습니다." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "이메일 주소:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "비밀번호 초기화" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "사이트를 이용해 주셔서 고맙습니다." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "다시 로그인하기" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "비밀번호가 초기화 되었습니다." - -#: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "" -"We've e-mailed a new password to the e-mail address you submitted. You " -"should be receiving it shortly." -msgstr "새로운 비밀번호를 등록하신 이메일로 보내드렸습니다." - -#: contrib/admin/templates/registration/password_change_form.html:12 -msgid "" -"Please enter your old password, for security's sake, and then enter your new " -"password twice so we can verify you typed it in correctly." -msgstr "" -"보안상 필요하오니 기존에 사용하시던 비밀번호를 입력해 주세요.새로운 비밀번호" -"는 정확히 입력했는지 확인할 수 있도록 두 번 입력하시기 바랍니다." - -#: contrib/admin/templates/registration/password_change_form.html:17 -msgid "Old password:" -msgstr "기존 비밀번호:" - -#: contrib/admin/templates/registration/password_change_form.html:19 -msgid "New password:" -msgstr "새로운 비밀번호:" - -#: contrib/admin/templates/registration/password_change_form.html:21 -msgid "Confirm password:" -msgstr "새로운 비밀번호(확인):" - -#: contrib/admin/templates/registration/password_change_form.html:23 -msgid "Change my password" -msgstr "비밀번호 변경" - -#: contrib/admin/templates/registration/password_reset_email.html:2 -msgid "You're receiving this e-mail because you requested a password reset" -msgstr "비밀번호가 초기화 되었음을 알려드립니다." - -#: contrib/admin/templates/registration/password_reset_email.html:3 -#, python-format -msgid "for your user account at %(site_name)s" -msgstr "%(site_name)s 의 사용자 비밀번호가 초기화 되었습니다." - -#: contrib/admin/templates/registration/password_reset_email.html:5 -#, python-format -msgid "Your new password is: %(new_password)s" -msgstr "새로운 비밀번호는 %(new_password)s 입니다." - -#: contrib/admin/templates/registration/password_reset_email.html:7 -msgid "Feel free to change this password by going to this page:" -msgstr "해당 페이지에서 언제든지 비밀번호 변경이 가능합니다." - -#: contrib/admin/templates/registration/password_reset_email.html:11 -msgid "Your username, in case you've forgotten:" -msgstr "사용자명:" - -#: contrib/admin/templates/registration/password_reset_email.html:13 -msgid "Thanks for using our site!" -msgstr "사이트를 이용해 주셔서 고맙습니다." - -#: contrib/admin/templates/registration/password_reset_email.html:15 -#, python-format -msgid "The %(site_name)s team" -msgstr "%(site_name)s 팀" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Bookmarklets" -msgstr "북마크릿" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:5 -msgid "Documentation bookmarklets" -msgstr "문서 북마크릿" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:9 -msgid "" -"\n" -"

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

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

                      북마크릿을 설치하시려면 링크를 북마크 툴바로 드래그 하거" -"나,\n" -"오른쪽 클릭으로 해당 링크를 북마크에 추가하세요.\n" -"이제 사이트 내의 모든 페이지에서 북마크릿 선택이 가능합니다.\n" -"북마크릿에 따라 내부 네트워크 상의 컴퓨터로부터 이 사이트를 참조해야하는 경우" -"가 있습니다.\n" -"(내부 네트워크가 있는지 불명확한 경우 시스템 관리자에게 확인하시기 바랍니다.)" -"

                      \n" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:19 -msgid "Documentation for this page" -msgstr "이 페이지의 문서" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:20 -msgid "" -"Jumps you from any page to the documentation for the view that generates " -"that page." -msgstr "각 페이지로에서 해당 페이지를 생성한 뷰의 문서로 갑니다." - -#: contrib/admin/templates/admin_doc/bookmarklets.html:22 -msgid "Show object ID" -msgstr "오브젝트 아이디 표시" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:23 -msgid "" -"Shows the content-type and unique ID for pages that represent a single " -"object." -msgstr "단일 오브젝트 페이지의 고유 아이디와 컨텐츠 타입을 표시합니다." - -#: contrib/admin/templates/admin_doc/bookmarklets.html:25 -msgid "Edit this object (current window)" -msgstr "오브젝트 편집(현재 창)" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:26 -msgid "Jumps to the admin page for pages that represent a single object." -msgstr "단일 오브젝트 페이지의 관리 페이지로 이동" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:28 -msgid "Edit this object (new window)" -msgstr "오브젝트 편집(새로운 창)" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:29 -msgid "As above, but opens the admin page in a new window." -msgstr "위와 동일하며, 새로운 창에서 관리 페이지를 엽니다." - -#: contrib/localflavor/au/forms.py:18 -#, -msgid "Enter a 4 digit post code." -msgstr "우편번호를 입력하세요. (xxxx)" - -#: contrib/localflavor/uk/forms.py:18 -msgid "Enter a postcode. A space is required between the two postcode parts." -msgstr "우편번호를 입력하세요. (xxx xxx)" - -#: contrib/localflavor/fr/forms.py:17 contrib/localflavor/fi/forms.py:14 -#: contrib/localflavor/de/forms.py:16 -msgid "Enter a zip code in the format XXXXX." -msgstr "우편번호를 입력하세요.(xxx xxx)" - -#: contrib/localflavor/jp/forms.py:21 -msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX." -msgstr "우변번호를 입력하세요.(xxxxxx 또는 xxx-xxx)" - -#: contrib/localflavor/jp/jp_prefectures.py:4 -msgid "Hokkaido" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:5 -msgid "Aomori" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:6 -msgid "Iwate" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:7 -msgid "Miyagi" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:8 -msgid "Akita" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:9 -msgid "Yamagata" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:10 -msgid "Fukushima" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:11 -msgid "Ibaraki" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:12 -msgid "Tochigi" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:13 -msgid "Gunma" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:14 -msgid "Saitama" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:15 -msgid "Chiba" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:16 -msgid "Tokyo" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:17 -msgid "Kanagawa" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:18 -msgid "Yamanashi" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:19 -msgid "Nagano" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:20 -msgid "Niigata" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:21 -msgid "Toyama" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:22 -msgid "Ishikawa" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:23 -msgid "Fukui" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:24 -msgid "Gifu" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:25 -msgid "Shizuoka" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:26 -msgid "Aichi" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:27 -msgid "Mie" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:28 -msgid "Shiga" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:29 -msgid "Kyoto" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:30 -msgid "Osaka" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:31 -msgid "Hyogo" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:32 -msgid "Nara" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:33 -msgid "Wakayama" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:34 -msgid "Tottori" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:35 -msgid "Shimane" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:36 -msgid "Okayama" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:37 -msgid "Hiroshima" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:38 -msgid "Yamaguchi" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:39 -msgid "Tokushima" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:40 -msgid "Kagawa" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:41 -msgid "Ehime" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:42 -msgid "Kochi" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:43 -msgid "Fukuoka" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:44 -msgid "Saga" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:45 -msgid "Nagasaki" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:46 -msgid "Kumamoto" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:47 -msgid "Oita" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:48 -msgid "Miyazaki" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:49 -msgid "Kagoshima" -msgstr "" - -#: contrib/localflavor/jp/jp_prefectures.py:50 -msgid "Okinawa" -msgstr "" - -#: contrib/localflavor/it/forms.py:16 -#, -msgid "Enter a valid zip code." -msgstr "올바른 우편번호를 입력하세요." - -#: contrib/localflavor/it/forms.py:41 -#, -msgid "Enter a valid Social Security number." -msgstr "올바른 Social Security number를 입력하세요." - -#: contrib/localflavor/it/forms.py:68 -#, -msgid "Enter a valid VAT number." -msgstr "올바른 VAT번호를 입력하세요." - -#: contrib/localflavor/fi/forms.py:40 contrib/localflavor/fi/forms.py:45 -#, -msgid "Enter a valid Finnish social security number." -msgstr "올바른 핀란드 Social Security number를 입력하세요." - -#: contrib/localflavor/br/forms.py:18 -#, -msgid "Enter a zip code in the format XXXXX-XXX." -msgstr "우편번호는 XXXXX-XXX 형식으로 입력하세요." - -#: contrib/localflavor/br/forms.py:30 -#, fuzzy -msgid "Phone numbers must be in XX-XXXX-XXXX format." -msgstr "" -"전화번호는 xx-xxxx-xxxx 형식으로 입력하세요." - -#: contrib/localflavor/no/forms.py:15 -#, fuzzy -msgid "Enter a zip code in the format XXXX." -msgstr "우편번호를 입력하세요.(xxx xxx)" - -#: contrib/localflavor/no/forms.py:36 -#, fuzzy -msgid "Enter a valid Norwegian social security number." -msgstr "10진수를 사용해 주세요." - -#: contrib/localflavor/de/de_states.py:5 -msgid "Baden-Wuerttemberg" -msgstr "" - -#: contrib/localflavor/de/de_states.py:6 -msgid "Bavaria" -msgstr "" - -#: contrib/localflavor/de/de_states.py:7 -#, fuzzy -msgid "Berlin" -msgstr "브라질어" - -#: contrib/localflavor/de/de_states.py:8 -msgid "Brandenburg" -msgstr "" - -#: contrib/localflavor/de/de_states.py:9 -msgid "Bremen" -msgstr "" - -#: contrib/localflavor/de/de_states.py:10 -msgid "Hamburg" -msgstr "" - -#: contrib/localflavor/de/de_states.py:11 -#, fuzzy -msgid "Hessen" -msgstr "메시지" - -#: contrib/localflavor/de/de_states.py:12 -msgid "Mecklenburg-Western Pomerania" -msgstr "" - -#: contrib/localflavor/de/de_states.py:13 -msgid "Lower Saxony" -msgstr "" - -#: contrib/localflavor/de/de_states.py:14 -msgid "North Rhine-Westphalia" -msgstr "" - -#: contrib/localflavor/de/de_states.py:15 -msgid "Rhineland-Palatinate" -msgstr "" - -#: contrib/localflavor/de/de_states.py:16 -#, fuzzy -msgid "Saarland" -msgstr "카탈로니아어" - -#: contrib/localflavor/de/de_states.py:17 -msgid "Saxony" -msgstr "" - -#: contrib/localflavor/de/de_states.py:18 -msgid "Saxony-Anhalt" -msgstr "" - -#: contrib/localflavor/de/de_states.py:19 -msgid "Schleswig-Holstein" -msgstr "" - -#: contrib/localflavor/de/de_states.py:20 -msgid "Thuringia" -msgstr "" - -#: contrib/localflavor/de/forms.py:60 -msgid "" -"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " -"format." -msgstr "" - -#: contrib/localflavor/us/forms.py:18 -msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." -msgstr "우변번호를 입력하세요.(xxxxxx 또는 xxx-xxx)" - -#: contrib/localflavor/us/forms.py:51 -msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." -msgstr "" - -#: template/defaultfilters.py:491 -msgid "yes,no,maybe" -msgstr "예, 아니오, 아마도" - -#: template/defaultfilters.py:520 -#, python-format -msgid "%(size)d byte" -msgid_plural "%(size)d bytes" +msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." +msgid_plural "" +"Please enter valid %(self)s IDs. The values %(value)r are invalid." msgstr[0] "" +"올바른 %(self)s ID를 입력해 주세요. %(value)r (은)는 적절치 않습니다." msgstr[1] "" +"올바른 %(self)s ID를 입력해 주세요. %(value)r (은)는 적절치 않습니다." -#: template/defaultfilters.py:522 +#: forms/fields.py:54 +msgid "This field is required." +msgstr "필수 항목입니다." + +#: forms/fields.py:55 +msgid "Enter a valid value." +msgstr "올바른 값을 입력하세요." + +#: forms/fields.py:138 #, python-format -msgid "%.1f KB" +msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." msgstr "" +"%(max)d 글자 이하로 입력해 주세요. (입력하신 내용은 %(length)d 자입니다)" -#: template/defaultfilters.py:524 +#: forms/fields.py:139 #, python-format -msgid "%.1f MB" +msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." msgstr "" +"%(min)d 글자 이상 입력해 주세요. (입력하신 내용은 %(length)d 자입니다.)" -#: template/defaultfilters.py:525 +#: forms/fields.py:166 +msgid "Enter a whole number." +msgstr "정수를 입력하세요." + +#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225 #, python-format -msgid "%.1f GB" -msgstr "" +msgid "Ensure this value is less than or equal to %s." +msgstr "%s 이하의 값을 입력해 주세요." -#: oldforms/__init__.py:392 +#: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226 #, python-format -msgid "Ensure your text is less than %s character." -msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "%s 자 이하로 입력해 주세요." -msgstr[1] "%s 자 이하로 입력해 주세요." +msgid "Ensure this value is greater than or equal to %s." +msgstr "%s 이상의 값을 입력해 주세요." -#: oldforms/__init__.py:397 -msgid "Line breaks are not allowed here." -msgstr "줄바꿈이 허용되지 않습니다." +#: forms/fields.py:195 forms/fields.py:224 +msgid "Enter a number." +msgstr "숫자를 입력하세요." -#: oldforms/__init__.py:498 oldforms/__init__.py:571 oldforms/__init__.py:610 +#: forms/fields.py:227 #, python-format -msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -msgstr "올바르게 선택해 주세요. '%(data)s' (이)가 %(choices)s 에 없습니다." +msgid "Ensure that there are no more than %s digits in total." +msgstr "전체 자릿수가 %s 개를 넘지 않도록 해주세요." -#: oldforms/__init__.py:674 +#: forms/fields.py:228 +#, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "전체 유효자리 개수가 %s 개를 넘지 않도록 해주세요." + +#: forms/fields.py:229 +#, python-format +msgid "Ensure that there are no more than %s digits before the decimal point." +msgstr "소숫점 앞의 자릿수가 %s 개를 넘지 않도록 해주세요." + +#: forms/fields.py:288 forms/fields.py:863 +msgid "Enter a valid date." +msgstr "올바른 날짜를 입력하세요." + +#: forms/fields.py:322 forms/fields.py:864 +msgid "Enter a valid time." +msgstr "올바른 시각을 입력하세요." + +#: forms/fields.py:361 +msgid "Enter a valid date/time." +msgstr "올바른 날짜/시각을 입력하세요." + +#: forms/fields.py:447 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "등록된 파일이 없습니다. 인코딩 형식을 확인하세요." + +#: forms/fields.py:448 +msgid "No file was submitted." +msgstr "파일이 전송되지 않았습니다." + +#: forms/fields.py:449 msgid "The submitted file is empty." msgstr "입력하신 파일은 빈 파일입니다." -#: oldforms/__init__.py:730 -msgid "Enter a whole number between -32,768 and 32,767." -msgstr "-32,768 ~ 32,767 사이의 정수를 입력하세요." +#: forms/fields.py:450 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "" +"파일 이름은 %(max)d 글자 이하로 입력해 주세요. (입력하신 내용은 %(length)d 자" +"입니다)" -#: oldforms/__init__.py:740 -msgid "Enter a positive number." -msgstr "양수를 입력하세요." +#: forms/fields.py:483 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"올바른 이미지를 업로드하세요. 업로드하신 파일은 이미지 파일이 아니거나 파일" +"이 깨져 있습니다." -#: oldforms/__init__.py:750 -msgid "Enter a whole number between 0 and 32,767." -msgstr "0 ~ 32,767 사이의 정수를 입력하세요." +#: forms/fields.py:544 +msgid "Enter a valid URL." +msgstr "올바른 URL을 입력하세요." + +#: forms/fields.py:545 +msgid "This URL appears to be a broken link." +msgstr "해당 URL의 링크가 잘못 되어 있습니다." + +#: forms/fields.py:625 forms/fields.py:703 +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "올바르게 선택해 주세요. %(value)s (이)가 선택가능항목에 없습니다." + +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 +msgid "Enter a list of values." +msgstr "리스트를 입력하세요." + +#: forms/fields.py:892 +msgid "Enter a valid IPv4 address." +msgstr "올바른 IPv4 주소를 입력하세요." + +#: forms/fields.py:902 +msgid "" +"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +msgstr "문자, 숫자, '_', '-'만 가능합니다." + +#: forms/formsets.py:271 forms/formsets.py:273 +msgid "Order" +msgstr "순서:" + +#: forms/models.py:367 +#, python-format +msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." +msgstr "" +"%(field_name)s (은)는 반드시 %(date_field)s %(lookup)s 에 대해 유일해야 합니" +"다." + +#: forms/models.py:381 forms/models.py:389 +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "%(model_name)s의 %(field_label)s (은)는 이미 존재합니다." + +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "%(field)s의 중복된 데이터를 고쳐주세요." + +#: forms/models.py:598 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "%(field)s의 중복된 데이터를 고쳐주세요. 유일한 값이어야 합니다." + +#: forms/models.py:604 +#, 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:612 +msgid "Please correct the duplicate values below." +msgstr "아래의 중복된 값들을 고쳐주세요." + +#: forms/models.py:867 +msgid "The inline foreign key did not match the parent instance primary key." +msgstr "부모 오브젝트의 primary key와 inline foreign key가 맞지 않습니다." + +#: forms/models.py:930 +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "올바르게 선택해 주세요. 선택하신 것이 선택가능항목에 없습니다." + +#: forms/models.py:1004 +#, python-format +msgid "Select a valid choice. %s is not one of the available choices." +msgstr "올바르게 선택해 주세요. %s (이)가 선택가능항목에 없습니다." + +#: forms/models.py:1006 +#, python-format +msgid "\"%s\" is not a valid value for a primary key." +msgstr "\"%s\"은 primary key로 적합하지 않습니다." + +#: template/defaultfilters.py:767 +msgid "yes,no,maybe" +msgstr "예,아니오,아마도" + +#: template/defaultfilters.py:798 +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "%(size)d 바이트" +msgstr[1] "%(size)d 바이트" + +#: template/defaultfilters.py:800 +#, python-format +msgid "%.1f KB" +msgstr "%.1f KB" + +#: template/defaultfilters.py:802 +#, python-format +msgid "%.1f MB" +msgstr "%.1f MB" + +#: template/defaultfilters.py:803 +#, python-format +msgid "%.1f GB" +msgstr "%.1f GB" + +#: utils/dateformat.py:42 +msgid "p.m." +msgstr "오후" + +#: utils/dateformat.py:43 +msgid "a.m." +msgstr "오전" + +#: utils/dateformat.py:48 +msgid "PM" +msgstr "오후" + +#: utils/dateformat.py:49 +msgid "AM" +msgstr "오전" + +#: utils/dateformat.py:98 +msgid "midnight" +msgstr "자정" + +#: utils/dateformat.py:100 +msgid "noon" +msgstr "정오" + +#: utils/dates.py:6 +msgid "Monday" +msgstr "월요일" + +#: utils/dates.py:6 +msgid "Tuesday" +msgstr "화요일" + +#: utils/dates.py:6 +msgid "Wednesday" +msgstr "수요일" + +#: utils/dates.py:6 +msgid "Thursday" +msgstr "목요일" + +#: utils/dates.py:6 +msgid "Friday" +msgstr "금요일" + +#: utils/dates.py:7 +msgid "Saturday" +msgstr "토요일" + +#: utils/dates.py:7 +msgid "Sunday" +msgstr "일요일" + +#: utils/dates.py:10 +msgid "Mon" +msgstr "월요일" + +#: utils/dates.py:10 +msgid "Tue" +msgstr "화요일" + +#: utils/dates.py:10 +msgid "Wed" +msgstr "수요일" + +#: utils/dates.py:10 +msgid "Thu" +msgstr "목요일" + +#: utils/dates.py:10 +msgid "Fri" +msgstr "금요일" + +#: utils/dates.py:11 +msgid "Sat" +msgstr "토요일" + +#: utils/dates.py:11 +msgid "Sun" +msgstr "일요일" + +#: utils/dates.py:18 +msgid "January" +msgstr "1월" + +#: utils/dates.py:18 +msgid "February" +msgstr "2월" + +#: utils/dates.py:18 utils/dates.py:31 +msgid "March" +msgstr "3월" + +#: utils/dates.py:18 utils/dates.py:31 +msgid "April" +msgstr "4월" + +#: utils/dates.py:18 utils/dates.py:31 +msgid "May" +msgstr "5월" + +#: utils/dates.py:18 utils/dates.py:31 +msgid "June" +msgstr "6월" + +#: utils/dates.py:19 utils/dates.py:31 +msgid "July" +msgstr "7월" + +#: utils/dates.py:19 +msgid "August" +msgstr "8월" + +#: utils/dates.py:19 +msgid "September" +msgstr "9월" + +#: utils/dates.py:19 +msgid "October" +msgstr "10월" + +#: utils/dates.py:19 +msgid "November" +msgstr "11월" + +#: utils/dates.py:20 +msgid "December" +msgstr "12월" + +#: utils/dates.py:23 +msgid "jan" +msgstr "1월" + +#: utils/dates.py:23 +msgid "feb" +msgstr "2월" + +#: utils/dates.py:23 +msgid "mar" +msgstr "3월" + +#: utils/dates.py:23 +msgid "apr" +msgstr "4월" + +#: utils/dates.py:23 +msgid "may" +msgstr "5월" + +#: utils/dates.py:23 +msgid "jun" +msgstr "6월" + +#: utils/dates.py:24 +msgid "jul" +msgstr "7월" + +#: utils/dates.py:24 +msgid "aug" +msgstr "8월" + +#: utils/dates.py:24 +msgid "sep" +msgstr "9월" + +#: utils/dates.py:24 +msgid "oct" +msgstr "10월" + +#: utils/dates.py:24 +msgid "nov" +msgstr "11월" + +#: utils/dates.py:24 +msgid "dec" +msgstr "12월" + +#: utils/dates.py:31 +msgid "Jan." +msgstr "1월" + +#: utils/dates.py:31 +msgid "Feb." +msgstr "2월" + +#: utils/dates.py:32 +msgid "Aug." +msgstr "8월" + +#: utils/dates.py:32 +msgid "Sept." +msgstr "9월" + +#: utils/dates.py:32 +msgid "Oct." +msgstr "10월" + +#: utils/dates.py:32 +msgid "Nov." +msgstr "11월" + +#: utils/dates.py:32 +msgid "Dec." +msgstr "12월" + +#: utils/text.py:128 +msgid "or" +msgstr "또는" + +#: utils/timesince.py:21 +msgid "year" +msgid_plural "years" +msgstr[0] "년" +msgstr[1] "년" + +#: utils/timesince.py:22 +msgid "month" +msgid_plural "months" +msgstr[0] "개월" +msgstr[1] "개월" + +#: utils/timesince.py:23 +msgid "week" +msgid_plural "weeks" +msgstr[0] "주" +msgstr[1] "주" + +#: utils/timesince.py:24 +msgid "day" +msgid_plural "days" +msgstr[0] "일" +msgstr[1] "일" + +#: utils/timesince.py:25 +msgid "hour" +msgid_plural "hours" +msgstr[0] "시간" +msgstr[1] "시간" + +#: utils/timesince.py:26 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "분" +msgstr[1] "분" + +#: utils/timesince.py:45 +msgid "minutes" +msgstr "분" + +#: utils/timesince.py:50 +#, python-format +msgid "%(number)d %(type)s" +msgstr "%(number)d%(type)s" + +#: utils/timesince.py:56 +#, python-format +msgid ", %(number)d %(type)s" +msgstr ", %(number)d%(type)s" + +#: utils/translation/trans_real.py:399 +msgid "DATE_FORMAT" +msgstr "날짜 형식" + +#: utils/translation/trans_real.py:401 +msgid "TIME_FORMAT" +msgstr "시간 형식" + +#: utils/translation/trans_real.py:417 +msgid "YEAR_MONTH_FORMAT" +msgstr "년도/월 형식" + +#: utils/translation/trans_real.py:418 +msgid "MONTH_DAY_FORMAT" +msgstr "월/일 형식" + +#: views/generic/create_update.py:114 +#, python-format +msgid "The %(verbose_name)s was created successfully." +msgstr "%(verbose_name)s (이)가 생성되었습니다." + +#: views/generic/create_update.py:156 +#, python-format +msgid "The %(verbose_name)s was updated successfully." +msgstr "%(verbose_name)s (이)가 수정되었습니다." + +#: views/generic/create_update.py:198 +#, python-format +msgid "The %(verbose_name)s was deleted." +msgstr "%(verbose_name)s (이)가 삭제되었습니다." diff --git a/django/conf/locale/ko/LC_MESSAGES/djangojs.mo b/django/conf/locale/ko/LC_MESSAGES/djangojs.mo index cdc19a15f3..9a43c98456 100644 Binary files a/django/conf/locale/ko/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ko/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ko/LC_MESSAGES/djangojs.po b/django/conf/locale/ko/LC_MESSAGES/djangojs.po index fe1c7a453a..c68e1d0225 100644 --- a/django/conf/locale/ko/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ko/LC_MESSAGES/djangojs.po @@ -1,14 +1,13 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Django Korean Translation (Javascripts) +# Copyright (C) 2009 +# This file is distributed under the same license as the django package. +# Hyun Mi Ae, Joongi Kim (me@daybreaker.info), Sung-Jin Hong (serialx.net@gmail.com) # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-06 11:10+0900\n" +"POT-Creation-Date: 2009-07-20 00:51+0900\n" "PO-Revision-Date: 2007-04-06 11:15+0900\n" "Last-Translator: Hyun Mi Ae \n" "Language-Team: Korean\n" @@ -16,21 +15,6 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/admin/media/js/calendar.js:24 -#: contrib/admin/media/js/dateparse.js:32 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "1월 2월 3월 4월 5월 6월 7월 8월 9월 10월 11월 12월" - -#: contrib/admin/media/js/calendar.js:25 -msgid "S M T W T F S" -msgstr "일 월 화 수 목 금 토" - -#: contrib/admin/media/js/dateparse.js:33 -msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" -msgstr "일요일 월요일 화요일 수요일 목요일 금요일 토요일" - #: contrib/admin/media/js/SelectFilter2.js:33 #, perl-format msgid "Available %s" @@ -61,6 +45,21 @@ msgstr "선택한 후 클릭하세요" msgid "Clear all" msgstr "모두 삭제" +#: contrib/admin/media/js/calendar.js:24 +#: contrib/admin/media/js/dateparse.js:32 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "1월 2월 3월 4월 5월 6월 7월 8월 9월 10월 11월 12월" + +#: contrib/admin/media/js/calendar.js:25 +msgid "S M T W T F S" +msgstr "일 월 화 수 목 금 토" + +#: contrib/admin/media/js/dateparse.js:33 +msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" +msgstr "일요일 월요일 화요일 수요일 목요일 금요일 토요일" + #: contrib/admin/media/js/admin/CollapsedFieldsets.js:34 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:72 msgid "Show" diff --git a/django/conf/locale/mk/LC_MESSAGES/django.mo b/django/conf/locale/mk/LC_MESSAGES/django.mo index 6671ee24c9..7796e56624 100644 Binary files a/django/conf/locale/mk/LC_MESSAGES/django.mo and b/django/conf/locale/mk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/mk/LC_MESSAGES/django.po b/django/conf/locale/mk/LC_MESSAGES/django.po index 783bf821c5..b1aa6fae1d 100644 --- a/django/conf/locale/mk/LC_MESSAGES/django.po +++ b/django/conf/locale/mk/LC_MESSAGES/django.po @@ -1,10 +1,9 @@ # translation of django.po to Macedonian - msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-01 04:27+0100\n" +"POT-Creation-Date: 2009-07-24 21:56+0200\n" "PO-Revision-Date: 2008-09-03 11:20+0200\n" "Last-Translator: Vasil Vangelovski \n" "Language-Team: Macedonian \n" @@ -218,52 +217,70 @@ msgstr "Упростен кинески" msgid "Traditional Chinese" msgstr "Традиционален кинески" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Успешно беа избришани %(count)d %(items)s." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 +msgid "Are you sure?" +msgstr "Сигурни сте?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Избриши ги избраните %(verbose_name_plural)s" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" "

                      By %s:

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

                        Од %s:

                        \n" +"

                        Според %s:

                        \n" "
                          \n" -#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91 -#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172 +#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 msgid "All" msgstr "Сите" -#: contrib/admin/filterspecs.py:112 +#: contrib/admin/filterspecs.py:113 msgid "Any date" msgstr "Било кој датум" -#: contrib/admin/filterspecs.py:113 +#: contrib/admin/filterspecs.py:114 msgid "Today" msgstr "Денеска" -#: contrib/admin/filterspecs.py:116 +#: contrib/admin/filterspecs.py:117 msgid "Past 7 days" msgstr "Последните 7 дена" -#: contrib/admin/filterspecs.py:118 +#: contrib/admin/filterspecs.py:119 msgid "This month" msgstr "Овој месец" -#: contrib/admin/filterspecs.py:120 +#: contrib/admin/filterspecs.py:121 msgid "This year" msgstr "Оваа година" -#: contrib/admin/filterspecs.py:146 forms/widgets.py:390 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Да" -#: contrib/admin/filterspecs.py:146 forms/widgets.py:390 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Не" -#: contrib/admin/filterspecs.py:153 forms/widgets.py:390 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Непознато" +#: contrib/admin/helpers.py:14 +msgid "Action:" +msgstr "Акција:" + #: contrib/admin/models.py:19 msgid "action time" msgstr "време на акција" @@ -292,101 +309,105 @@ msgstr "ставка во записникот" msgid "log entries" msgstr "ставки во записникот" -#: contrib/admin/options.py:60 contrib/admin/options.py:121 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" msgstr "Ништо" -#: contrib/admin/options.py:338 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Изменета %s." -#: contrib/admin/options.py:338 contrib/admin/options.py:348 -#: contrib/comments/templates/comments/preview.html:15 forms/models.py:288 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "и" -#: contrib/admin/options.py:343 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Додадено %(name)s „%(object)s“." -#: contrib/admin/options.py:347 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr " Изменето %(list)s за %(name)s „%(object)s“." -#: contrib/admin/options.py:352 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Избришан %(name)s „%(object)s“." -#: contrib/admin/options.py:356 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Не беше изменето ниедно поле." -#: contrib/admin/options.py:417 contrib/auth/admin.py:51 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "%(name)s \"%(obj)s\" беше успешно додаден." +msgstr "Ставката %(name)s \"%(obj)s\" беше успешно додадена." -#: contrib/admin/options.py:421 contrib/admin/options.py:454 -#: contrib/auth/admin.py:59 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 +#: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Подолу можете повторно да го уредите." -#: contrib/admin/options.py:431 contrib/admin/options.py:464 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Подолу можете да додате уште еден %s." -#: contrib/admin/options.py:452 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" беше успешно изменета." -#: contrib/admin/options.py:460 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -"%(name)s \"%(obj)s\" беше успешно додадена.Подолу можете повторно да ја " -"уредите." +"Ставката %(name)s \"%(obj)s\" беше успешно додадена. Подолу можете повторно " +"да ја уредите." -#: contrib/admin/options.py:528 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Додади %s" -#: contrib/admin/options.py:559 contrib/admin/options.py:673 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "" +msgstr "објект %(name)s со примарен клуч %(key)r не постои." -#: contrib/admin/options.py:606 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Измени %s" -#: contrib/admin/options.py:638 +#: contrib/admin/options.py:905 msgid "Database error" -msgstr "Грешка во базата со податоци" +msgstr "Грешка во базата на податоци" -#: contrib/admin/options.py:688 +#: contrib/admin/options.py:941 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s ставка %(name)s беше успешно изменета." +msgstr[1] "%(count)s ставки %(name)s беа успешно изменети." + +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" беше избришана успешно." +msgstr "Ставаката %(name)s \"%(obj)s\" беше избришана успешно." -#: contrib/admin/options.py:695 -msgid "Are you sure?" -msgstr "Сигурни сте?" - -#: contrib/admin/options.py:724 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Историја на измени: %s" -#: contrib/admin/sites.py:16 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -395,11 +416,11 @@ msgstr "" "Ве молам внесете точно корисничко име и лозинка. Имајте на ум дека и во " "двете полиња се битни големите и малите букви." -#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Ве молам најавете се повторно бидејќи вашата сесија е истечена." -#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -407,62 +428,62 @@ msgstr "" "Изгледа дека вашиот прелистувач не е конфигуриран да прифаќа колачиња. Ве " "молам овозможете ги колачињата, превчитајте ја страта и пробајте повторно." -#: contrib/admin/sites.py:249 contrib/admin/sites.py:255 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Корисничките имиња неможе да го содржат „@“ знакот." -#: contrib/admin/sites.py:252 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Вашата е-пошта не е вашето корисничко име. Пробајте со „%s“." -#: contrib/admin/sites.py:312 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Администрација на сајт" -#: contrib/admin/sites.py:325 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Најава" -#: contrib/admin/sites.py:372 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "%s администрација" -#: contrib/admin/util.py:138 +#: contrib/admin/util.py:168 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Еден или повеќе %(fieldname)s во %(name)s: %(obj)s" -#: contrib/admin/util.py:143 +#: contrib/admin/util.py:173 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Еден или повеќе %(fieldname)s во %(name)s:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Date:" msgstr "Датум:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Time:" msgstr "Време:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Currently:" msgstr "Моментално:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Change:" msgstr "Измена:" -#: contrib/admin/widgets.py:123 +#: contrib/admin/widgets.py:124 msgid "Lookup" msgstr "Побарај" -#: contrib/admin/widgets.py:230 +#: contrib/admin/widgets.py:236 msgid "Add Another" msgstr "Додади друго" @@ -477,10 +498,11 @@ msgstr "Се извинуваме, но неможе да ја најдеме с #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:8 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 #: contrib/admin/templates/admin/object_history.html:6 #: contrib/admin/templates/admin/auth/user/change_password.html:10 @@ -515,32 +537,40 @@ msgstr "" "Имаше грешка. Истата беше пријавена на администраторите и ќе биде поправена " "во брзо време. Ви благодариме за вашето трпение." +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Изврши ја избраната акција" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Оди" + #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 #, python-format msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Добредојдовте," -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Документација" -#: contrib/admin/templates/admin/base.html:28 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/admin/base.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" msgstr "Промени лозинка" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -571,23 +601,24 @@ msgid "View on site" msgstr "Погледни на сајтот" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/auth/user/change_password.html:22 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Ве молам поправете ја грешката подолу." msgstr[1] "Ве молам поправете ги грешките подолу." -#: contrib/admin/templates/admin/change_list.html:16 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" msgstr "Додади %(name)s" -#: contrib/admin/templates/admin/change_list.html:26 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "Филтер" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 msgid "Delete" msgstr "Избриши" @@ -612,13 +643,37 @@ msgstr "" "Сите овие ставки ќе бидат избришани:" #: contrib/admin/templates/admin/delete_confirmation.html:28 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:33 msgid "Yes, I'm sure" msgstr "Да, сигурен сум" +#: contrib/admin/templates/admin/delete_selected_confirmation.html:9 +msgid "Delete multiple objects" +msgstr "Избриши повеќе ставки" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:15 +msgid "" +"Deleting the %(object_name)s would result in deleting related objects, but " +"your account doesn't have permission to delete the following types of " +"objects:" +msgstr "" +"Бришење на %(object_name)s би резултирало со бришење на " +"поврзаните објекти, но вие како корисник немате доволно привилегии да ги " +"бришете следните типови на објекти:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:22 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(object_name)s objects? All of " +"the following objects and it's related items will be deleted:" +msgstr "" +"Сигурне сте дека сакате да ги избришете избраните %(object_name)s? Сите овие " +"ставки и ставките поврзани со нив ќе бидат избришани:" + #: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " -msgstr " Од %(filter_title)s " +msgstr " Според %(filter_title)s " #: contrib/admin/templates/admin/index.html:18 #, python-format @@ -645,6 +700,10 @@ msgstr "Мои акции" msgid "None available" msgstr "Ништо не е достапно" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Непозната содржина" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -677,7 +736,7 @@ msgid "Action" msgstr "Акција" #: contrib/admin/templates/admin/object_history.html:30 -#: utils/translation/trans_real.py:404 +#: utils/translation/trans_real.py:400 msgid "DATETIME_FORMAT" msgstr "j M Y, P" @@ -693,9 +752,14 @@ msgstr "" msgid "Show all" msgstr "Прикажи ги сите" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Сними" + #: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Оди" +msgid "Search" +msgstr "Барај" #: contrib/admin/templates/admin/search_form.html:10 #, python-format @@ -709,10 +773,6 @@ msgstr[1] "%(counter)s резултати" msgid "%(full_result_count)s total" msgstr "вкупно %(full_result_count)s" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Сними" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Сними како нова" @@ -739,23 +799,23 @@ msgid "Username" msgstr "Корисник" #: contrib/admin/templates/admin/auth/user/add_form.html:20 -#: contrib/admin/templates/admin/auth/user/change_password.html:33 -#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 msgid "Password" msgstr "Лозинка" #: contrib/admin/templates/admin/auth/user/add_form.html:26 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/auth/forms.py:185 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/auth/forms.py:186 msgid "Password (again)" msgstr "Лозинка (повторно)" #: contrib/admin/templates/admin/auth/user/add_form.html:27 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 msgid "Enter the same password as above, for verification." msgstr "Заради верификација внесете ја истата лозинка како и горе." -#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "Внесете нова лозинка за корисникот %(username)s." @@ -771,7 +831,7 @@ msgstr "" #: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" -msgstr "Логирајте се повторно" +msgstr "Најавете се повторно" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -918,166 +978,167 @@ msgstr "Е-пошта:" msgid "Reset my password" msgstr "Ресетирај ја мојата лозинка" -#: contrib/admin/templatetags/admin_list.py:284 +#: contrib/admin/templatetags/admin_list.py:299 msgid "All dates" msgstr "Сите датуми" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s" -msgstr "Изберет %s" +msgstr "Изберете %s" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s to change" msgstr "Изберете %s за измена" -#: contrib/admin/views/template.py:36 contrib/sites/models.py:38 +#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 msgid "site" msgstr "сајт" -#: contrib/admin/views/template.py:38 +#: contrib/admin/views/template.py:39 msgid "template" msgstr "шаблон" -#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59 -#: contrib/admindocs/views.py:61 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "таг:" -#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92 -#: contrib/admindocs/views.py:94 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "филтер:" -#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156 -#: contrib/admindocs/views.py:158 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "поглед:" -#: contrib/admindocs/views.py:186 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Не е најдена апликацијата %r" -#: contrib/admindocs/views.py:193 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Моделот %(model_name)r не е најден во апликацијата %(app_label)r" -#: contrib/admindocs/views.py:205 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "поврзаниот `%(app_label)s.%(data_type)s` објект" -#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227 -#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "модел:" -#: contrib/admindocs/views.py:236 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "поврзани `%(app_label)s.%(object_name)s` објекти" -#: contrib/admindocs/views.py:241 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "сите %s" -#: contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "број на %s" -#: contrib/admindocs/views.py:251 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Полиња на %s објекти" -#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325 -#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333 -#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Цел број" -#: contrib/admindocs/views.py:315 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Логичка (или точно или неточно)" -#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "Збор (до %(max_length)s)" -#: contrib/admindocs/views.py:317 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Целобројни вредности одделени со запирка" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Датум (без час)" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Датум (со час)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Децимален број" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "Адреса на е-пошта" -#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323 -#: contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Патека на датотека" -#: contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Децимален број" -#: contrib/admindocs/views.py:328 contrib/comments/models.py:58 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "ИП адреса" -#: contrib/admindocs/views.py:330 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Логичка (точно,неточно или празно)" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Релација со родителскиот модел" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Телефонски број" -#: contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Текст" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Час" -#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:340 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "Држава во САД (две големи букви)" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "XML текст" -#: contrib/admindocs/views.py:367 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s не изгледа дека е url објект" @@ -1168,21 +1229,21 @@ msgstr "Важни датуми" msgid "Groups" msgstr "Групи" -#: contrib/auth/admin.py:64 +#: contrib/auth/admin.py:80 msgid "Add user" msgstr "Додади корисник" -#: contrib/auth/admin.py:90 +#: contrib/auth/admin.py:106 msgid "Password changed successfully." msgstr "Успешна промена на лозинката." -#: contrib/auth/admin.py:96 +#: contrib/auth/admin.py:112 #, python-format msgid "Change password: %s" msgstr "Промени лозинка: %s" #: contrib/auth/forms.py:15 contrib/auth/forms.py:48 -#: contrib/auth/models.py:127 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." @@ -1202,8 +1263,8 @@ msgstr "Потврда на лозинка" msgid "A user with that username already exists." msgstr "Веќе постои корисник со тоа корисничко име." -#: contrib/auth/forms.py:36 contrib/auth/forms.py:154 -#: contrib/auth/forms.py:196 +#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:197 msgid "The two password fields didn't match." msgstr "Двете полиња со лозинките не се совпаѓаат." @@ -1231,24 +1292,24 @@ msgstr "" "Нема регистрирано корисник со оваа адреса за е-пошта. Сигурни ли сте дека " "сте регистрирани?" -#: contrib/auth/forms.py:134 +#: contrib/auth/forms.py:135 #, python-format msgid "Password reset on %s" msgstr "Ресетирање на лозинка на %s" -#: contrib/auth/forms.py:142 +#: contrib/auth/forms.py:143 msgid "New password" msgstr "Нова лозинка" -#: contrib/auth/forms.py:143 +#: contrib/auth/forms.py:144 msgid "New password confirmation" msgstr "Потврда за нова лозинка" -#: contrib/auth/forms.py:168 +#: contrib/auth/forms.py:169 msgid "Old password" msgstr "Стара лозинка" -#: contrib/auth/forms.py:176 +#: contrib/auth/forms.py:177 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Не ја внесовте точно вашата стара лозинка. Ве молам внесете ја повторно." @@ -1273,31 +1334,31 @@ msgstr "привилегии" msgid "group" msgstr "група" -#: contrib/auth/models.py:91 contrib/auth/models.py:137 +#: contrib/auth/models.py:91 contrib/auth/models.py:138 msgid "groups" msgstr "групи" -#: contrib/auth/models.py:127 +#: contrib/auth/models.py:128 msgid "username" msgstr "корисничко име" -#: contrib/auth/models.py:128 +#: contrib/auth/models.py:129 msgid "first name" msgstr "име" -#: contrib/auth/models.py:129 +#: contrib/auth/models.py:130 msgid "last name" msgstr "презиме" -#: contrib/auth/models.py:130 +#: contrib/auth/models.py:131 msgid "e-mail address" msgstr "е-пошта" -#: contrib/auth/models.py:131 +#: contrib/auth/models.py:132 msgid "password" msgstr "лозинка" -#: contrib/auth/models.py:131 +#: contrib/auth/models.py:132 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." @@ -1305,20 +1366,20 @@ msgstr "" "Користете '[algo]$[salt]$[hexdigest]' или користете ја формата за промена на лозинката." -#: contrib/auth/models.py:132 +#: contrib/auth/models.py:133 msgid "staff status" msgstr "статус на администраторите" -#: contrib/auth/models.py:132 +#: contrib/auth/models.py:133 msgid "Designates whether the user can log into this admin site." msgstr "" "Означува дали корисникот може да се логира во сајтот за администрација." -#: contrib/auth/models.py:133 +#: contrib/auth/models.py:134 msgid "active" msgstr "активен" -#: contrib/auth/models.py:133 +#: contrib/auth/models.py:134 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -1326,11 +1387,11 @@ msgstr "" "Означува дали корисникот треба да биде активен. Одштиклирајте го ова наместо " "да бришете корисници." -#: contrib/auth/models.py:134 +#: contrib/auth/models.py:135 msgid "superuser status" msgstr "статус на суперкорисник" -#: contrib/auth/models.py:134 +#: contrib/auth/models.py:135 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -1338,15 +1399,15 @@ msgstr "" "Означува дека овој корисник ги има сите привилегии без експлицитно да се " "доделуваат сите." -#: contrib/auth/models.py:135 +#: contrib/auth/models.py:136 msgid "last login" msgstr "последна најава" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:137 msgid "date joined" msgstr "датум на зачленување" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:139 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." @@ -1354,27 +1415,28 @@ msgstr "" "Како дополнување на рачно доделени привилегии, овој корисник ќе ги добие " "автоматски и сите привилегии за секоја група во која тој/таа членува." -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:140 msgid "user permissions" msgstr "кориснички привилегии" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "корисник" -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:145 msgid "users" msgstr "корисници" -#: contrib/auth/models.py:300 +#: contrib/auth/models.py:301 msgid "message" msgstr "порака" -#: contrib/auth/views.py:50 +#: contrib/auth/views.py:56 msgid "Logged out" msgstr "Одјавен" -#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428 +#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 msgid "Enter a valid e-mail address." msgstr "Внесeте правилна адреса за е-пошта." @@ -1386,72 +1448,87 @@ msgstr "Содржина" msgid "Metadata" msgstr "Метаподатоци" -#: contrib/comments/forms.py:19 +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "коментари за %(site_name)s" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Последни коментари за %(site_name)s" + +#: contrib/comments/forms.py:93 #: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" msgstr "Име" -#: contrib/comments/forms.py:20 +#: contrib/comments/forms.py:94 msgid "Email address" msgstr "Е-пошта" -#: contrib/comments/forms.py:22 +#: contrib/comments/forms.py:96 #: contrib/comments/templates/comments/moderation_queue.html:35 msgid "Comment" msgstr "Коментар" -#: contrib/comments/forms.py:25 -msgid "" -"If you enter anything in this field your comment will be treated as spam" -msgstr "" -"Ако внесете нешто во ова поле вашиот коментар ќе биде означен како спам" - -#: contrib/comments/forms.py:125 +#: contrib/comments/forms.py:173 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Внимавајте на јазикот. Тука не е дозволен зборот %s." msgstr[1] "Внимавајте на јазикот. Тука не се дозволени зборовите %s." -#: contrib/comments/models.py:23 +#: contrib/comments/forms.py:180 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "" +"Ако внесете нешто во ова поле вашиот коментар ќе биде означен како спам" + +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "тип на содржина" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "object ID" -#: contrib/comments/models.py:50 +#: contrib/comments/models.py:52 msgid "user's name" msgstr "името на корисникот" -#: contrib/comments/models.py:51 +#: contrib/comments/models.py:53 msgid "user's email address" msgstr "е-пошта на корисникот" -#: contrib/comments/models.py:52 +#: contrib/comments/models.py:54 msgid "user's URL" msgstr "веб страна на корсникот" -#: contrib/comments/models.py:54 +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "коментар" -#: contrib/comments/models.py:57 +#: contrib/comments/models.py:59 msgid "date/time submitted" msgstr "датум/време пријавен" -#: contrib/comments/models.py:59 +#: contrib/comments/models.py:61 msgid "is public" msgstr "е јавен" -#: contrib/comments/models.py:60 +#: contrib/comments/models.py:62 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "" "Одштиклирајте го ова за да направите коментаров да исчезне од овој сајт." -#: contrib/comments/models.py:62 +#: contrib/comments/models.py:64 msgid "is removed" msgstr "е отстранет" -#: contrib/comments/models.py:63 +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." @@ -1459,7 +1536,11 @@ msgstr "" "Штиклирајте го ова поле ако коментарот не е пригоден. Наместо него пораката " "„Овој коментар беше отстранет“ ќе биде прикажана." -#: contrib/comments/models.py:115 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "коментари" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." @@ -1467,7 +1548,7 @@ msgstr "" "Овој коментар бил пратен од автентициран корисник и затоа името е заштитено " "од промена." -#: contrib/comments/models.py:124 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." @@ -1475,7 +1556,7 @@ msgstr "" "Овој коментар бил пратен од автентициран корисник и затоа е-пошта е " "заштитена од промена." -#: contrib/comments/models.py:149 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1490,6 +1571,22 @@ msgstr "" "\n" "http://%(domain)s%(url)s" +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "обележи" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "датум" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "обележје за коментар" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "обележја за коментари" + #: contrib/comments/templates/comments/approve.html:4 msgid "Approve a comment" msgstr "Одобри коментар" @@ -1512,7 +1609,9 @@ msgstr "Ви благодариме што одобривте" #: contrib/comments/templates/comments/flagged.html:7 msgid "" "Thanks for taking the time to improve the quality of discussion on our site" -msgstr "Ви благодариме што допринесовте да се подобри квалитетот на дискусиите на нашиот сајт" +msgstr "" +"Ви благодариме што допринесовте да се подобри квалитетот на дискусиите на " +"нашиот сајт" #: contrib/comments/templates/comments/delete.html:4 msgid "Remove a comment" @@ -1547,13 +1646,13 @@ msgstr "Обележи" msgid "Thanks for flagging" msgstr "Ви благодариме што обележавте" -#: contrib/comments/templates/comments/form.html:16 -#: contrib/comments/templates/comments/preview.html:31 +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 msgid "Post" msgstr "Објави" -#: contrib/comments/templates/comments/form.html:17 -#: contrib/comments/templates/comments/preview.html:32 +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 msgid "Preview" msgstr "Преглед" @@ -1599,33 +1698,29 @@ msgid "Thank you for your comment" msgstr "Ви благодариме за коментарот" #: contrib/comments/templates/comments/preview.html:4 -#: contrib/comments/templates/comments/preview.html:12 +#: contrib/comments/templates/comments/preview.html:13 msgid "Preview your comment" msgstr "Прегледајте го вашиот коментар" -#: contrib/comments/templates/comments/preview.html:10 +#: contrib/comments/templates/comments/preview.html:11 msgid "Please correct the error below" msgid_plural "Please correct the errors below" msgstr[0] "Ве молам поправете ја грешката подолу." msgstr[1] "Ве молам поправете ги грешките подолу." -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "Post your comment" msgstr "Објавете го вашиот коментар" -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "or make changes" msgstr "или направете измени" -#: contrib/contenttypes/models.py:67 +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "име на класата за python моделoт" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "тип на содржина" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "типови содржини" @@ -1633,8 +1728,8 @@ msgstr "типови содржини" msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -"На пр. „/за_сајтот/контакт/“. Осигурајте се да имате коса црта и на крајот и на " -"почетокот." +"На пр. „/за_сајтот/контакт/“. Осигурајте се да имате коса црта и на крајот и " +"на почетокот." #: contrib/flatpages/admin.py:11 msgid "" @@ -1697,17 +1792,25 @@ msgstr "" "Се извинуваме но вашата форма истече. Ве молам продолжете пополнувајќи ја " "формата од оваа страница." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Не е внесена геометриска вредност." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." -msgstr "невалидна геометриска вредност." +msgstr "Невалидна геометриска вредност." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." -msgstr "невалиден геометриски тип." +msgstr "Невалиден геометриски тип." + +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"Се појави грешка при трансформација на геометриската вредност во SRID од " +"геометриското поле" #: contrib/humanize/templatetags/humanize.py:19 msgid "th" @@ -2030,6 +2133,84 @@ msgstr "Внесете правилен RUT за Чиле. Форматот е X msgid "The Chilean RUT is not valid." msgstr "RUT бројот за Чиле е невалиден." +#: contrib/localflavor/cz/cz_regions.py:8 +msgid "Prague" +msgstr "Прага" + +#: contrib/localflavor/cz/cz_regions.py:9 +msgid "Central Bohemian Region" +msgstr "Централен Бохемиски регион" + +#: contrib/localflavor/cz/cz_regions.py:10 +msgid "South Bohemian Region" +msgstr "Јужен Бохемиски регион" + +#: contrib/localflavor/cz/cz_regions.py:11 +msgid "Pilsen Region" +msgstr "Пилзенски регион" + +#: contrib/localflavor/cz/cz_regions.py:12 +msgid "Carlsbad Region" +msgstr "Карлсбадски регион" + +#: contrib/localflavor/cz/cz_regions.py:13 +msgid "Usti Region" +msgstr "Усти регион" + +#: contrib/localflavor/cz/cz_regions.py:14 +msgid "Liberec Region" +msgstr "Либерец регион" + +#: contrib/localflavor/cz/cz_regions.py:15 +msgid "Hradec Region" +msgstr "Храдец регион" + +#: contrib/localflavor/cz/cz_regions.py:16 +msgid "Pardubice Region" +msgstr "Пардубице регион" + +#: contrib/localflavor/cz/cz_regions.py:17 +msgid "Vysocina Region" +msgstr "Висоцина регион" + +#: contrib/localflavor/cz/cz_regions.py:18 +msgid "South Moravian Region" +msgstr "Јужно Моравски регион" + +#: contrib/localflavor/cz/cz_regions.py:19 +msgid "Olomouc Region" +msgstr "Оломуц регион" + +#: contrib/localflavor/cz/cz_regions.py:20 +msgid "Zlin Region" +msgstr "Зилина регион" + +#: contrib/localflavor/cz/cz_regions.py:21 +msgid "Moravian-Silesian Region" +msgstr "Моравско-Силесански регион" + +#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "Внесете поштенски број во форматот XXXXX или XXX XX." + +#: contrib/localflavor/cz/forms.py:47 +msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." +msgstr "Внесете даночен број (NIP) во форматот XXXXXX/XXXX или XXXXXXXXXX." + +#: contrib/localflavor/cz/forms.py:48 +msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" +msgstr "" +"Невалидна вредност за опционален параметар пол, валидни вредности се 'f' и " +"'m'" + +#: contrib/localflavor/cz/forms.py:49 +msgid "Enter a valid birth number." +msgstr "Внесете правилен даночен број." + +#: contrib/localflavor/cz/forms.py:106 +msgid "Enter a valid IC number." +msgstr "Внесете правилен даночен број." + #: contrib/localflavor/de/de_states.py:5 msgid "Baden-Wuerttemberg" msgstr "Баден-Вуертемберг" @@ -2855,17 +3036,17 @@ msgstr "" msgid "Wrong checksum for the Tax Number (NIP)." msgstr "Даночниот број (NIP) е погрешен." -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." msgstr "" -"Националниот бизнис регистрациски број (REGON) се состои од 7 или 9 цифри." +"Националниот бизнис регистрациски број (REGON) се состои од 9 или 14 цифри." -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." msgstr "" "Неправилна контролна сум за Националниот бизнис регистрационен број (REGON)." -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." msgstr "Внесете правилен поштенски број во формат XX-XXX." @@ -2953,10 +3134,6 @@ msgstr "Телефонските броеви мора да бидат во XXXX msgid "Enter a valid postal code in the format XXXXXX" msgstr "Внесете правилен поштенски код во формат XXXXXX" -#: contrib/localflavor/sk/forms.py:30 -msgid "Enter a postal code in the format XXXXX or XXX XX." -msgstr "Внесете поштенски број во форматот XXXXX или XXX XX." - #: contrib/localflavor/sk/sk_districts.py:8 msgid "Banska Bystrica" msgstr "Банска Бистрица" @@ -3705,55 +3882,59 @@ msgstr "име кое се прикажува" msgid "sites" msgstr "сајтови" -#: db/models/fields/__init__.py:348 db/models/fields/__init__.py:683 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "Оваа вредност мора да биде цел број." -#: db/models/fields/__init__.py:379 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." msgstr "Оваа вредност мора да биде или точно или неточно." -#: db/models/fields/__init__.py:412 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Оваа вредност неможе да биде null." -#: db/models/fields/__init__.py:428 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "Внесете само цифри одделени со запирки." -#: db/models/fields/__init__.py:459 +#: db/models/fields/__init__.py:474 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Внесете правилен датум во форматот ГГГГ-ММ-ДД." -#: db/models/fields/__init__.py:468 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Неправилен датум: %s" -#: db/models/fields/__init__.py:532 db/models/fields/__init__.py:550 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 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:586 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." msgstr "Оваа вредност мора да биде децимален број." -#: db/models/fields/__init__.py:719 +#: db/models/fields/__init__.py:686 +msgid "This value must be a float." +msgstr "Оваа вредност мора да биде број со подвижна запирка." + +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." msgstr "Оваа вредност мора да биде празна, точно или неточно." -#: db/models/fields/__init__.py:817 db/models/fields/__init__.py:831 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." msgstr "Внесете правилно време во HH:MM[:ss[.uuuuuu]] формат." -#: db/models/fields/related.py:761 +#: db/models/fields/related.py:816 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Држете го „Control“, или „Command“ на Мекинтош, за да изберете повеќе од " "едно." -#: db/models/fields/related.py:838 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3818,31 +3999,39 @@ msgstr "Осигурајте се дека нема повеќе од %s дец msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Осигурајте се дека нема повеќе од %s цифри пред децималната запирка." -#: forms/fields.py:287 forms/fields.py:849 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Внесете правилен датум." -#: forms/fields.py:321 forms/fields.py:850 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Внесете правилно време." -#: forms/fields.py:360 +#: forms/fields.py:361 msgid "Enter a valid date/time." msgstr "Внесете правилен датум со време." -#: forms/fields.py:446 +#: forms/fields.py:447 msgid "No file was submitted. Check the encoding type on the form." msgstr "Не беше пратена датотека. Проверете го типот на енкодирање на формата." -#: forms/fields.py:447 +#: forms/fields.py:448 msgid "No file was submitted." msgstr "Не беше пратена датотека." -#: forms/fields.py:448 +#: forms/fields.py:449 msgid "The submitted file is empty." msgstr "Пратената датотека е празна." -#: forms/fields.py:477 +#: forms/fields.py:450 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "" +"Осигурајте се дека ова име на датотека има најмногу %(max)d знаци (има %" +"(length)d)." + +#: forms/fields.py:483 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -3850,103 +4039,140 @@ msgstr "" "Качете валидна фотографија. Датотеката која ја качивте или не беше " "фотографија или беше расипана датотеката." -#: forms/fields.py:538 +#: forms/fields.py:544 msgid "Enter a valid URL." msgstr "Внесете правилна адреса." -#: forms/fields.py:539 +#: forms/fields.py:545 msgid "This URL appears to be a broken link." msgstr "Оваа адреса изгледа дека не е достапна." -#: forms/fields.py:618 forms/fields.py:696 +#: forms/fields.py:625 forms/fields.py:703 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "Внесете валиден избор. %(value)s не е еден од можните избори." -#: forms/fields.py:697 forms/fields.py:758 forms/models.py:714 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Внесете листа на вредности." -#: forms/fields.py:878 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Внесeте правилна IPv4 адреса." -#: forms/fields.py:888 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Внесете правилно кратко име (slug) кое се соддржи од букви, цифри, долна " "црта или тире." -#: forms/formsets.py:242 forms/formsets.py:244 +#: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Редослед" -#: forms/models.py:281 forms/models.py:290 +#: forms/models.py:367 +#, python-format +msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." +msgstr "%(field_name)s мора да биде уникатно за %(date_field)s %(lookup)s." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s со %(field_label)s веќе постои." -#: forms/models.py:581 +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Ве молам поправете ја дуплираната вредност за %(field)s." + +#: forms/models.py:598 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "" +"Ве молам поправете ја дуплираната вредност за %(field)s, која мора да биде " +"уникатна." + +#: forms/models.py:604 +#, 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:612 +msgid "Please correct the duplicate values below." +msgstr "Ве молам поправете ги дуплираните вредности подолу." + +#: forms/models.py:867 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" +"Надворешниот клуч на вгезденото поле не се совпаѓа со примарниот клуч на " +"родителската инстанца." -#: forms/models.py:644 +#: forms/models.py:930 msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "Изберете правилно. Тоа не е едно од можните избори." +msgstr "Изберете правилно. Тоа не е еден од можните избори." -#: forms/models.py:715 +#: forms/models.py:1004 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "Внесете правилно. %s не е еден од достапните вредности." -#: template/defaultfilters.py:743 +#: forms/models.py:1006 +#, python-format +msgid "\"%s\" is not a valid value for a primary key." +msgstr "\"%s\" не е правилна вредност за примарен клуч." + +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "да, не, можеби" -#: template/defaultfilters.py:774 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d бајт" msgstr[1] "%(size)d бајти" -#: template/defaultfilters.py:776 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f КБ" -#: template/defaultfilters.py:778 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f МБ" -#: template/defaultfilters.py:779 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f ГБ" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "попладне" -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "наутро" -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "попладне" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "наутро" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "полноќ" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "пладне" @@ -4170,47 +4396,47 @@ msgid_plural "minutes" msgstr[0] "минута" msgstr[1] "минути" -#: utils/timesince.py:43 +#: utils/timesince.py:45 msgid "minutes" msgstr "минути" -#: utils/timesince.py:48 +#: utils/timesince.py:50 #, python-format msgid "%(number)d %(type)s" msgstr "%(number)d %(type)s" -#: utils/timesince.py:54 +#: utils/timesince.py:56 #, python-format msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" -#: utils/translation/trans_real.py:403 +#: utils/translation/trans_real.py:399 msgid "DATE_FORMAT" msgstr "j M Y" -#: utils/translation/trans_real.py:405 +#: utils/translation/trans_real.py:401 msgid "TIME_FORMAT" msgstr "P" -#: utils/translation/trans_real.py:421 +#: utils/translation/trans_real.py:417 msgid "YEAR_MONTH_FORMAT" msgstr "F Y" -#: utils/translation/trans_real.py:422 +#: utils/translation/trans_real.py:418 msgid "MONTH_DAY_FORMAT" msgstr "F j" #: views/generic/create_update.py:114 #, python-format msgid "The %(verbose_name)s was created successfully." -msgstr "%(verbose_name)s беше успешно создаден." +msgstr "Ставка %(verbose_name)s беше успешно создадена." #: views/generic/create_update.py:156 #, python-format msgid "The %(verbose_name)s was updated successfully." -msgstr "%(verbose_name)s беше успешно ажуриран." +msgstr "Ставка %(verbose_name)s беше успешно ажурирана." #: views/generic/create_update.py:198 #, python-format msgid "The %(verbose_name)s was deleted." -msgstr "%(verbose_name)s беше избришан." +msgstr "Ставка %(verbose_name)s беше избришана." diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo index fbb90de08e..6c58e35fed 100644 Binary files a/django/conf/locale/nl/LC_MESSAGES/django.mo and b/django/conf/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po index eaaf7445ba..0f3bd0610c 100644 --- a/django/conf/locale/nl/LC_MESSAGES/django.po +++ b/django/conf/locale/nl/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-01 22:36+0200\n" +"POT-Creation-Date: 2009-05-08 15:34+0200\n" "PO-Revision-Date: 2008-08-28 13:58+0100\n" "Last-Translator: Rudolph Froger \n" "Language-Team: \n" @@ -100,117 +100,139 @@ msgid "Hebrew" msgstr "Hebreews" #: conf/global_settings.py:65 +msgid "Hindi" +msgstr "Hindi" + +#: conf/global_settings.py:66 msgid "Croatian" msgstr "Kroatisch" -#: conf/global_settings.py:66 +#: conf/global_settings.py:67 msgid "Icelandic" msgstr "IJslands" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Italian" msgstr "Italiaans" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Japanese" msgstr "Japans" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Georgian" msgstr "Georgisch" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Korean" msgstr "Koreaans" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Khmer" msgstr "Khmer" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Kannada" msgstr "Kannada" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Latvian" msgstr "Lets" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Lithuanian" msgstr "Litouws" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Macedonian" msgstr "Macedonisch" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Dutch" msgstr "Nederlands" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "Norwegian" msgstr "Noors" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Polish" msgstr "Pools" -#: conf/global_settings.py:79 -msgid "Portugese" +#: conf/global_settings.py:80 +msgid "Portuguese" msgstr "Portugees" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Brazilian Portuguese" msgstr "Braziliaans Portugees" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Romanian" msgstr "Roemeens" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Russian" msgstr "Russisch" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Slovak" msgstr "Slovaaks" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Slovenian" msgstr "Sloveens" -#: conf/global_settings.py:85 +#: conf/global_settings.py:86 msgid "Serbian" msgstr "Servisch" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Swedish" msgstr "Zweeds" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 msgid "Tamil" msgstr "Tamil" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Telugu" msgstr "Telegu" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 +msgid "Thai" +msgstr "Thais" + +#: conf/global_settings.py:91 msgid "Turkish" msgstr "Turks" -#: conf/global_settings.py:90 +#: conf/global_settings.py:92 msgid "Ukrainian" msgstr "Oekraïens" -#: conf/global_settings.py:91 +#: conf/global_settings.py:93 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" -#: conf/global_settings.py:92 +#: conf/global_settings.py:94 msgid "Traditional Chinese" msgstr "Traditioneel Chinees" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "%(count)d %(items)s succesvol verwijderd." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 +msgid "Are you sure?" +msgstr "Weet u het zeker?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Verwijder geselecteerde %(verbose_name_plural)s" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" @@ -220,7 +242,7 @@ msgstr "" "

                          Op %s:

                          \n" "
                            \n" -#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 #: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 msgid "All" msgstr "Alle" @@ -245,18 +267,22 @@ msgstr "Deze maand" msgid "This year" msgstr "Dit jaar" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Ja" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Nee" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Onbekend" +#: contrib/admin/helpers.py:14 +msgid "Action:" +msgstr "Actie:" + #: contrib/admin/models.py:19 msgid "action time" msgstr "actietijd" @@ -285,94 +311,103 @@ msgstr "logregistratie" msgid "log entries" msgstr "logregistraties" -#: contrib/admin/options.py:60 contrib/admin/options.py:121 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" msgstr "Geen" -#: contrib/admin/options.py:338 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "%s gewijzigd." -#: contrib/admin/options.py:338 contrib/admin/options.py:348 -#: forms/models.py:275 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:587 msgid "and" msgstr "en" -#: contrib/admin/options.py:343 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" toegevoegd." -#: contrib/admin/options.py:347 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s aangepast voor %(name)s \"%(object)s\"." -#: contrib/admin/options.py:352 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" verwijderd." -#: contrib/admin/options.py:356 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Geen velden gewijzigd." -#: contrib/admin/options.py:417 contrib/auth/admin.py:51 +#: contrib/admin/options.py:598 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "De %(name)s \"%(obj)s\" is toegevoegd." -#: contrib/admin/options.py:421 contrib/admin/options.py:454 -#: contrib/auth/admin.py:59 +#: contrib/admin/options.py:602 contrib/admin/options.py:635 +#: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "U kunt dit hieronder weer bewerken." -#: contrib/admin/options.py:431 contrib/admin/options.py:464 +#: contrib/admin/options.py:612 contrib/admin/options.py:645 #, python-format msgid "You may add another %s below." msgstr "U kunt hieronder de volgende %s toevoegen." -#: contrib/admin/options.py:452 +#: contrib/admin/options.py:633 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Het wijzigen van %(name)s \"%(obj)s\" is geslaagd." -#: contrib/admin/options.py:460 +#: contrib/admin/options.py:641 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "De %(name)s \"%(obj)s\" was toegevoegd. U kunt het hieronder wijzigen." -#: contrib/admin/options.py:536 +#: contrib/admin/options.py:772 #, python-format msgid "Add %s" msgstr "Toevoegen %s" -#: contrib/admin/options.py:614 +#: contrib/admin/options.py:803 contrib/admin/options.py:1003 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "%(name)s object met primaire sleutel %(key)r bestaat niet." + +#: contrib/admin/options.py:860 #, python-format msgid "Change %s" msgstr "Wijzig %s" -#: contrib/admin/options.py:646 +#: contrib/admin/options.py:904 msgid "Database error" msgstr "Databasefout" -#: contrib/admin/options.py:696 +#: contrib/admin/options.py:940 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s %(name)s is succesvol gewijzigd." +msgstr[1] "%(count)s %(name)s zijn succesvol gewijzigd." + +#: contrib/admin/options.py:1018 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "De verwijdering van %(name)s \"%(obj)s\" is geslaagd." -#: contrib/admin/options.py:703 -msgid "Are you sure?" -msgstr "Weet u het zeker?" - -#: contrib/admin/options.py:732 +#: contrib/admin/options.py:1054 #, python-format msgid "Change history: %s" msgstr "Wijzigingsgeschiedenis: %s" -#: contrib/admin/sites.py:16 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -381,11 +416,11 @@ msgstr "" "Voer een correcte gebruikersnaam en wachtwoord in. Let op, de velden zijn " "hoofdletter-gevoelig." -#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Uw sessie is verlopen, meld u opnieuw aan." -#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -393,64 +428,64 @@ msgstr "" "Het lijkt erop dat uw browser geen cookies accepteert. Zet het gebruik van " "cookies aan in uw browser, laad deze pagina nogmaals en probeer het opnieuw." -#: contrib/admin/sites.py:250 contrib/admin/sites.py:256 +#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Gebruikersnamen mogen geen '@' teken bevatten." -#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Uw e-mailadres is niet uw gebruikersnaam. Probeer '%s' eens." -#: contrib/admin/sites.py:313 +#: contrib/admin/sites.py:360 msgid "Site administration" msgstr "Sitebeheer" -#: contrib/admin/sites.py:326 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Inloggen" -#: contrib/admin/sites.py:373 +#: contrib/admin/sites.py:417 #, python-format msgid "%s administration" msgstr "%s beheer" -#: contrib/admin/util.py:138 +#: contrib/admin/util.py:168 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Eén of meer %(fieldname)s in %(name)s: %(obj)s" -#: contrib/admin/util.py:143 +#: contrib/admin/util.py:173 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Eén of meer %(fieldname)s in %(name)s:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Date:" msgstr "Datum:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Time:" msgstr "Tijd:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Currently:" msgstr "Huidige:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Change:" msgstr "Wijziging:" -#: contrib/admin/widgets.py:121 +#: contrib/admin/widgets.py:124 msgid "Lookup" msgstr "Opzoeken" -#: contrib/admin/widgets.py:228 +#: contrib/admin/widgets.py:236 msgid "Add Another" -msgstr "Nog één toevoegen" +msgstr "Voeg nog één toe" #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -463,10 +498,11 @@ msgstr "Onze excuses, maar de gevraagde pagina bestaat niet." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:30 +#: contrib/admin/templates/admin/base.html:31 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:8 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 #: contrib/admin/templates/admin/object_history.html:6 #: contrib/admin/templates/admin/auth/user/change_password.html:10 @@ -501,32 +537,40 @@ msgstr "" "Er is een fout opgetreden. Dit is inmiddels doorgegeven aan de sitebeheerder " "via e-mail en zal spoedig worden gerepareerd. Bedankt voor uw geduld." +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Voer de geselecteerde actie uit" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Zoek" + #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 #, python-format msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 msgid "Welcome," msgstr "Welkom," -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentatie" -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" msgstr "Wachtwoord wijzigen" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -552,28 +596,29 @@ msgstr "Geschiedenis" #: contrib/admin/templates/admin/change_form.html:28 #: contrib/admin/templates/admin/edit_inline/stacked.html:13 -#: contrib/admin/templates/admin/edit_inline/tabular.html:25 +#: contrib/admin/templates/admin/edit_inline/tabular.html:27 msgid "View on site" msgstr "Toon op site" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/auth/user/change_password.html:22 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Herstel de fout hieronder." msgstr[1] "Herstel de fouten hieronder." -#: contrib/admin/templates/admin/change_list.html:16 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" msgstr "%(name)s toevoegen" -#: contrib/admin/templates/admin/change_list.html:26 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "Filter" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 msgid "Delete" msgstr "Verwijderen" @@ -598,9 +643,34 @@ msgstr "" "Alle volgende objecten worden verwijderd:" #: contrib/admin/templates/admin/delete_confirmation.html:28 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:33 msgid "Yes, I'm sure" msgstr "Ja, ik weet het zeker" +#: contrib/admin/templates/admin/delete_selected_confirmation.html:9 +msgid "Delete multiple objects" +msgstr "Verwijder meerdere objecten" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:15 +#, python-format +msgid "" +"Deleting the %(object_name)s would result in deleting related objects, but " +"your account doesn't have permission to delete the following types of " +"objects:" +msgstr "" +"Het verwijderen van %(object_name)s zal ook gerelateerde objecten " +"verwijderen. Echter, u heeft geen rechten om de volgende typen objecten " +"te verwijderen:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:22 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(object_name)s objects? All of " +"the following objects and it's related items will be deleted:" +msgstr "" +"Weet u zeker dat u %(object_name)s objecten wilt verwijderen? " +"Alle volgende objecten worden verwijderd:" + #: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " @@ -631,6 +701,10 @@ msgstr "Mijn acties" msgid "None available" msgstr "Geen beschikbaar" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Onbekende inhoud" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -657,11 +731,12 @@ msgid "User" msgstr "Gebruiker" #: contrib/admin/templates/admin/object_history.html:24 +#: contrib/comments/templates/comments/moderation_queue.html:33 msgid "Action" msgstr "Actie" #: contrib/admin/templates/admin/object_history.html:30 -#: utils/translation/trans_real.py:404 +#: utils/translation/trans_real.py:400 msgid "DATETIME_FORMAT" msgstr "j-n-Y H:i" @@ -678,7 +753,7 @@ msgid "Show all" msgstr "Alles tonen" #: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" +msgid "Search" msgstr "Zoek" #: contrib/admin/templates/admin/search_form.html:10 @@ -703,7 +778,7 @@ msgstr "Opslaan als nieuw item" #: contrib/admin/templates/admin/submit_line.html:6 msgid "Save and add another" -msgstr "Opslaan en nieuw item" +msgstr "Opslaan en nieuwe toevoegen" #: contrib/admin/templates/admin/submit_line.html:7 msgid "Save and continue editing" @@ -723,23 +798,23 @@ msgid "Username" msgstr "Gebruikersnaam" #: contrib/admin/templates/admin/auth/user/add_form.html:20 -#: contrib/admin/templates/admin/auth/user/change_password.html:33 -#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 msgid "Password" msgstr "Wachtwoord" #: contrib/admin/templates/admin/auth/user/add_form.html:26 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/auth/forms.py:185 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/auth/forms.py:186 msgid "Password (again)" msgstr "Wachtwoord (nogmaals)" #: contrib/admin/templates/admin/auth/user/add_form.html:27 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 msgid "Enter the same password as above, for verification." msgstr "Vul hetzelfde wachtwoord als hierboven in, ter bevestiging." -#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "Geef een nieuw passwoord voor gebruiker %(username)s." @@ -777,7 +852,7 @@ msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Vanwege de beveiliging moet u uw oude en twee keer een nieuw wachtwoord " +"Vanwege de beveiliging moet u uw oude en twee keer uw nieuwe wachtwoord " "invoeren, zodat we kunnen controleren of er geen typefouten zijn gemaakt." #: contrib/admin/templates/registration/password_change_form.html:17 @@ -835,7 +910,7 @@ msgstr "" #: contrib/admin/templates/registration/password_reset_confirm.html:26 msgid "Password reset unsuccessful" -msgstr "Wachtwoord herstel geslaagd" +msgstr "Wachtwoord herstel mislukt" #: contrib/admin/templates/registration/password_reset_confirm.html:28 msgid "" @@ -900,165 +975,166 @@ msgstr "E-mailadres:" msgid "Reset my password" msgstr "Herstel mijn wachtwoord" -#: contrib/admin/templatetags/admin_list.py:288 +#: contrib/admin/templatetags/admin_list.py:299 msgid "All dates" msgstr "Alle data" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s" msgstr "Selecteer %s" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s to change" msgstr "Selecteer %s om te wijzigen" -#: contrib/admin/views/template.py:36 contrib/sites/models.py:38 +#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 msgid "site" msgstr "site" -#: contrib/admin/views/template.py:38 +#: contrib/admin/views/template.py:39 msgid "template" msgstr "sjabloon" -#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59 -#: contrib/admindocs/views.py:61 +#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 +#: contrib/admindocs/views.py:62 msgid "tag:" msgstr "tag:" -#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92 -#: contrib/admindocs/views.py:94 +#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 +#: contrib/admindocs/views.py:95 msgid "filter:" msgstr "filter:" -#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156 -#: contrib/admindocs/views.py:158 +#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 +#: contrib/admindocs/views.py:159 msgid "view:" msgstr "view:" -#: contrib/admindocs/views.py:186 +#: contrib/admindocs/views.py:187 #, python-format msgid "App %r not found" msgstr "Toepassing %r niet gevonden" -#: contrib/admindocs/views.py:193 +#: contrib/admindocs/views.py:194 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Model %(model_name)r niet gevonden in toepassing %(app_label)r" -#: contrib/admindocs/views.py:205 +#: contrib/admindocs/views.py:206 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "het gerelateerde `%(app_label)s.%(data_type)s` object" -#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227 -#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 msgid "model:" msgstr "model:" -#: contrib/admindocs/views.py:236 +#: contrib/admindocs/views.py:237 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "gerelateerde `%(app_label)s.%(object_name)s` objecten" -#: contrib/admindocs/views.py:241 +#: contrib/admindocs/views.py:242 #, python-format msgid "all %s" msgstr "alle %s" -#: contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:247 #, python-format msgid "number of %s" msgstr "aantal %s" -#: contrib/admindocs/views.py:251 +#: contrib/admindocs/views.py:252 #, python-format msgid "Fields on %s objects" msgstr "Velden van %s objecten" -#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325 -#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333 -#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 +#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 msgid "Integer" msgstr "Geheel getal" -#: contrib/admindocs/views.py:315 +#: contrib/admindocs/views.py:316 msgid "Boolean (Either True or False)" msgstr "Boolean (True danwel False)" -#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335 +#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 #, python-format msgid "String (up to %(max_length)s)" msgstr "Karakterreeks (hooguit %(max_length)s)" -#: contrib/admindocs/views.py:317 +#: contrib/admindocs/views.py:318 msgid "Comma-separated integers" msgstr "Komma-gescheiden gehele getallen" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:319 msgid "Date (without time)" msgstr "Datum (zonder tijd)" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:320 msgid "Date (with time)" msgstr "Datum (met tijd)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:321 msgid "Decimal number" msgstr "Decimaal getal" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:322 msgid "E-mail address" msgstr "E-mailadres" -#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323 -#: contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:327 msgid "File path" msgstr "Bestandspad" -#: contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:325 msgid "Floating point number" msgstr "Decimaal getal" -#: contrib/admindocs/views.py:328 contrib/comments/models.py:58 +#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 msgid "IP address" msgstr "IP-adres" -#: contrib/admindocs/views.py:330 +#: contrib/admindocs/views.py:331 msgid "Boolean (Either True, False or None)" msgstr "Boolean (True, False of None)" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:332 msgid "Relation to parent model" msgstr "Relatie tot oudermodel" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:333 msgid "Phone number" msgstr "Telefoonnummer" -#: contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:338 msgid "Text" msgstr "Tekst" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:339 msgid "Time" msgstr "Tijd" -#: contrib/admindocs/views.py:339 contrib/comments/forms.py:22 +#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:340 +#: contrib/admindocs/views.py:341 msgid "U.S. state (two uppercase letters)" msgstr "Staat van de VS (twee hoofdletters)" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:342 msgid "XML text" msgstr "XML-tekst" -#: contrib/admindocs/views.py:367 +#: contrib/admindocs/views.py:368 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s lijkt geen urlpattern-object te zijn" @@ -1103,7 +1179,7 @@ msgid "" "that page." msgstr "" "Springt vanuit elke pagina naar de documentatie voor de view die gegenereerd " -"wordt door die pagina" +"wordt door die pagina." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:21 msgid "Show object ID" @@ -1128,7 +1204,7 @@ msgstr "" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:27 msgid "Edit this object (new window)" -msgstr "Bewerk dit object (nieuwe pagina)" +msgstr "Bewerk dit object (nieuw venster)" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:28 msgid "As above, but opens the admin page in a new window." @@ -1150,21 +1226,21 @@ msgstr "Belangrijke datums" msgid "Groups" msgstr "Groepen" -#: contrib/auth/admin.py:64 +#: contrib/auth/admin.py:80 msgid "Add user" msgstr "Gebruiker toevoegen" -#: contrib/auth/admin.py:90 +#: contrib/auth/admin.py:106 msgid "Password changed successfully." -msgstr "Wachtwoord wijzigen is geslaagd" +msgstr "Wachtwoord wijzigen is geslaagd." -#: contrib/auth/admin.py:96 +#: contrib/auth/admin.py:112 #, python-format msgid "Change password: %s" msgstr "Wijzig wachtwoord: %s" #: contrib/auth/forms.py:15 contrib/auth/forms.py:48 -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." @@ -1184,8 +1260,8 @@ msgstr "Bevestiging wachtwoord" msgid "A user with that username already exists." msgstr "Een gebruiker met deze gebruikersnaam bestaat al." -#: contrib/auth/forms.py:36 contrib/auth/forms.py:154 -#: contrib/auth/forms.py:196 +#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:197 msgid "The two password fields didn't match." msgstr "De twee ingevulde wachtwoorden zijn niet gelijk." @@ -1213,74 +1289,74 @@ msgstr "" "Dat e-mailadres heeft geen gerelateerd gebruikersaccount. Weet u zeker dat u " "zich heeft geregistreerd?" -#: contrib/auth/forms.py:134 +#: contrib/auth/forms.py:135 #, python-format msgid "Password reset on %s" msgstr "Wachtwoord hersteld op %s" -#: contrib/auth/forms.py:142 +#: contrib/auth/forms.py:143 msgid "New password" msgstr "Nieuw wachtwoord" -#: contrib/auth/forms.py:143 +#: contrib/auth/forms.py:144 msgid "New password confirmation" msgstr "Nieuw wachtwoord bevestigen" -#: contrib/auth/forms.py:168 +#: contrib/auth/forms.py:169 msgid "Old password" msgstr "Oud wachtwoord" -#: contrib/auth/forms.py:176 +#: contrib/auth/forms.py:177 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" "Uw oude wachtwoord is niet correct ingevoerd. Voert u het alstublieft " "opnieuw in." -#: contrib/auth/models.py:72 contrib/auth/models.py:95 +#: contrib/auth/models.py:63 contrib/auth/models.py:86 msgid "name" msgstr "naam" -#: contrib/auth/models.py:74 +#: contrib/auth/models.py:65 msgid "codename" msgstr "codenaam" -#: contrib/auth/models.py:77 +#: contrib/auth/models.py:68 msgid "permission" msgstr "recht" -#: contrib/auth/models.py:78 contrib/auth/models.py:96 +#: contrib/auth/models.py:69 contrib/auth/models.py:87 msgid "permissions" msgstr "rechten" -#: contrib/auth/models.py:99 +#: contrib/auth/models.py:90 msgid "group" msgstr "groep" -#: contrib/auth/models.py:100 contrib/auth/models.py:146 +#: contrib/auth/models.py:91 contrib/auth/models.py:138 msgid "groups" msgstr "groepen" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "username" msgstr "gebruikersnaam" -#: contrib/auth/models.py:137 +#: contrib/auth/models.py:129 msgid "first name" msgstr "voornaam" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:130 msgid "last name" msgstr "achternaam" -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:131 msgid "e-mail address" msgstr "e-mailadres" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "password" msgstr "wachtwoord" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." @@ -1288,19 +1364,19 @@ msgstr "" "Gebruik '[algo]$[salt]$[hexdigest]' of gebruik hetwachtwoord wijzigen formulier." -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "staff status" msgstr "stafstatus" -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "Designates whether the user can log into this admin site." msgstr "Bepaalt of de gebruiker kan inloggen op deze beheersite." -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "active" msgstr "actief" -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." @@ -1308,11 +1384,11 @@ msgstr "" "Bepaalt of deze gebruiker als actief dient te worden behandeld. U kunt dit " "uitvinken in plaats van een gebruiker te verwijderen." -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "superuser status" msgstr "supergebruikerstatus" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -1320,15 +1396,15 @@ msgstr "" "Bepaalt dat deze gebruiker alle rechten heeft, zonder deze expliciet toe te " "wijzen." -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:136 msgid "last login" msgstr "laatste inlog" -#: contrib/auth/models.py:145 +#: contrib/auth/models.py:137 msgid "date joined" msgstr "datum toegetreden" -#: contrib/auth/models.py:147 +#: contrib/auth/models.py:139 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." @@ -1336,27 +1412,28 @@ msgstr "" "Bovenop de rechten welke handmatig zijn toegekend, krijgt deze gebruiker ook " "alle rechten van de groepen waar hij of zij deel van uitmaakt." -#: contrib/auth/models.py:148 +#: contrib/auth/models.py:140 msgid "user permissions" msgstr "gebruikersrechten" -#: contrib/auth/models.py:152 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "gebruiker" -#: contrib/auth/models.py:153 +#: contrib/auth/models.py:145 msgid "users" msgstr "gebruikers" -#: contrib/auth/models.py:308 +#: contrib/auth/models.py:301 msgid "message" msgstr "bericht" -#: contrib/auth/views.py:50 +#: contrib/auth/views.py:56 msgid "Logged out" msgstr "Afmelden" -#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428 +#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 msgid "Enter a valid e-mail address." msgstr "Geef een geldig e-mailadres op." @@ -1368,24 +1445,31 @@ msgstr "Inhoud" msgid "Metadata" msgstr "Metadata" -#: contrib/comments/forms.py:20 +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "%(site_name)s opmerkingen" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Laatste opmerkingen op %(site_name)s" + +#: contrib/comments/forms.py:93 +#: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" msgstr "Naam" -#: contrib/comments/forms.py:21 +#: contrib/comments/forms.py:94 msgid "Email address" msgstr "E-mailadres" -#: contrib/comments/forms.py:23 +#: contrib/comments/forms.py:96 +#: contrib/comments/templates/comments/moderation_queue.html:35 msgid "Comment" msgstr "Opmerking" -#: contrib/comments/forms.py:26 -msgid "" -"If you enter anything in this field your comment will be treated as spam" -msgstr "Indien u hier iets invuld dan wordt uw opmerking behandeld als spam" - -#: contrib/comments/forms.py:126 +#: contrib/comments/forms.py:173 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." @@ -1393,53 +1477,67 @@ msgstr[0] "Pas op uw taalgebruik! Gebruik van %s niet toegestaan." msgstr[1] "" "Pas op uw taalgebruik! Gebruik van de woorden %s is niet toegestaan." -#: contrib/comments/models.py:23 +#: contrib/comments/forms.py:180 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "Indien u hier iets invuld dan wordt uw opmerking behandeld als spam" + +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "inhoudstype" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "object-ID" -#: contrib/comments/models.py:50 +#: contrib/comments/models.py:52 msgid "user's name" msgstr "naam gebruiker" -#: contrib/comments/models.py:51 +#: contrib/comments/models.py:53 msgid "user's email address" msgstr "e-mailadres gebruiker" -#: contrib/comments/models.py:52 +#: contrib/comments/models.py:54 msgid "user's URL" msgstr "URL gebruiker" -#: contrib/comments/models.py:54 +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "opmerking" -#: contrib/comments/models.py:57 +#: contrib/comments/models.py:59 msgid "date/time submitted" msgstr "datum/tijd toegevoegd" -#: contrib/comments/models.py:59 +#: contrib/comments/models.py:61 msgid "is public" msgstr "is openbaar" -#: contrib/comments/models.py:60 +#: contrib/comments/models.py:62 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "" "Vink dit vakje uit zodat de opmerking niet meer zichtbaar is op de site." -#: contrib/comments/models.py:62 +#: contrib/comments/models.py:64 msgid "is removed" msgstr "is verwijderd" -#: contrib/comments/models.py:63 +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." msgstr "" -"Kruis dit vak aan indien de opmerking niet gepast is. Een \"Dit commentaar " -"is verwijderd\" bericht wordt dan getoond" +"Vink dit vak aan indien de opmerking niet gepast is. Een \"Dit commentaar " +"is verwijderd\" bericht wordt dan getoond." -#: contrib/comments/models.py:115 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "opmerkingen" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." @@ -1447,7 +1545,7 @@ msgstr "" "Deze opmerking is gepost door een ingelogde gebruiker en daardoor is de naam " "niet aan te passen." -#: contrib/comments/models.py:124 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." @@ -1455,7 +1553,7 @@ msgstr "" "Deze opmerking is gepost door een ingelogde gebruiker en daardoor is het e-" "mailadres niet aan te passen." -#: contrib/comments/models.py:149 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1470,15 +1568,155 @@ msgstr "" "\n" "http://%(domain)s%(url)s" -#: contrib/contenttypes/models.py:67 +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "vlag" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "datum" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "opmerking vlag" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "opmerking vlaggen" + +#: contrib/comments/templates/comments/approve.html:4 +msgid "Approve a comment" +msgstr "Een opmerking toestaan" + +#: contrib/comments/templates/comments/approve.html:7 +msgid "Really make this comment public?" +msgstr "Weet u zeker dat u deze opmerking openbaar wilt maken?" + +#: contrib/comments/templates/comments/approve.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:49 +msgid "Approve" +msgstr "Goedkeuren" + +#: contrib/comments/templates/comments/approved.html:4 +msgid "Thanks for approving" +msgstr "Bedankt voor het goedkeuren" + +#: contrib/comments/templates/comments/approved.html:7 +#: contrib/comments/templates/comments/deleted.html:7 +#: contrib/comments/templates/comments/flagged.html:7 +msgid "" +"Thanks for taking the time to improve the quality of discussion on our site" +msgstr "" +"Bedankt dat u de tijd heeft genomen om de kwaliteit van de discussie op onze site te verbeteren" + +#: contrib/comments/templates/comments/delete.html:4 +msgid "Remove a comment" +msgstr "Een opmerking verwijderen" + +#: contrib/comments/templates/comments/delete.html:7 +msgid "Really remove this comment?" +msgstr "Weet u zeker dat u deze opmerking wilt verwijderen?" + +#: contrib/comments/templates/comments/delete.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:53 +msgid "Remove" +msgstr "Verwijderen" + +#: contrib/comments/templates/comments/deleted.html:4 +msgid "Thanks for removing" +msgstr "Bedankt voor het verwijderen" + +#: contrib/comments/templates/comments/flag.html:4 +msgid "Flag this comment" +msgstr "Vlag deze opmerking" + +#: contrib/comments/templates/comments/flag.html:7 +msgid "Really flag this comment?" +msgstr "Weet u zeker dat u deze opmerking wilt vlaggen?" + +#: contrib/comments/templates/comments/flag.html:12 +msgid "Flag" +msgstr "Vlag" + +#: contrib/comments/templates/comments/flagged.html:4 +msgid "Thanks for flagging" +msgstr "Bedankt voor het vlaggen" + +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 +msgid "Post" +msgstr "Bericht" + +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 +msgid "Preview" +msgstr "Voorbeeld" + +#: contrib/comments/templates/comments/moderation_queue.html:4 +#: contrib/comments/templates/comments/moderation_queue.html:19 +msgid "Comment moderation queue" +msgstr "Opmerking moderatie wachtrij" + +#: contrib/comments/templates/comments/moderation_queue.html:26 +msgid "No comments to moderate" +msgstr "Geen opmerkingen om te modereren" + +#: contrib/comments/templates/comments/moderation_queue.html:36 +msgid "Email" +msgstr "E-mail" + +#: contrib/comments/templates/comments/moderation_queue.html:38 +msgid "Authenticated?" +msgstr "Geauthenticeerd?" + +#: contrib/comments/templates/comments/moderation_queue.html:39 +msgid "IP Address" +msgstr "IP-adres" + +#: contrib/comments/templates/comments/moderation_queue.html:40 +msgid "Date posted" +msgstr "Berichtdatum" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "yes" +msgstr "ja" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "no" +msgstr "nee" + +#: contrib/comments/templates/comments/posted.html:4 +msgid "Thanks for commenting" +msgstr "Bedankt voor uw opmerking" + +#: contrib/comments/templates/comments/posted.html:7 +msgid "Thank you for your comment" +msgstr "Bedankt voor uw opmerking" + +#: contrib/comments/templates/comments/preview.html:4 +#: contrib/comments/templates/comments/preview.html:13 +msgid "Preview your comment" +msgstr "Toon voorbeeld van uw opmerking" + +#: contrib/comments/templates/comments/preview.html:11 +msgid "Please correct the error below" +msgid_plural "Please correct the errors below" +msgstr[0] "Herstel de fout hieronder" +msgstr[1] "Herstel de fouten hieronder" + +#: contrib/comments/templates/comments/preview.html:16 +msgid "Post your comment" +msgstr "Plaats uw opmerking" + +#: contrib/comments/templates/comments/preview.html:16 +msgid "or make changes" +msgstr "of maak aanpassingen" + +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "klassenaam van pythonmodel" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "inhoudstype" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "inhoudstypen" @@ -1530,7 +1768,7 @@ msgstr "registratie verplicht" #: contrib/flatpages/models.py:13 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" -"Indien dit is aangekruist kunnen alleen ingelogde gebruikers deze pagina " +"Indien dit is aangevinkt kunnen alleen ingelogde gebruikers deze pagina " "bekijken." #: contrib/flatpages/models.py:18 @@ -1549,18 +1787,26 @@ msgstr "" "Onze excuses, maar uw formulier is verlopen. Gaat u alstublieft verder met " "het invullen van het formulier op deze pagina." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Geen geometrische waarde opgegeven." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Ongeldige geometrie waarde." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Ongeldig geometrie type." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"Er is een fout opgetreden bij het omvormen van de geometrie naar de SRID van " +"het geometrie veld." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "º" @@ -1746,7 +1992,7 @@ msgstr "Ongeldig CNPJ nummer." #: contrib/localflavor/br/forms.py:136 msgid "This field requires at least 14 digits" -msgstr "Dit vereist minimaal 14 cijfers." +msgstr "Dit veld vereist minimaal 14 cijfers." #: contrib/localflavor/ca/forms.py:17 msgid "Enter a postal code in the format XXX XXX." @@ -1872,7 +2118,7 @@ msgstr "" #: contrib/localflavor/cl/forms.py:29 msgid "Enter a valid Chilean RUT." -msgstr "Geen een geldige Chileense RUT op." +msgstr "Geef een geldige Chileense RUT op." #: contrib/localflavor/cl/forms.py:30 msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X." @@ -1882,6 +2128,83 @@ msgstr "Geef een geldige Chileense RUT op. Het formaat is XX.XXX.XXX-X." msgid "The Chilean RUT is not valid." msgstr "De Chileense RUT is ongeldig." +#: contrib/localflavor/cz/cz_regions.py:8 +msgid "Prague" +msgstr "Praag" + +#: contrib/localflavor/cz/cz_regions.py:9 +msgid "Central Bohemian Region" +msgstr "Midden-Bohemen" + +#: contrib/localflavor/cz/cz_regions.py:10 +msgid "South Bohemian Region" +msgstr "Zuid-Bohemen" + +#: contrib/localflavor/cz/cz_regions.py:11 +msgid "Pilsen Region" +msgstr "Pilsen" + +#: contrib/localflavor/cz/cz_regions.py:12 +msgid "Carlsbad Region" +msgstr "Karlsbad" + +#: contrib/localflavor/cz/cz_regions.py:13 +msgid "Usti Region" +msgstr "Ústí nad Labem" + +#: contrib/localflavor/cz/cz_regions.py:14 +msgid "Liberec Region" +msgstr "Liberec" + +#: contrib/localflavor/cz/cz_regions.py:15 +msgid "Hradec Region" +msgstr "Hradec Králové" + +#: contrib/localflavor/cz/cz_regions.py:16 +msgid "Pardubice Region" +msgstr "Pardubice" + +#: contrib/localflavor/cz/cz_regions.py:17 +msgid "Vysocina Region" +msgstr "Vysočina" + +#: contrib/localflavor/cz/cz_regions.py:18 +msgid "South Moravian Region" +msgstr "Zuid-Moravië" + +#: contrib/localflavor/cz/cz_regions.py:19 +msgid "Olomouc Region" +msgstr "Olomouc" + +#: contrib/localflavor/cz/cz_regions.py:20 +msgid "Zlin Region" +msgstr "Zlín" + +#: contrib/localflavor/cz/cz_regions.py:21 +msgid "Moravian-Silesian Region" +msgstr "Moravië-Silezië" + +#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "Geef een postcode op in het formaat XXXXX of XXX XX." + +#: contrib/localflavor/cz/forms.py:47 +msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." +msgstr "" +"Geef een geboorte nummer op in het formaat XXXXXX/XXXX or XXXXXXXXXX." + +#: contrib/localflavor/cz/forms.py:48 +msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" +msgstr "Ongeldige optionele parameter Geslacht, geldige waarden zijn 'f' en 'm'" + +#: contrib/localflavor/cz/forms.py:49 +msgid "Enter a valid birth number." +msgstr "Geef een geldig geboorte nummer." + +#: contrib/localflavor/cz/forms.py:106 +msgid "Enter a valid IC number." +msgstr "Geef een geldig IC nummer op." + #: contrib/localflavor/de/de_states.py:5 msgid "Baden-Wuerttemberg" msgstr "Baden-Wuerttemberg" @@ -2709,17 +3032,17 @@ msgstr "" msgid "Wrong checksum for the Tax Number (NIP)." msgstr "Verkeerd controlecijfer voor het fiscaal nummer (NIP)." -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." msgstr "" -"Het Nationaal Zakelijk Registratie Nummer (REGON) bestaat uit 7 of 9 cijfers." +"Het Nationaal Zakelijk Registratie Nummer (REGON) bestaat uit 9 of 14 cijfers." -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." msgstr "" "Verkeerd controlecijfer op het Nationaal Zakelijk Registratie Nummer (REGON)." -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." msgstr "Geef een postcode op in het formaat XX-XXX." @@ -2808,10 +3131,6 @@ msgstr "Telefoonnummers moeten volgens het XXXX-XXXXXX formaat te zijn." msgid "Enter a valid postal code in the format XXXXXX" msgstr "Geef een geldige postcode in het formaat XXXXXX" -#: contrib/localflavor/sk/forms.py:30 -msgid "Enter a postal code in the format XXXXX or XXX XX." -msgstr "Geef een postcode op in het formaat XXXXX of XXX XX." - #: contrib/localflavor/sk/sk_districts.py:8 msgid "Banska Bystrica" msgstr "Banska Bystrica" @@ -3560,55 +3879,60 @@ msgstr "weergavenaam" msgid "sites" msgstr "sites" -#: db/models/fields/__init__.py:348 db/models/fields/__init__.py:683 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "De waarde moet een geheel getal zijn." -#: db/models/fields/__init__.py:379 +#: db/models/fields/__init__.py:3883918 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:412 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Dit veld mag niet leeg zijn." -#: db/models/fields/__init__.py:428 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "Geef alleen cijfers op, gescheiden door komma's." -#: db/models/fields/__init__.py:459 +#: db/models/fields/__init__.py:474 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:468 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Ongeldige datum: %s" -#: db/models/fields/__init__.py:532 db/models/fields/__init__.py:550 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 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:586 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." -msgstr "De waarde moet een getal zijn." +msgstr "De waarde moet een decimaal getal zijn." -#: db/models/fields/__init__.py:719 +#: db/models/fields/__init__.py:686 +# Choose 'kommagetal' because it's user input. +msgid "This value must be a float." +msgstr "De waarde moet een kommagetal zijn." + +#: db/models/fields/__init__.py:746 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:817 db/models/fields/__init__.py:831 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 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/related.py:761 +#: db/models/fields/related.py:792 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." -#: db/models/fields/related.py:838 +#: db/models/fields/related.py:870 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3628,15 +3952,15 @@ msgstr "Geef een geldige waarde." #, python-format msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." msgstr "" -"Zorg ervoor dat waarde korter is dan %(max)d tekens (huidige lengte %(length)" -"d)." +"Zorg ervoor dat waarde korter is dan %(max)d tekens (huidige lengte " +"%(length)d)." #: forms/fields.py:139 #, python-format msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." msgstr "" -"Zorg ervoor dat uw tekst langer is dan %(min)d tekens (huidige lengte %" -"(length)d)." +"Zorg ervoor dat deze tekst langer is dan %(min)d tekens (huidige lengte " +"%(length)d)." #: forms/fields.py:166 msgid "Enter a whole number." @@ -3664,40 +3988,47 @@ msgstr "Zorg dat er minder dan %s cijfers zijn." #: forms/fields.py:228 #, python-format msgid "Ensure that there are no more than %s decimal places." -msgstr "Zorg dat er minder dan %s cijfers na de komma zijn." +msgstr "Zorg dat er minder dan %s cijfers na de komma staan." #: forms/fields.py:229 #, 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 zijn." +msgstr "Zorg dat er minder dan %s cijfers voor de komma staan." -#: forms/fields.py:287 forms/fields.py:848 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Geef een geldige datum op." -#: forms/fields.py:321 forms/fields.py:849 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Geef een geldige tijd op." -#: forms/fields.py:360 +#: forms/fields.py:361 msgid "Enter a valid date/time." msgstr "Geef een geldige datum/tijd op." -#: forms/fields.py:446 +#: forms/fields.py:447 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:447 -msgid "No file was submitted." -msgstr "Geen bestand werd aangeboden." - #: forms/fields.py:448 -msgid "The submitted file is empty." -msgstr "Het gegeven bestand is leeg." +msgid "No file was submitted." +msgstr "Er was geen bestand verstuurd." -#: forms/fields.py:477 +#: forms/fields.py:449 +msgid "The submitted file is empty." +msgstr "Het verstuurde bestand is leeg." + +#: forms/fields.py:450 +#, 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)." + +#: forms/fields.py:483 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -3705,74 +4036,111 @@ msgstr "" "Bestand ongeldig. Het bestand dat is gegeven is geen afbeelding of is " "beschadigd." -#: forms/fields.py:538 +#: forms/fields.py:544 msgid "Enter a valid URL." msgstr "Geef een geldige URL op." -#: forms/fields.py:539 +#: forms/fields.py:545 msgid "This URL appears to be a broken link." msgstr "Deze URL lijkt niet te werken." -#: forms/fields.py:618 forms/fields.py:696 +#: forms/fields.py:625 forms/fields.py:703 #, 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:697 forms/fields.py:758 forms/models.py:654 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:962 msgid "Enter a list of values." msgstr "Geef een lijst op met waardes." -#: forms/fields.py:877 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Geef een geldig IPv4-adres op." -#: forms/fields.py:887 +#: forms/fields.py:902 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." -#: forms/formsets.py:242 forms/formsets.py:244 +#: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Volgorde" -#: forms/models.py:268 forms/models.py:277 +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 #, 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." -#: forms/models.py:584 +#: forms/models.py:581 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Verbeter de dubbele gegevens voor %(field)s." + +#: forms/models.py:585 +#, 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:591 +#, 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 "Verbeter de dubbele gegevens voor %(field_name)s, welke uniek moet " +"zijn voor de %(lookup)s in %(date_field)s." + +#: forms/models.py:599 +msgid "Please correct the duplicate values below." +msgstr "Verbeter de dubbele waarden hieronder." + +#: forms/models.py:837 +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:892 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:655 +#: forms/models.py:963 #, 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." -#: template/defaultfilters.py:706 +#: forms/models.py:965 +#, python-format +msgid "\"%s\" is not a valid value for a primary key." +msgstr "\"%s\" is geen geldige waarde voor een primaire sleutel." + +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "ja,nee,misschien" -#: template/defaultfilters.py:737 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d byte" msgstr[1] "%(size)d bytes" -#: template/defaultfilters.py:739 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:741 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:742 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f GB" @@ -4022,33 +4390,33 @@ msgid_plural "minutes" msgstr[0] "minuut" msgstr[1] "minuten" -#: utils/timesince.py:43 +#: utils/timesince.py:45 msgid "minutes" msgstr "minuten" -#: utils/timesince.py:48 +#: utils/timesince.py:50 #, python-format msgid "%(number)d %(type)s" msgstr "%(number)d %(type)s" -#: utils/timesince.py:54 +#: utils/timesince.py:56 #, python-format msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" -#: utils/translation/trans_real.py:403 +#: utils/translation/trans_real.py:399 msgid "DATE_FORMAT" msgstr "j-n-Y" -#: utils/translation/trans_real.py:405 +#: utils/translation/trans_real.py:401 msgid "TIME_FORMAT" msgstr "H:i" -#: utils/translation/trans_real.py:421 +#: utils/translation/trans_real.py:417 msgid "YEAR_MONTH_FORMAT" msgstr "F Y" -#: utils/translation/trans_real.py:422 +#: utils/translation/trans_real.py:418 msgid "MONTH_DAY_FORMAT" msgstr "j F" diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo index 55b8da6b98..8e523f3f96 100644 Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po index c4fb1a5787..f27cb79d9e 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.po +++ b/django/conf/locale/no/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:12+0200\n" -"PO-Revision-Date: 2009-04-12 15:27+0200\n" +"PO-Revision-Date: 2009-07-24 15:44+0200\n" "Last-Translator: Christian Mikalsen and Jon Lønne\n" "Language-Team: Norsk \n" "MIME-Version: 1.0\n" @@ -218,16 +218,16 @@ msgstr "Simplifisert kinesisk" msgid "Traditional Chinese" msgstr "Tradisjonell kinesisk" -#: contrib/admin/actions.py:56 +#: contrib/admin/actions.py:60 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Slettet %(count)d %(items)s." -#: contrib/admin/actions.py:63 contrib/admin/options.py:1023 +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 msgid "Are you sure?" msgstr "Er du sikker?" -#: contrib/admin/actions.py:81 +#: contrib/admin/actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Slett valgte %(verbose_name_plural)s" @@ -266,15 +266,15 @@ msgstr "Denne måneden" msgid "This year" msgstr "I år" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Ja" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Nei" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Ukjent" @@ -314,98 +314,99 @@ msgstr "logginnlegg" msgid "None" msgstr "Ingen" -#: contrib/admin/options.py:517 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Endret %s." -#: contrib/admin/options.py:517 contrib/admin/options.py:527 -#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "og" -#: contrib/admin/options.py:522 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Opprettet %(name)s \"%(object)s\"." -#: contrib/admin/options.py:526 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Endret %(list)s for %(name)s \"%(object)s\"." -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Slettet %(name)s \"%(object)s\"." -#: contrib/admin/options.py:535 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Ingen felt endret." -#: contrib/admin/options.py:596 contrib/auth/admin.py:67 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" ble opprettet." -#: contrib/admin/options.py:600 contrib/admin/options.py:633 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Du kan redigere videre nedenfor." -#: contrib/admin/options.py:610 contrib/admin/options.py:643 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Du kan opprette ny %s nedenfor." -#: contrib/admin/options.py:631 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ble endret." -#: contrib/admin/options.py:639 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" ble endret. Du kan redigere videre nedenfor." -#: contrib/admin/options.py:770 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Opprett %s" -#: contrib/admin/options.py:801 contrib/admin/options.py:1001 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s-objekt med primærnøkkelen %(key)r finnes ikke." -#: contrib/admin/options.py:858 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Rediger %s" -#: contrib/admin/options.py:902 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "Databasefeil" -#: contrib/admin/options.py:938 +#: contrib/admin/options.py:941 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s ble endret." msgstr[1] "%(count)s %(name)s ble endret." -#: contrib/admin/options.py:1016 +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ble slettet." -#: contrib/admin/options.py:1052 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Endringshistorikk: %s" -#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -414,11 +415,11 @@ msgstr "" "Vennligst angi korrekt brukernavn og passord. Merk at det er forskjell på " "små og store bokstaver." -#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Økten din har tidsavbrutt, vennligst logg inn igjen." -#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -426,27 +427,27 @@ msgstr "" "Det ser ut som om nettleseren din ikke støtter informasjonskapsler " "(cookies). Vennligst konfigurer nettleseren din og prøv igjen." -#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Brukernavnet kan ikke inneholde tegnet '@'." -#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "E-postadressen er ikke brukernavnet ditt, prøv '%s' isteden." -#: contrib/admin/sites.py:360 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Nettstedsadministrasjon" -#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Logg inn" -#: contrib/admin/sites.py:417 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "%s-administrasjon" @@ -496,7 +497,7 @@ msgstr "Beklager, men siden du spør etter finnes ikke." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -540,7 +541,6 @@ msgid "Run the selected action" msgstr "Utfør den valgte handlingen" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Gå" @@ -550,18 +550,18 @@ msgstr "Gå" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Velkommen," -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentasjon" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:40 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -569,7 +569,7 @@ msgstr "Dokumentasjon" msgid "Change password" msgstr "Endre passord" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -699,6 +699,10 @@ msgstr "Mine handlinger" msgid "None available" msgstr "Ingen tilgjengelige" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Ukjent innhold" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -746,6 +750,15 @@ msgstr "" msgid "Show all" msgstr "Vis alle" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Lagre" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "Søk" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -758,10 +771,6 @@ msgstr[1] "%(counter)s resultater" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s totalt" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Lagre" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Lagre som ny" @@ -989,144 +998,145 @@ msgstr "nettside" msgid "template" msgstr "mal" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 -#: contrib/admindocs/views.py:62 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "tag:" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 -#: contrib/admindocs/views.py:95 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "filter:" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 -#: contrib/admindocs/views.py:159 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "view:" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Fant ikke applikasjonen %r" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Fant ikke modellen %(model_name)r i applikasjonen %(app_label)r" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "det relaterte `%(app_label)s.%(data_type)s`-objektet" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "modell:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "relaterte `%(app_label)s.%(object_name)s`-objekter" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "alle %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "antall %s" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Felter på %s-objekter" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Heltall" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Boolsk (True eller False)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "Tekst (opp til %(max_length)s tegn)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Heltall adskilt med komma" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Dato (uten tid)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Dato (med tid)" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Desimaltall" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "E-postadresse" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Filsti" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Flyttall" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "IP-adresse" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Boolsk (True, False eller None)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Relasjon til foreldermodell" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Telefonnummer" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Tekst" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Tid" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "Nettadresse" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "Stat (i USA, to store bokstaver)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "XML-tekst" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s ser ikke ut til å være et urlpattern-objekt" @@ -1770,18 +1780,25 @@ msgstr "" "Vi beklager, men dette skjemaet har tidsavbrutt. Vennligst fyll ut skjemaet " "fra denne siden." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Ingen geometriverdi oppgitt." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Ugyldig geometriverdi" -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Ugyldig geometritype" +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"En feil oppstod ved transformering av geometrien til SRID fra geometrifeltet." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "." @@ -3891,13 +3908,13 @@ msgstr "Verdien må være None, True eller False." msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." msgstr "Oppgi tiden på formen TT:MM[:ss[.uuuuuu]]." -#: db/models/fields/related.py:792 +#: db/models/fields/related.py:816 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." -#: db/models/fields/related.py:870 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3956,11 +3973,11 @@ msgstr "Verdien kan ikke ha mer enn %s desimaler." 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:288 forms/fields.py:862 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Oppgi en gyldig dato." -#: forms/fields.py:322 forms/fields.py:863 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Oppgi et gyldig tidspunkt." @@ -4002,20 +4019,20 @@ msgstr "Oppgi en gyldig nettadresse." msgid "This URL appears to be a broken link." msgstr "Nettadressen fører til en side som ikke eksisterer." -#: forms/fields.py:624 forms/fields.py:702 +#: forms/fields.py:625 forms/fields.py:703 #, 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:703 forms/fields.py:764 forms/models.py:776 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Oppgi en liste med verdier." -#: forms/fields.py:891 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Oppgi en gyldig IPv4-adresse." -#: forms/fields.py:901 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" @@ -4026,25 +4043,53 @@ msgstr "" msgid "Order" msgstr "Rekkefølge" -#: forms/models.py:299 forms/models.py:308 +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s med %(field_label)s finnes allerede." -#: forms/models.py:651 +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Vennligst korriger duplisert data for %(field)s." + +#: forms/models.py:598 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "Vennligst korriger duplisert data for %(field)s, som må være unik." + +#: forms/models.py:604 +#, 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." + +#: forms/models.py:612 +msgid "Please correct the duplicate values below." +msgstr "Vennligst korriger de dupliserte verdiene nedenfor." + +#: forms/models.py:867 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:706 +#: forms/models.py:930 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Velg et gyldig valg. Valget er ikke et av de tilgjengelige valgene." -#: forms/models.py:777 +#: forms/models.py:1004 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "Velg et gyldig valg. %s er ikke et av de tilgjengelige valgene." -#: forms/models.py:779 +#: forms/models.py:1006 #, 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." @@ -4075,27 +4120,27 @@ msgstr "%.1f MB" msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "p.m." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "a.m." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "PM" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "AM" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "midnatt" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "12:00" diff --git a/django/conf/locale/pl/LC_MESSAGES/django.mo b/django/conf/locale/pl/LC_MESSAGES/django.mo index e6387f9f4f..309db85baf 100644 Binary files a/django/conf/locale/pl/LC_MESSAGES/django.mo and b/django/conf/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pl/LC_MESSAGES/django.po b/django/conf/locale/pl/LC_MESSAGES/django.po index cd5cc68a6b..ba985d01e9 100644 --- a/django/conf/locale/pl/LC_MESSAGES/django.po +++ b/django/conf/locale/pl/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-20 12:58+0200\n" +"POT-Creation-Date: 2009-07-17 21:59+0200\n" "PO-Revision-Date: 2008-02-25 15:53+0100\n" "Last-Translator: Jarek Zgoda \n" "MIME-Version: 1.0\n" @@ -223,7 +223,7 @@ msgstr "chiński tradycyjny" msgid "Successfully deleted %(count)d %(items)s." msgstr "Usunięto %(count)d %(items)s." -#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 msgid "Are you sure?" msgstr "Jesteś pewien?" @@ -321,7 +321,7 @@ msgstr "Zmieniono %s" #: contrib/admin/options.py:519 contrib/admin/options.py:529 #: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 -#: forms/models.py:587 +#: forms/models.py:600 msgid "and" msgstr "i" @@ -344,53 +344,53 @@ msgstr "Usunięto %(name)s \"%(object)s\"." msgid "No fields changed." msgstr "Żadne pole nie zmienione." -#: contrib/admin/options.py:598 contrib/auth/admin.py:67 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" dodany pomyślnie." -#: contrib/admin/options.py:602 contrib/admin/options.py:635 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Możesz ponownie edytować wpis poniżej." -#: contrib/admin/options.py:612 contrib/admin/options.py:645 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Możesz dodać nowy wpis %s poniżej." -#: contrib/admin/options.py:633 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" zostało pomyślnie zmienione." -#: contrib/admin/options.py:641 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" dodane pomyślnie. Możesz edytować ponownie wpis poniżej." -#: contrib/admin/options.py:772 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Dodaj %s" -#: contrib/admin/options.py:803 contrib/admin/options.py:1003 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Obiekt %(name)s o kluczu głównym %(key)r nie istnieje." -#: contrib/admin/options.py:860 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Zmień %s" -#: contrib/admin/options.py:904 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "Błąd bazy danych" -#: contrib/admin/options.py:940 +#: contrib/admin/options.py:941 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -398,17 +398,17 @@ msgstr[0] "%(count)s %(name)s został pomyślnie zmieniony." msgstr[1] "%(count)s %(name)s zostały pomyślnie zmienione." msgstr[2] "%(count)s %(name)s zostało pomyślnie zmienionych." -#: contrib/admin/options.py:1018 +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" usunięty pomyślnie." -#: contrib/admin/options.py:1054 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Historia zmian: %s" -#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -417,11 +417,11 @@ msgstr "" "Proszę wpisać poprawną nazwę użytkownika i hasło. Uwaga: wielkość liter ma " "znaczenie." -#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Twoja sesja wygasła, zaloguj się ponownie." -#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -429,27 +429,27 @@ msgstr "" "Twoja przeglądarka nie chce akceptować ciasteczek. Zmień jej ustawienia i " "spróbuj ponownie." -#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Nazwy użytkowników nie mogą zawierać znaku '@'." -#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Podany adres e-mail nie jest Twoją nazwą użytkownika. Spróbuj '%s'." -#: contrib/admin/sites.py:360 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Administracja stroną" -#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Zaloguj się" -#: contrib/admin/sites.py:417 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "%s - administracja" @@ -484,7 +484,7 @@ msgstr "Zmień:" msgid "Lookup" msgstr "Szukaj" -#: contrib/admin/widgets.py:236 +#: contrib/admin/widgets.py:235 msgid "Add Another" msgstr "Dodaj kolejny" @@ -499,7 +499,7 @@ msgstr "Niestety, żądana strona nie została znaleziona." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:31 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -545,7 +545,7 @@ msgstr "Wykonaj wybraną akcję" #: contrib/admin/templates/admin/actions.html:4 msgid "Go" -msgstr "Szukaj" +msgstr "Wykonaj" #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 @@ -553,18 +553,18 @@ msgstr "Szukaj" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Witaj," -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentacja" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:40 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -572,7 +572,7 @@ msgstr "Dokumentacja" msgid "Change password" msgstr "Zmiana hasła" -#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -755,6 +755,11 @@ msgstr "" msgid "Show all" msgstr "Pokaż wszystko" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Zapisz" + #: contrib/admin/templates/admin/search_form.html:8 msgid "Search" msgstr "Szukaj" @@ -772,10 +777,6 @@ msgstr[2] "%(counter)s wyników" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s trafień" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Zapisz" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Zapisz jako nowe" @@ -999,144 +1000,145 @@ msgstr "strona" msgid "template" msgstr "szablon" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 -#: contrib/admindocs/views.py:62 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "tag:" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 -#: contrib/admindocs/views.py:95 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "filtr:" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 -#: contrib/admindocs/views.py:159 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "widok:" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Aplikacja %r nie została znaleziona" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Model %(model_name)r nie został znaleziony w aplikacji %(app_label)r" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "powiązany obiekt `%(app_label)s.%(data_type)s`" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "model:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "powiązane obiekty `%(app_label)s.%(object_name)s`" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "wszystkie %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "liczba %s" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Pola obiektów %s" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Liczba całkowita" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Wartość logiczna (True, False - prawda lub fałsz)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "Łańcuch (do %(max_length)s znaków)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Liczby całkowite rozdzielone przecinkami" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Data (bez godziny)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Data (z godziną)" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Liczba dziesiętna" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "Adres e-mail" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Ścieżka do pliku" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Liczba zmiennoprzecinkowa" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "Adres IP" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Wartość logiczna (True, False, None - prawda, fałsz lub nic)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Relacja do modelu rodzica" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Numer telefonu" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Tekst" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Czas" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "Stan USA (dwie duże litery)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "Tekst XML" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s nie jest obiektem urlpattern" @@ -3920,14 +3922,14 @@ msgstr "" 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/related.py:792 +#: db/models/fields/related.py:816 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." -#: db/models/fields/related.py:870 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -4051,7 +4053,7 @@ 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:704 forms/fields.py:765 forms/models.py:991 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Podaj listę wartości." @@ -4080,43 +4082,43 @@ msgstr "" msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(field_label)s już istnieje w %(model_name)s." -#: forms/models.py:581 +#: forms/models.py:594 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Popraw zduplikowane dane w %(field)s." -#: forms/models.py:585 +#: forms/models.py:598 #, 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:591 +#: forms/models.py:604 #, 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:599 +#: forms/models.py:612 msgid "Please correct the duplicate values below." msgstr "Popraw poniższe zduplikowane wartości." -#: forms/models.py:855 +#: forms/models.py:867 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:918 +#: forms/models.py:930 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:992 +#: forms/models.py:1004 #, 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:994 +#: forms/models.py:1006 #, python-format msgid "\"%s\" is not a valid value for a primary key." msgstr "\"%s\" nie jest poprawną wartością klucza głównego." diff --git a/django/conf/locale/pt/LC_MESSAGES/django.mo b/django/conf/locale/pt/LC_MESSAGES/django.mo index 7a04e0e75b..afb03251d1 100644 Binary files a/django/conf/locale/pt/LC_MESSAGES/django.mo and b/django/conf/locale/pt/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pt/LC_MESSAGES/django.po b/django/conf/locale/pt/LC_MESSAGES/django.po index 6f948bf556..7d7ee96a87 100644 --- a/django/conf/locale/pt/LC_MESSAGES/django.po +++ b/django/conf/locale/pt/LC_MESSAGES/django.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-29 09:17+0100\n" -"PO-Revision-Date: 2008-08-29 13:02+0100\n" +"POT-Creation-Date: 2009-07-23 09:34+0100\n" +"PO-Revision-Date: 2009-07-23 10:43+0100\n" "Last-Translator: Nuno Mariz \n" "Language-Team: pt_PT \n" "MIME-Version: 1.0\n" @@ -98,117 +98,139 @@ msgid "Hebrew" msgstr "Hebraico" #: conf/global_settings.py:65 +msgid "Hindi" +msgstr "" + +#: conf/global_settings.py:66 msgid "Croatian" msgstr "Croata" -#: conf/global_settings.py:66 +#: conf/global_settings.py:67 msgid "Icelandic" msgstr "Islandês" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Italian" msgstr "Italiano" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Japanese" msgstr "Japonês" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Georgian" msgstr "Georgiano" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Korean" msgstr "Coreano" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Khmer" msgstr "Khmer" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Kannada" msgstr "Canarês" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Latvian" msgstr "Letão" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Lithuanian" msgstr "Lituano" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Macedonian" msgstr "Macedónio" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Dutch" msgstr "Holandês" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "Norwegian" msgstr "Norueguês" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Polish" msgstr "Polaco" -#: conf/global_settings.py:79 -msgid "Portugese" +#: conf/global_settings.py:80 +msgid "Portuguese" msgstr "Português" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Brazilian Portuguese" msgstr "Português Brasileiro" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Romanian" msgstr "Romeno" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Russian" msgstr "Russo" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Slovak" msgstr "Eslovaco" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Slovenian" msgstr "Esloveno" -#: conf/global_settings.py:85 +#: conf/global_settings.py:86 msgid "Serbian" msgstr "Sérvio" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Swedish" msgstr "Sueco" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 msgid "Tamil" msgstr "Tamil" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Telugu" msgstr "Telugu" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 +msgid "Thai" +msgstr "Thai" + +#: conf/global_settings.py:91 msgid "Turkish" msgstr "Turco" -#: conf/global_settings.py:90 +#: conf/global_settings.py:92 msgid "Ukrainian" msgstr "Ucraniano" -#: conf/global_settings.py:91 +#: conf/global_settings.py:93 msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: conf/global_settings.py:92 +#: conf/global_settings.py:94 msgid "Traditional Chinese" msgstr "Chinês Tradicional" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Foram removidos com sucesso %(count)d %(items)s." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 +msgid "Are you sure?" +msgstr "Tem a certeza?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Remover %(verbose_name_plural)s seleccionados" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" @@ -218,7 +240,7 @@ msgstr "" "

                            Por %s:

                            \n" "
                              \n" -#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 #: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 msgid "All" msgstr "Todos" @@ -243,18 +265,22 @@ msgstr "Este mês" msgid "This year" msgstr "Este ano" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:390 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Sim" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:390 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Não" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:390 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Desconhecido" +#: contrib/admin/helpers.py:14 +msgid "Action:" +msgstr "Acção:" + #: contrib/admin/models.py:19 msgid "action time" msgstr "hora da acção" @@ -283,59 +309,61 @@ msgstr "entrada de log" msgid "log entries" msgstr "entradas de log" -#: contrib/admin/options.py:56 contrib/admin/options.py:120 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" msgstr "Nenhum" -#: contrib/admin/options.py:334 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Foi modificado %s." -#: contrib/admin/options.py:334 contrib/admin/options.py:344 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "e" -#: contrib/admin/options.py:339 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Foram adicionados %(name)s \"%(object)s\"." -#: contrib/admin/options.py:343 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Foram modificados %(list)s para %(name)s \"%(object)s\"." -#: contrib/admin/options.py:348 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Foram removidos %(name)s \"%(object)s\"." -#: contrib/admin/options.py:352 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Nenhum campo foi modificado." -#: contrib/admin/options.py:413 contrib/auth/admin.py:51 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado(a) com sucesso." -#: contrib/admin/options.py:417 contrib/admin/options.py:450 -#: contrib/auth/admin.py:57 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 +#: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Pode editá-lo(a) outra vez abaixo." -#: contrib/admin/options.py:427 contrib/admin/options.py:460 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Pode adicionar outro %s abaixo." -#: contrib/admin/options.py:448 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi modificado(a) com sucesso." -#: contrib/admin/options.py:456 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -343,35 +371,43 @@ msgstr "" "O(A) %(name)s \"%(obj)s\" foi adicionado(a) com sucesso. Pode voltar a " "editar novamente abaixo." -#: contrib/admin/options.py:522 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Adicionar %s" -#: contrib/admin/options.py:600 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "O object %(name)s com a chave primária %(key)r não existe." + +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: contrib/admin/options.py:632 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "Erro de base de dados" -#: contrib/admin/options.py:682 +#: contrib/admin/options.py:941 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s %(name)s foi modificado com sucesso." +msgstr[1] "%(count)s %(name)s foram modificados com sucesso." + +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi removido(a) com sucesso." -#: contrib/admin/options.py:689 -msgid "Are you sure?" -msgstr "Tem a certeza?" - -#: contrib/admin/options.py:718 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Histórico de modificações: %s" -#: contrib/admin/sites.py:18 contrib/admin/views/decorators.py:16 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -380,15 +416,11 @@ msgstr "" "Por favor introduza o utilizador e palavra-passe correctos. Note que ambos " "os casos diferenciam maiúsculas e minúsculas." -#: contrib/admin/sites.py:242 contrib/admin/views/decorators.py:68 -msgid "" -"Please log in again, because your session has expired. Don't worry: Your " -"submission has been saved." -msgstr "" -"Por favor autentique-se novamente, porque a sua sessão expirou. Não se " -"preocupe: Os dados submetidos foram gravados." +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 +msgid "Please log in again, because your session has expired." +msgstr "Por favor autentique-se novamente, porque a sua sessão expirou." -#: contrib/admin/sites.py:249 contrib/admin/views/decorators.py:75 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -396,63 +428,63 @@ msgstr "" "Aparentemente o seu browser não está configurado para aceitar cookies. Por " "favor active os cookies, carrege novamente a página e volte a tentar." -#: contrib/admin/sites.py:265 contrib/admin/sites.py:271 -#: contrib/admin/views/decorators.py:94 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 +#: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Nomes de utilizador não podem conter o caracter '@'." -#: contrib/admin/sites.py:268 contrib/admin/views/decorators.py:90 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" "O seu endereço de e-mail não é o seu nome de utilizador. Tente usar '%s'." -#: contrib/admin/sites.py:336 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Administração do site" -#: contrib/admin/sites.py:358 contrib/admin/templates/admin/login.html:27 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 -#: contrib/admin/views/decorators.py:30 +#: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Entrar" -#: contrib/admin/sites.py:406 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "Administração de %s" -#: contrib/admin/util.py:138 +#: contrib/admin/util.py:168 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Um ou mais %(fieldname)s em %(name)s: %(obj)s" -#: contrib/admin/util.py:143 +#: contrib/admin/util.py:173 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Um ou mais %(fieldname)s em %(name)s:" -#: contrib/admin/widgets.py:65 +#: contrib/admin/widgets.py:71 msgid "Date:" msgstr "Data:" -#: contrib/admin/widgets.py:65 +#: contrib/admin/widgets.py:71 msgid "Time:" msgstr "Hora:" -#: contrib/admin/widgets.py:89 +#: contrib/admin/widgets.py:95 msgid "Currently:" msgstr "Actualmente:" -#: contrib/admin/widgets.py:89 +#: contrib/admin/widgets.py:95 msgid "Change:" msgstr "Modificar:" -#: contrib/admin/widgets.py:115 +#: contrib/admin/widgets.py:124 msgid "Lookup" msgstr "Procurar" -#: contrib/admin/widgets.py:195 +#: contrib/admin/widgets.py:235 msgid "Add Another" msgstr "Adicionar Outro" @@ -467,10 +499,11 @@ msgstr "Pedimos desculpa, mas a página solicitada não foi encontrada." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:30 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:8 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 #: contrib/admin/templates/admin/object_history.html:6 #: contrib/admin/templates/admin/auth/user/change_password.html:10 @@ -505,32 +538,40 @@ msgstr "" "Ocorreu um erro. Foi reportado aos administradores do site via e-mail e " "deverá ser corrigido brevemente. Obrigado pela sua paciência." +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Executar a acção seleccionada" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Ir" + #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 #, python-format msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Bem-vindo," -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentação" -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/admin/base.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" msgstr "Modificar palavra-passe" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -556,28 +597,29 @@ msgstr "História" #: contrib/admin/templates/admin/change_form.html:28 #: contrib/admin/templates/admin/edit_inline/stacked.html:13 -#: contrib/admin/templates/admin/edit_inline/tabular.html:25 +#: contrib/admin/templates/admin/edit_inline/tabular.html:27 msgid "View on site" msgstr "Ver no site" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/auth/user/change_password.html:22 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Por favor corrija o erro abaixo." msgstr[1] "Por favor corrija os erros abaixo." -#: contrib/admin/templates/admin/change_list.html:16 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" msgstr "Adicionar %(name)s" -#: contrib/admin/templates/admin/change_list.html:26 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "Filtro" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 msgid "Delete" msgstr "Remover" @@ -587,7 +629,10 @@ msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " "related objects, but your account doesn't have permission to delete the " "following types of objects:" -msgstr "A remoção de %(object_name)s '%(escaped_object)s' resultará na remoção dos objectos relacionados, mas a sua conta não tem permissão de remoção dos seguintes tipos de objectos:" +msgstr "" +"A remoção de %(object_name)s '%(escaped_object)s' resultará na remoção dos " +"objectos relacionados, mas a sua conta não tem permissão de remoção dos " +"seguintes tipos de objectos:" #: contrib/admin/templates/admin/delete_confirmation.html:23 #, python-format @@ -599,9 +644,29 @@ msgstr "" "Todos os items relacionados seguintes irão ser removidos:" #: contrib/admin/templates/admin/delete_confirmation.html:28 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:33 msgid "Yes, I'm sure" msgstr "Sim, tenho a certeza" +#: contrib/admin/templates/admin/delete_selected_confirmation.html:9 +msgid "Delete multiple objects" +msgstr "Remover múltiplos objectos." + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:15 +#, python-format +msgid "" +"Deleting the %(object_name)s would result in deleting related objects, but " +"your account doesn't have permission to delete the following types of " +"objects:" +msgstr "A remoção de %(object_name)s resultará na remoção de todos os objectos relacionados, mas a sua conta não tem permissões para remover os seguintes tipos de objectos:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:22 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(object_name)s objects? All of " +"the following objects and it's related items will be deleted:" +msgstr "Tem a certeza que deseja remover os objectos %(object_name)s? Todos os seguintes objectos e seus itens relacionados serão removidos:" + #: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " @@ -632,6 +697,10 @@ msgstr "As minhas Acções" msgid "None available" msgstr "Nenhum disponível" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Conteúdo desconhecido" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -659,11 +728,12 @@ msgid "User" msgstr "Utilizador" #: contrib/admin/templates/admin/object_history.html:24 +#: contrib/comments/templates/comments/moderation_queue.html:33 msgid "Action" msgstr "Acção" #: contrib/admin/templates/admin/object_history.html:30 -#: utils/translation/trans_real.py:404 +#: utils/translation/trans_real.py:400 msgid "DATETIME_FORMAT" msgstr "N j, Y, P" @@ -679,9 +749,14 @@ msgstr "" msgid "Show all" msgstr "Mostrar todos" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Gravar" + #: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Ir" +msgid "Search" +msgstr "Pesquisar" #: contrib/admin/templates/admin/search_form.html:10 #, python-format @@ -695,10 +770,6 @@ msgstr[1] "%(counter)s resultados" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s no total" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Gravar" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Gravar como novo" @@ -725,26 +796,27 @@ msgid "Username" msgstr "Utilizador" #: contrib/admin/templates/admin/auth/user/add_form.html:20 -#: contrib/admin/templates/admin/auth/user/change_password.html:33 -#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 msgid "Password" msgstr "Palavra-passe" #: contrib/admin/templates/admin/auth/user/add_form.html:26 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/auth/forms.py:185 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/auth/forms.py:186 msgid "Password (again)" msgstr "Palavra-passe (novamente)" #: contrib/admin/templates/admin/auth/user/add_form.html:27 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 msgid "Enter the same password as above, for verification." msgstr "Introduza a palavra-passe como acima, para verificação." -#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." -msgstr "Introduza uma nova password para o utilizador %(username)s." +msgstr "" +"Introduza uma nova password para o utilizador %(username)s." #: contrib/admin/templates/admin/edit_inline/tabular.html:15 msgid "Delete?" @@ -832,7 +904,9 @@ msgstr "Introduza a nova palavra-passe" msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." -msgstr "Por favor, introduza a sua nova palavra-passe duas vezes para verificarmos se está correcta." +msgstr "" +"Por favor, introduza a sua nova palavra-passe duas vezes para verificarmos " +"se está correcta." #: contrib/admin/templates/registration/password_reset_confirm.html:26 msgid "Password reset unsuccessful" @@ -842,7 +916,10 @@ msgstr "Palavra-passe reinicializada sem sucesso" msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." -msgstr "O endereço de reinicialização da palavra-passe é inválido, possivelmente porque já foi usado. Por favor requisite uma nova reinicialização da palavra-passe." +msgstr "" +"O endereço de reinicialização da palavra-passe é inválido, possivelmente " +"porque já foi usado. Por favor requisite uma nova reinicialização da palavra-" +"passe." #: contrib/admin/templates/registration/password_reset_done.html:6 #: contrib/admin/templates/registration/password_reset_done.html:10 @@ -853,7 +930,9 @@ msgstr "Palavra-passe reinicializada com sucesso" msgid "" "We've e-mailed you instructions for setting your password to the e-mail " "address you submitted. You should be receiving it shortly." -msgstr "Foi enviado para o e-mail que submeteu as instruções de configuração da palavra-passe. Deverá estar a recebê-lo brevemente." +msgstr "" +"Foi enviado para o e-mail que submeteu as instruções de configuração da " +"palavra-passe. Deverá estar a recebê-lo brevemente." #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" @@ -887,7 +966,9 @@ msgstr "A equipa do %(site_name)s" msgid "" "Forgotten your password? Enter your e-mail address below, and we'll e-mail " "instructions for setting a new one." -msgstr "Esqueceu-se da palavra-passe? Introduza o seu e-mail abaixo, e enviaremos as instruções de configuração de uma nova." +msgstr "" +"Esqueceu-se da palavra-passe? Introduza o seu e-mail abaixo, e enviaremos as " +"instruções de configuração de uma nova." #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" @@ -897,165 +978,167 @@ msgstr "Endereço de e-mail:" msgid "Reset my password" msgstr "Reinicializar a minha palavra-passe" -#: contrib/admin/templatetags/admin_list.py:284 +#: contrib/admin/templatetags/admin_list.py:299 msgid "All dates" msgstr "Todas as datas" -#: contrib/admin/views/main.py:65 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s" msgstr "Seleccionar %s" -#: contrib/admin/views/main.py:65 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s to change" msgstr "Seleccione %s para modificar" -#: contrib/admin/views/template.py:36 contrib/sites/models.py:38 +#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 msgid "site" msgstr "site" -#: contrib/admin/views/template.py:38 +#: contrib/admin/views/template.py:39 msgid "template" msgstr "template" -#: contrib/admindocs/views.py:53 contrib/admindocs/views.py:55 -#: contrib/admindocs/views.py:57 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "tag:" -#: contrib/admindocs/views.py:87 contrib/admindocs/views.py:89 -#: contrib/admindocs/views.py:91 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "filtro:" -#: contrib/admindocs/views.py:153 contrib/admindocs/views.py:155 -#: contrib/admindocs/views.py:157 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "ver:" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "A aplicação %r não encontrada" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "O Model %(model_name)r não foi encontrado na applicação %(app_label)r" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "o objecto `%(app_label)s.%(data_type)s` relacionado" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "model:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "os objectos `%(app_label)s.%(object_name)s` relacionados" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "todos %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "número de %s" -#: contrib/admindocs/views.py:253 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Campos nos objectos %s" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:328 -#: contrib/admindocs/views.py:330 contrib/admindocs/views.py:336 -#: contrib/admindocs/views.py:337 contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Inteiro" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Boolean (Pode ser True ou False)" -#: contrib/admindocs/views.py:319 contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "String (até %(max_length)s)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Inteiros separados por virgula" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Data (sem hora)" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Data (com hora)" -#: contrib/admindocs/views.py:323 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Número décimal" -#: contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "Endereço de e-mail" -#: contrib/admindocs/views.py:325 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:329 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Caminho do ficheiro" -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Número em vírgula flutuante" -#: contrib/admindocs/views.py:331 contrib/comments/models.py:57 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "Endereço IP" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Boolean (Pode ser True, False ou None)" -#: contrib/admindocs/views.py:334 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Relação para o pai do model" -#: contrib/admindocs/views.py:335 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Número de telefone" -#: contrib/admindocs/views.py:340 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Texto" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Hora" -#: contrib/admindocs/views.py:342 contrib/comments/forms.py:20 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 +#: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "Estado dos E.U.A (duas letras em maiúsculas)" -#: contrib/admindocs/views.py:344 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "Texto XML" -#: contrib/admindocs/views.py:370 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s não parece ser um objecto urlpattern" @@ -1145,21 +1228,21 @@ msgstr "Datas importantes" msgid "Groups" msgstr "Grupos" -#: contrib/auth/admin.py:62 +#: contrib/auth/admin.py:80 msgid "Add user" msgstr "Adicionar utilizador" -#: contrib/auth/admin.py:88 +#: contrib/auth/admin.py:106 msgid "Password changed successfully." msgstr "Palavra-passe modificada com sucesso." -#: contrib/auth/admin.py:94 +#: contrib/auth/admin.py:112 #, python-format msgid "Change password: %s" msgstr "Modificar a palavra-passe: %s" #: contrib/auth/forms.py:15 contrib/auth/forms.py:48 -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." @@ -1179,8 +1262,8 @@ msgstr "Confirmação da palavra-passe" msgid "A user with that username already exists." msgstr "Já existe um utilizador com esse nome." -#: contrib/auth/forms.py:36 contrib/auth/forms.py:154 -#: contrib/auth/forms.py:196 +#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:197 msgid "The two password fields didn't match." msgstr "Os dois campos da palavra-passe não coincidem." @@ -1204,102 +1287,110 @@ msgstr "E-mail" msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" -msgstr "Esse e-mail não tem nenhuma conta de utilizador associada. Tem a certeza que já se registou?" +msgstr "" +"Esse e-mail não tem nenhuma conta de utilizador associada. Tem a certeza que " +"já se registou?" -#: contrib/auth/forms.py:134 +#: contrib/auth/forms.py:135 #, python-format msgid "Password reset on %s" msgstr "Palavra-passe reinicializada em %s" -#: contrib/auth/forms.py:142 +#: contrib/auth/forms.py:143 msgid "New password" msgstr "Nova palavra-passe" -#: contrib/auth/forms.py:143 +#: contrib/auth/forms.py:144 msgid "New password confirmation" msgstr "Confirmação da nova palavra-passe" -#: contrib/auth/forms.py:168 +#: contrib/auth/forms.py:169 msgid "Old password" msgstr "Palavra-passe antiga" -#: contrib/auth/forms.py:176 +#: contrib/auth/forms.py:177 msgid "Your old password was entered incorrectly. Please enter it again." -msgstr "A sua palavra-passe antiga foi introduzida incorrectamente. Por favor tente novamente." +msgstr "" +"A sua palavra-passe antiga foi introduzida incorrectamente. Por favor tente " +"novamente." -#: contrib/auth/models.py:72 contrib/auth/models.py:95 +#: contrib/auth/models.py:63 contrib/auth/models.py:86 msgid "name" msgstr "nome" -#: contrib/auth/models.py:74 +#: contrib/auth/models.py:65 msgid "codename" msgstr "nome de código" -#: contrib/auth/models.py:77 +#: contrib/auth/models.py:68 msgid "permission" msgstr "permissão" -#: contrib/auth/models.py:78 contrib/auth/models.py:96 +#: contrib/auth/models.py:69 contrib/auth/models.py:87 msgid "permissions" msgstr "permissões" -#: contrib/auth/models.py:99 +#: contrib/auth/models.py:90 msgid "group" msgstr "grupo" -#: contrib/auth/models.py:100 contrib/auth/models.py:146 +#: contrib/auth/models.py:91 contrib/auth/models.py:138 msgid "groups" msgstr "grupos" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "username" msgstr "utilizador" -#: contrib/auth/models.py:137 +#: contrib/auth/models.py:129 msgid "first name" msgstr "primeiro nome" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:130 msgid "last name" msgstr "último nome" -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:131 msgid "e-mail address" msgstr "endereço de e-mail" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "password" msgstr "palavra-passe" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." -msgstr "Use '[algo]$[salt]$[hexdigest]' ou use o formulário de modificação da palavra-passe." +msgstr "" +"Use '[algo]$[salt]$[hexdigest]' ou use o formulário de " +"modificação da palavra-passe." -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "staff status" msgstr "status de equipa" -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "Designates whether the user can log into this admin site." msgstr "Define se o utilizador pode usar a administração do site." -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "active" msgstr "activo" -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." -msgstr "Defina se este utilizador deva ser tratado como activo. Não seleccione em vez de remover as contas." +msgstr "" +"Defina se este utilizador deva ser tratado como activo. Não seleccione em " +"vez de remover as contas." -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "superuser status" msgstr "Status de superuser" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." @@ -1307,15 +1398,15 @@ msgstr "" "Define se este utilizador tem todas as permissões sem explicitamente as " "atribuir." -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:136 msgid "last login" msgstr "última entrada" -#: contrib/auth/models.py:145 +#: contrib/auth/models.py:137 msgid "date joined" msgstr "data de registo" -#: contrib/auth/models.py:147 +#: contrib/auth/models.py:139 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." @@ -1323,27 +1414,28 @@ msgstr "" "Em adição às permissões definidas manualmente, este utilizador também terá " "todas as permissões atribuídas a cada grupo a que partence." -#: contrib/auth/models.py:148 +#: contrib/auth/models.py:140 msgid "user permissions" msgstr "permissões do utilizador" -#: contrib/auth/models.py:152 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "utilizador" -#: contrib/auth/models.py:153 +#: contrib/auth/models.py:145 msgid "users" msgstr "utilizadores" -#: contrib/auth/models.py:308 +#: contrib/auth/models.py:301 msgid "message" msgstr "mensagem" -#: contrib/auth/views.py:50 +#: contrib/auth/views.py:56 msgid "Logged out" msgstr "Saiu" -#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:423 +#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 msgid "Enter a valid e-mail address." msgstr "Introduza um endereço de e-mail válido." @@ -1355,68 +1447,86 @@ msgstr "Conteúdo" msgid "Metadata" msgstr "Metadata" -#: contrib/comments/forms.py:18 +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "comentários em %(site_name)s" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Últimos comentários em %(site_name)s" + +#: contrib/comments/forms.py:93 +#: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" msgstr "Nome" -#: contrib/comments/forms.py:19 +#: contrib/comments/forms.py:94 msgid "Email address" msgstr "Endereço de e-mail" -#: contrib/comments/forms.py:21 +#: contrib/comments/forms.py:96 +#: contrib/comments/templates/comments/moderation_queue.html:35 msgid "Comment" msgstr "Comentário" -#: contrib/comments/forms.py:24 -msgid "" -"If you enter anything in this field your comment will be treated as spam" -msgstr "Se não introduzir nada neste campo o seu comentário irá ser tratado como spam" - -#: contrib/comments/forms.py:124 +#: contrib/comments/forms.py:173 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." msgstr[0] "Atenção à linguagem! A palavra %s não é permitida aqui." msgstr[1] "Atenção à linguagem! As palavras %s não são permitidas aqui." -#: contrib/comments/models.py:22 +#: contrib/comments/forms.py:180 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "" +"Se não introduzir nada neste campo o seu comentário irá ser tratado como spam" + +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "tipo de conteúdo" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "ID do objecto" -#: contrib/comments/models.py:49 +#: contrib/comments/models.py:52 msgid "user's name" msgstr "o nome do utilizador" -#: contrib/comments/models.py:50 +#: contrib/comments/models.py:53 msgid "user's email address" msgstr "endereço de e-mail do utilizador" -#: contrib/comments/models.py:51 +#: contrib/comments/models.py:54 msgid "user's URL" msgstr "URL do utilizador" -#: contrib/comments/models.py:53 +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "comentário" -#: contrib/comments/models.py:56 +#: contrib/comments/models.py:59 msgid "date/time submitted" msgstr "data/hora de submissão" -#: contrib/comments/models.py:58 +#: contrib/comments/models.py:61 msgid "is public" msgstr "é público" -#: contrib/comments/models.py:59 +#: contrib/comments/models.py:62 msgid "" "Uncheck this box to make the comment effectively disappear from the site." msgstr "Não seleccione esta caixa para que o comentário desapareça do site." -#: contrib/comments/models.py:61 +#: contrib/comments/models.py:64 msgid "is removed" msgstr "foi removido" -#: contrib/comments/models.py:62 +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." @@ -1424,19 +1534,27 @@ msgstr "" "Seleccione esta opção se o comentário não é apropriado. Uma mensagem \"Este " "comentário foi removido\" será mostrada no seu lugar." -#: contrib/comments/models.py:114 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "comentários" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." -msgstr "Este comentário foi colocado por um utilizador autenticado, portanto o nome é apenas de leitura." +msgstr "" +"Este comentário foi colocado por um utilizador autenticado, portanto o nome " +"é apenas de leitura." -#: contrib/comments/models.py:123 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." -msgstr "Este comentário foi colocado por um utilizador autenticado, portanto o e-mail é apenas de leitura." +msgstr "" +"Este comentário foi colocado por um utilizador autenticado, portanto o e-" +"mail é apenas de leitura." -#: contrib/comments/models.py:148 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1451,15 +1569,154 @@ msgstr "" "\n" "http://%(domain)s%(url)s" -#: contrib/contenttypes/models.py:67 +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "marcar" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "data" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "marca de comentário" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "marcas de comentários" + +#: contrib/comments/templates/comments/approve.html:4 +msgid "Approve a comment" +msgstr "Aprovar um comentário" + +#: contrib/comments/templates/comments/approve.html:7 +msgid "Really make this comment public?" +msgstr "Tem a certeza que deseja tornar este comentário público?" + +#: contrib/comments/templates/comments/approve.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:49 +msgid "Approve" +msgstr "Aprovar" + +#: contrib/comments/templates/comments/approved.html:4 +msgid "Thanks for approving" +msgstr "Obrigado pela aprovação" + +#: contrib/comments/templates/comments/approved.html:7 +#: contrib/comments/templates/comments/deleted.html:7 +#: contrib/comments/templates/comments/flagged.html:7 +msgid "" +"Thanks for taking the time to improve the quality of discussion on our site" +msgstr "Obrigado por dedicar o seu tempo para melhorar a qualidade de discussão no nosso site" + +#: contrib/comments/templates/comments/delete.html:4 +msgid "Remove a comment" +msgstr "Remover um comentário" + +#: contrib/comments/templates/comments/delete.html:7 +msgid "Really remove this comment?" +msgstr "Tem a certeza que deseja remover este comentário?" + +#: contrib/comments/templates/comments/delete.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:53 +msgid "Remove" +msgstr "Remover" + +#: contrib/comments/templates/comments/deleted.html:4 +msgid "Thanks for removing" +msgstr "Obrigado pela remoção" + +#: contrib/comments/templates/comments/flag.html:4 +msgid "Flag this comment" +msgstr "Marcar este comentário" + +#: contrib/comments/templates/comments/flag.html:7 +msgid "Really flag this comment?" +msgstr "Tem a certeza que deseja marcar este comentário?" + +#: contrib/comments/templates/comments/flag.html:12 +msgid "Flag" +msgstr "Marcar" + +#: contrib/comments/templates/comments/flagged.html:4 +msgid "Thanks for flagging" +msgstr "Obrigado por marcar" + +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 +msgid "Post" +msgstr "Publicar" + +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 +msgid "Preview" +msgstr "Prever" + +#: contrib/comments/templates/comments/moderation_queue.html:4 +#: contrib/comments/templates/comments/moderation_queue.html:19 +msgid "Comment moderation queue" +msgstr "Fila de moderação de comentário" + +#: contrib/comments/templates/comments/moderation_queue.html:26 +msgid "No comments to moderate" +msgstr "Nenhum comentário para moderar" + +#: contrib/comments/templates/comments/moderation_queue.html:36 +msgid "Email" +msgstr "Email" + +#: contrib/comments/templates/comments/moderation_queue.html:38 +msgid "Authenticated?" +msgstr "Autenticado?" + +#: contrib/comments/templates/comments/moderation_queue.html:39 +msgid "IP Address" +msgstr "Endereço IP" + +#: contrib/comments/templates/comments/moderation_queue.html:40 +msgid "Date posted" +msgstr "Data de publicação" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "yes" +msgstr "sim" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "no" +msgstr "não" + +#: contrib/comments/templates/comments/posted.html:4 +msgid "Thanks for commenting" +msgstr "Obrigado por comentar" + +#: contrib/comments/templates/comments/posted.html:7 +msgid "Thank you for your comment" +msgstr "Obrigado pelo seu comentário" + +#: contrib/comments/templates/comments/preview.html:4 +#: contrib/comments/templates/comments/preview.html:13 +msgid "Preview your comment" +msgstr "Pré-visualizar comentário" + +#: contrib/comments/templates/comments/preview.html:11 +msgid "Please correct the error below" +msgid_plural "Please correct the errors below" +msgstr[0] "Por favor corrija o seguinte erro." +msgstr[1] "Por favor corrija os seguintes erros." + +#: contrib/comments/templates/comments/preview.html:16 +msgid "Post your comment" +msgstr "Publique o seu comentário" + +#: contrib/comments/templates/comments/preview.html:16 +msgid "or make changes" +msgstr "ou faça modificações" + +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "python model class name" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "tipo de conteúdo" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "tipos de conteúdos" @@ -1526,20 +1783,28 @@ msgstr "páginas planas" msgid "" "We apologize, but your form has expired. Please continue filling out the " "form from this page." -msgstr "Pedimos desculpa, mas o seu formulário expirou. Por favor continue a preencher o formulário a partir desta página." +msgstr "" +"Pedimos desculpa, mas o seu formulário expirou. Por favor continue a " +"preencher o formulário a partir desta página." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Não foi submetido nenhum valor do tipo geometria." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Valor inválido de geometria." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Tipo inválido de geometria." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "Ocorreu um erro na transformação da geometria para o SRID da geometria do campo do formulário." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "º" @@ -1641,7 +1906,7 @@ msgstr "Este campo apenas aceita 7 ou 8 dígitos." #: contrib/localflavor/ar/forms.py:79 msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." -msgstr "Introduza o CUIT no formato XX-XXXXXXXX-X or XXXXXXXXXXXX." +msgstr "Introduza o CUIT no formato XX-XXXXXXXX-X ou XXXXXXXXXXXX." #: contrib/localflavor/ar/forms.py:80 msgid "Invalid CUIT." @@ -1690,7 +1955,9 @@ msgstr "Introduza um código postal no formato XXXX." #: contrib/localflavor/at/forms.py:48 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format." -msgstr "Introduza um código de segurança social austríaco válido no formato XXXX XXXXXX." +msgstr "" +"Introduza um código de segurança social austríaco válido no formato XXXX " +"XXXXXX." #: contrib/localflavor/au/forms.py:16 msgid "Enter a 4 digit post code." @@ -1708,7 +1975,9 @@ msgstr "Os números de telefone deverão ser no formato XXX-XXX-XXXX." msgid "" "Select a valid brazilian state. That state is not one of the available " "states." -msgstr "Seleccione um estado brazileiro válido. Esse estado não se encontra disponível." +msgstr "" +"Seleccione um estado brazileiro válido. Esse estado não se encontra " +"disponível." #: contrib/localflavor/br/forms.py:94 msgid "Invalid CPF number." @@ -1732,7 +2001,9 @@ msgstr "Introduza um código postal no formato XXX XXX." #: contrib/localflavor/ca/forms.py:88 msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." -msgstr "Introduza um código de segurança social Canadiano válido no formato XXX-XXX-XXX." +msgstr "" +"Introduza um código de segurança social Canadiano válido no formato XXX-XXX-" +"XXX." #: contrib/localflavor/ch/ch_states.py:5 msgid "Aargau" @@ -1842,7 +2113,9 @@ msgstr "" msgid "" "Enter a valid Swiss identity or passport card number in X1234567<0 or " "1234567890 format." -msgstr "Introduza uma identificação Suíça ou número de passaporte no formato X1234567<0 ou 1234567890." +msgstr "" +"Introduza uma identificação Suíça ou número de passaporte no formato " +"X1234567<0 ou 1234567890." #: contrib/localflavor/cl/forms.py:29 msgid "Enter a valid Chilean RUT." @@ -1856,6 +2129,82 @@ msgstr "Introduza um RUT Chileno válido. O formato é XX.XXX.XXX-X." msgid "The Chilean RUT is not valid." msgstr "O RUT Chileno é inválido." +#: contrib/localflavor/cz/cz_regions.py:8 +msgid "Prague" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:9 +msgid "Central Bohemian Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:10 +msgid "South Bohemian Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:11 +msgid "Pilsen Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:12 +msgid "Carlsbad Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:13 +msgid "Usti Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:14 +msgid "Liberec Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:15 +msgid "Hradec Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:16 +msgid "Pardubice Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:17 +msgid "Vysocina Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:18 +msgid "South Moravian Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:19 +msgid "Olomouc Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:20 +msgid "Zlin Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:21 +msgid "Moravian-Silesian Region" +msgstr "" + +#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "Introduza um código postal no formato XXXXX ou XXX XX" + +#: contrib/localflavor/cz/forms.py:47 +msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." +msgstr "Introduza um número de nascimento no formato XXXXXX/XXXX ou XXXXXXXXXX." + +#: contrib/localflavor/cz/forms.py:48 +msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" +msgstr "Parâmetro opcional inválido do Género, os valores válidos são 'f' e 'm'" + +#: contrib/localflavor/cz/forms.py:49 +msgid "Enter a valid birth number." +msgstr "Introduza um de número de nascimento válido." + +#: contrib/localflavor/cz/forms.py:106 +msgid "Enter a valid IC number." +msgstr "Introduza um número de IC válido." + #: contrib/localflavor/de/de_states.py:5 msgid "Baden-Wuerttemberg" msgstr "" @@ -1929,7 +2278,9 @@ msgstr "Introduza um código postal no formato XXXXX." msgid "" "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " "format." -msgstr "Introduza uma identificação Alemã válida no formato XXXXXXXXXXX-XXXXXXX-XXXXXXX-X" +msgstr "" +"Introduza uma identificação Alemã válida no formato XXXXXXXXXXX-XXXXXXX-" +"XXXXXXX-X" #: contrib/localflavor/es/es_provinces.py:5 msgid "Arava" @@ -2206,7 +2557,9 @@ msgstr "Instruduza um código postal válido no formato 01XXX - 52XXX." msgid "" "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or " "9XXXXXXXX." -msgstr "Introduza um número de telefone válido num dos formatos 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX." +msgstr "" +"Introduza um número de telefone válido num dos formatos 6XXXXXXXX, 8XXXXXXXX " +"or 9XXXXXXXX." #: contrib/localflavor/es/forms.py:66 msgid "Please enter a valid NIF, NIE, or CIF." @@ -2231,7 +2584,9 @@ msgstr "Checksum inválido para o CIF." #: contrib/localflavor/es/forms.py:142 msgid "" "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." -msgstr "Por favor introduza um número de conta bancária no formato XXXX-XXXX-XX-XXXXXXXXXX." +msgstr "" +"Por favor introduza um número de conta bancária no formato XXXX-XXXX-XX-" +"XXXXXXXXXX." #: contrib/localflavor/es/forms.py:143 msgid "Invalid checksum for bank account number." @@ -2248,7 +2603,9 @@ msgstr "Introduza um código postal válido no formato XXXXXXX." #: contrib/localflavor/is_/forms.py:17 msgid "" "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." -msgstr "Introduza um número de identificação Islândica válida. O formato é XXXXXX-XXXX" +msgstr "" +"Introduza um número de identificação Islândica válida. O formato é XXXXXX-" +"XXXX" #: contrib/localflavor/is_/forms.py:18 msgid "The Icelandic identification number is not valid." @@ -2669,21 +3026,22 @@ msgstr "Checksum errado para o número nacional de identificação." #: contrib/localflavor/pl/forms.py:71 msgid "" "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." -msgstr "Introduza um número de imposto NIP no formato XXX-XXX-XX-XX or XX-XX-XXX-XXX." +msgstr "" +"Introduza um número de imposto NIP no formato XXX-XXX-XX-XX or XX-XX-XXX-XXX." #: contrib/localflavor/pl/forms.py:72 msgid "Wrong checksum for the Tax Number (NIP)." msgstr "Checksum errado para o número de imposto NIP." -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." -msgstr "O número de registo nacional de negócio (REGON) consiste em 7 ou 9 dígitos." +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." +msgstr "O Número de Registo Nacional de Negócio (REGON) consiste em 9 ou 14 dígitos." -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." msgstr "Checksum errado para o número de registo nacional de negócio (REGON)." -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." msgstr "Introduza um código postal no formato XX-XXX." @@ -2771,10 +3129,6 @@ msgstr "Os números de telefone deverão ser no formato XXXX-XXXXXX." msgid "Enter a valid postal code in the format XXXXXX" msgstr "Introduza um código postal válido no formato XXXXXX" -#: contrib/localflavor/sk/forms.py:30 -msgid "Enter a postal code in the format XXXXX or XXX XX." -msgstr "Introduza um código postal no formato XXXXX ou XXX XX" - #: contrib/localflavor/sk/sk_districts.py:8 msgid "Banska Bystrica" msgstr "" @@ -3413,7 +3767,8 @@ msgstr "Introduza o código postal no formato XXXXX or XXXXX-XXXX." #: contrib/localflavor/us/forms.py:54 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." -msgstr "Introduza o número de Segurança Social dos E.U. no formato XXX-XX-XXXX." +msgstr "" +"Introduza o número de Segurança Social dos E.U. no formato XXX-XX-XXXX." #: contrib/localflavor/za/forms.py:20 msgid "Enter a valid South African ID number" @@ -3523,55 +3878,60 @@ msgstr "mostrar nome" msgid "sites" msgstr "sites" -#: db/models/fields/__init__.py:332 db/models/fields/__init__.py:667 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "Este campo deverá ser inteiro." -#: db/models/fields/__init__.py:363 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." msgstr "Este valor deverá ser True ou False." -#: db/models/fields/__init__.py:396 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Este campo não pode ser nulo." -#: db/models/fields/__init__.py:412 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "Introduza apenas números separados por vírgulas." -#: db/models/fields/__init__.py:443 +#: db/models/fields/__init__.py:474 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:452 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Data inválida: %s" -#: db/models/fields/__init__.py:516 db/models/fields/__init__.py:534 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format." -msgstr "Introduza uma data/hora válida no formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]]." +msgstr "" +"Introduza uma data/hora válida no formato YYYY-MM-DD HH:MM[:ss[.uuuuuu]]." -#: db/models/fields/__init__.py:570 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." msgstr "Este campo deverá ser um número decimal." -#: db/models/fields/__init__.py:703 +#: db/models/fields/__init__.py:686 +msgid "This value must be a float." +msgstr "Este campo deverá ser número décimal." + +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." msgstr "Este valor deverá ser None, True ou False." -#: db/models/fields/__init__.py:811 db/models/fields/__init__.py:825 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 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/related.py:748 +#: db/models/fields/related.py:816 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Mantenha pressionado o \"Control\", or \"Command\" no Mac, para seleccionar " "mais do que um." -#: db/models/fields/related.py:825 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3582,83 +3942,91 @@ msgstr[1] "" "Por favor introduza IDs de %(self)s válidos. Os valores %(value)r são " "inválidos." -#: forms/fields.py:52 +#: forms/fields.py:54 msgid "This field is required." msgstr "Este campo é obrigatório." -#: forms/fields.py:53 +#: forms/fields.py:55 msgid "Enter a valid value." msgstr "Introduza um valor válido." -#: forms/fields.py:133 +#: forms/fields.py:138 #, python-format msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." -msgstr "Garanta que este valor tem no máximo %(max)d caracteres (tem %(length)d)." +msgstr "" +"Garanta que este valor tem no máximo %(max)d caracteres (tem %(length)d)." -#: forms/fields.py:134 +#: forms/fields.py:139 #, python-format msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." -msgstr "Garanta que este valor tem no mínimo %(min)d caracteres (tem %(length)d)." +msgstr "" +"Garanta que este valor tem no mínimo %(min)d caracteres (tem %(length)d)." -#: forms/fields.py:161 +#: forms/fields.py:166 msgid "Enter a whole number." msgstr "Introduza um número inteiro." -#: forms/fields.py:162 forms/fields.py:191 forms/fields.py:220 +#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225 #, python-format msgid "Ensure this value is less than or equal to %s." msgstr "Garanta que este valor seja menor ou igual a %s." -#: forms/fields.py:163 forms/fields.py:192 forms/fields.py:221 +#: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226 #, python-format msgid "Ensure this value is greater than or equal to %s." msgstr "Garanta que este valor seja maior ou igual a %s." -#: forms/fields.py:190 forms/fields.py:219 +#: forms/fields.py:195 forms/fields.py:224 msgid "Enter a number." msgstr "Introduza um número." -#: forms/fields.py:222 +#: forms/fields.py:227 #, python-format msgid "Ensure that there are no more than %s digits in total." msgstr "Garanta que não possua no total mais do que %s dígitos." -#: forms/fields.py:223 +#: forms/fields.py:228 #, python-format msgid "Ensure that there are no more than %s decimal places." msgstr "Garanta que não possua mais do que %s casas décimais." -#: forms/fields.py:224 +#: forms/fields.py:229 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Garanta que não possua mais do que %s digitos antes do ponto decimal." -#: forms/fields.py:282 forms/fields.py:815 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Introduza uma data válida." -#: forms/fields.py:316 forms/fields.py:816 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Introduza uma hora válida." -#: forms/fields.py:355 +#: forms/fields.py:361 msgid "Enter a valid date/time." msgstr "Introduza uma data/hora válida." -#: forms/fields.py:441 +#: forms/fields.py:447 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:442 +#: forms/fields.py:448 msgid "No file was submitted." msgstr "Nenhum ficheiro submetido." -#: forms/fields.py:443 +#: forms/fields.py:449 msgid "The submitted file is empty." msgstr "O ficheiro submetido encontra-se vazio." -#: forms/fields.py:472 +#: forms/fields.py:450 +#, 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 caracteres (tem %(length)d)." + +#: forms/fields.py:483 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." @@ -3666,92 +4034,137 @@ msgstr "" "Introduza uma imagem válida. O ficheiro que introduziu ou não é uma imagem " "ou está corrompido." -#: forms/fields.py:533 +#: forms/fields.py:544 msgid "Enter a valid URL." msgstr "Introduza um URL válido." -#: forms/fields.py:534 +#: forms/fields.py:545 msgid "This URL appears to be a broken link." msgstr "Este URL é link quebrado." -#: forms/fields.py:613 forms/fields.py:664 +#: forms/fields.py:625 forms/fields.py:703 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "Seleccione uma opção válida. %(value)s não se encontra nas opções disponíveis." +msgstr "" +"Seleccione uma opção válida. %(value)s não se encontra nas opções " +"disponíveis." -#: forms/fields.py:665 forms/fields.py:726 forms/models.py:531 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Introduza uma lista de valores." -#: forms/fields.py:844 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Introduza um endereço IPv4 válido." -#: forms/fields.py:854 +#: forms/fields.py:902 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." +msgstr "" +"Este valor apenas poderá conter letras, números, undercores ou hífenes." -#: forms/formsets.py:242 forms/formsets.py:244 +#: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Ordem" -#: forms/models.py:463 -msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "Seleccione uma opção válida. Esse valor não se encontra opções disponíveis." +#: forms/models.py:367 +#, 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." -#: forms/models.py:532 +#: forms/models.py:381 forms/models.py:389 +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "%(model_name)s com este %(field_label)s já existe." + +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Por favor corrija os dados duplicados em %(field)s." + +#: forms/models.py:598 +#, 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:604 +#, python-format +msgid "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." +msgstr "Por favor corrija os dados duplicados em %(field_name)s que deverá ser único para o %(lookup)s em %(date_field)s.\"" + +#: forms/models.py:612 +msgid "Please correct the duplicate values below." +msgstr "Por favor corrija os valores duplicados abaixo." + +#: forms/models.py:867 +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:930 +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "" +"Seleccione uma opção válida. Esse valor não se encontra opções disponíveis." + +#: forms/models.py:1004 #, python-format msgid "Select a valid choice. %s is not one of the available choices." -msgstr "Seleccione uma opção válida. %s não se encontra nas opções disponíveis." +msgstr "" +"Seleccione uma opção válida. %s não se encontra nas opções disponíveis." -#: template/defaultfilters.py:706 +#: forms/models.py:1006 +#, 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." + +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "sim,não,talvez" -#: template/defaultfilters.py:737 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "" msgstr[1] "" -#: template/defaultfilters.py:739 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "" -#: template/defaultfilters.py:741 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "" -#: template/defaultfilters.py:742 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "" -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "" -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "meia-noite" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "meio-dia" @@ -3975,33 +4388,33 @@ msgid_plural "minutes" msgstr[0] "minuto" msgstr[1] "minutos" -#: utils/timesince.py:43 +#: utils/timesince.py:45 msgid "minutes" msgstr "minutos" -#: utils/timesince.py:48 +#: utils/timesince.py:50 #, python-format msgid "%(number)d %(type)s" msgstr "" -#: utils/timesince.py:54 +#: utils/timesince.py:56 #, python-format msgid ", %(number)d %(type)s" msgstr "" -#: utils/translation/trans_real.py:403 +#: utils/translation/trans_real.py:399 msgid "DATE_FORMAT" msgstr "N j, Y" -#: utils/translation/trans_real.py:405 +#: utils/translation/trans_real.py:401 msgid "TIME_FORMAT" msgstr "P" -#: utils/translation/trans_real.py:421 +#: utils/translation/trans_real.py:417 msgid "YEAR_MONTH_FORMAT" msgstr "F Y" -#: utils/translation/trans_real.py:422 +#: utils/translation/trans_real.py:418 msgid "MONTH_DAY_FORMAT" msgstr "F j" @@ -4050,9 +4463,6 @@ msgstr "O(A) %(verbose_name)s foi removido(a)." #~ msgid "is valid rating" #~ msgstr "é uma avaliação válida" -#~ msgid "comments" -#~ msgstr "comentários" - #~ msgid "Content object" #~ msgstr "Objecto de conteúdo" @@ -4065,9 +4475,6 @@ msgstr "O(A) %(verbose_name)s foi removido(a)." #~ msgid "approved by staff" #~ msgstr "aprovado pela equipa" -#~ msgid "free comment" -#~ msgstr "comentário livre" - #~ msgid "free comments" #~ msgstr "comentários livres" @@ -4177,9 +4584,6 @@ msgstr "O(A) %(verbose_name)s foi removido(a)." #~ msgid "Post a photo" #~ msgstr "Colocar uma foto" -#~ msgid "Preview comment" -#~ msgstr "Pré-visualizar comentário" - #~ msgid "Your name:" #~ msgstr "O seu nome:" @@ -4263,9 +4667,6 @@ msgstr "O(A) %(verbose_name)s foi removido(a)." #~ msgid "Please enter both fields or leave them both empty." #~ msgstr "Por favor preencha ambos os campos ou deixe ambos vazios." -#~ msgid "This field must be given if %(field)s is %(value)s" -#~ msgstr "Este campo deve ser preenchido se %(field)s for %(value)s" - #~ msgid "This field must be given if %(field)s is not %(value)s" #~ msgstr "Este campo deve ser preenchido se %(field)s não é %(value)s" @@ -4365,11 +4766,6 @@ msgstr "O(A) %(verbose_name)s foi removido(a)." #~ "O atributo \"%(attr)s\" na linha %(line)s tem um valor inválido. (A linha " #~ "começa por \"%(start)s\".)" -#~ msgid "" -#~ "%(object)s with this %(type)s already exists for the given %(field)s." -#~ msgstr "" -#~ "O(A) %(object)s com este %(type)s já existe para o(a) %(field)s fornecido." - #~ msgid "Separate multiple IDs with commas." #~ msgstr "Separe múltiplos IDs através de vírgulas." diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index e43786a9cd..e2d0cc4aeb 100644 Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index f6994049d1..7ed3ff1cb7 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: Grupo de Localização para o Português \n" -"POT-Creation-Date: 2009-04-13 22:52-0300\n" -"PO-Revision-Date: 2009-04-13 23:07-0300\n" +"POT-Creation-Date: 2009-07-23 10:00-0300\n" +"PO-Revision-Date: 2009-07-23 10:03-0300\n" "Last-Translator: Guilherme Gondim \n" "Language-Team: Grupo de Localização para o Português \n" "MIME-Version: 1.0\n" @@ -218,16 +218,16 @@ msgstr "Chinês Simplificado" msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: contrib/admin/actions.py:56 +#: contrib/admin/actions.py:60 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Removido %(count)d %(items)s com sucesso." -#: contrib/admin/actions.py:63 contrib/admin/options.py:1023 +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 msgid "Are you sure?" msgstr "Tem certeza?" -#: contrib/admin/actions.py:81 +#: contrib/admin/actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Remover %(verbose_name_plural)s selecionado" @@ -266,15 +266,15 @@ msgstr "Este mês" msgid "This year" msgstr "Este ano" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Sim" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Não" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Desconhecido" @@ -314,56 +314,57 @@ msgstr "entradas de log" msgid "None" msgstr "Nenhum" -#: contrib/admin/options.py:517 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Modificado %s." -#: contrib/admin/options.py:517 contrib/admin/options.py:527 -#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 forms/models_flymake.py:388 forms/models_flymake.py:600 msgid "and" msgstr "e" -#: contrib/admin/options.py:522 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Adicionado %(name)s \"%(object)s\"" -#: contrib/admin/options.py:526 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificado %(list)s para %(name)s \"%(object)s\"." -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Deletado %(name)s \"%(object)s\"." -#: contrib/admin/options.py:535 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Nenhum campo modificado." -#: contrib/admin/options.py:596 contrib/auth/admin.py:67 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\": adicionado com sucesso." -#: contrib/admin/options.py:600 contrib/admin/options.py:633 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Você pode editar novamente abaixo." -#: contrib/admin/options.py:610 contrib/admin/options.py:643 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Você pode adicionar outro %s abaixo." -#: contrib/admin/options.py:631 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\": modificado com sucesso." -#: contrib/admin/options.py:639 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -371,43 +372,43 @@ msgstr "" "%(name)s \"%(obj)s\": adicionado com sucesso. Você pode editar novamente " "abaixo." -#: contrib/admin/options.py:770 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Adicionar %s" -#: contrib/admin/options.py:801 contrib/admin/options.py:1001 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objeto %(name)s com chave primária %(key)r não existe." -#: contrib/admin/options.py:858 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: contrib/admin/options.py:902 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "Erro no banco de dados" -#: contrib/admin/options.py:938 +#: contrib/admin/options.py:941 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s modificado com sucesso." msgstr[1] "%(count)s %(name)s modificados com sucesso." -#: contrib/admin/options.py:1016 +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\": excluído com sucesso." -#: contrib/admin/options.py:1052 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "Histórico de modificações: %s" -#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -416,11 +417,11 @@ msgstr "" "Por favor, entre com um usuário e senha corretos. Note que ambos os campos " "diferenciam maiúsculas e minúsculas." -#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Por favor acesse novamente, pois sua sessão expirou." -#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -428,27 +429,27 @@ msgstr "" "Parece que seu navegador não está configurado para aceitar cookies. Por " "favor habilite os cookies, recarregue esta página, e tente novamente." -#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Nomes de usuário não podem conter o caractere '@'." -#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Seu endereço de e-mail não é seu nome de usuário. Tente usar '%s'" -#: contrib/admin/sites.py:360 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Administração do Site" -#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Acessar" -#: contrib/admin/sites.py:417 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "Administração de %s" @@ -483,7 +484,7 @@ msgstr "Modificar:" msgid "Lookup" msgstr "Olhar" -#: contrib/admin/widgets.py:236 +#: contrib/admin/widgets.py:235 msgid "Add Another" msgstr "Adicionar outro" @@ -498,7 +499,7 @@ msgstr "Desculpe, mas a página requisitada não pode ser encontrada." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -542,7 +543,6 @@ msgid "Run the selected action" msgstr "Executar ação selecionada" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Ir" @@ -552,18 +552,18 @@ msgstr "Ir" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Bem vindo," -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentação" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:40 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -571,7 +571,7 @@ msgstr "Documentação" msgid "Change password" msgstr "Alterar senha" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -702,6 +702,10 @@ msgstr "Minhas Ações" msgid "None available" msgstr "Nenhuma disponível" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Conteúdo desconhecido" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -750,6 +754,15 @@ msgstr "" msgid "Show all" msgstr "Mostrar tudo" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Salvar" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "Pesquisar" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -762,10 +775,6 @@ msgstr[1] "%(counter)s resultados" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s total" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Salvar" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Salvar como novo" @@ -991,144 +1000,145 @@ msgstr "site" msgid "template" msgstr "template" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 -#: contrib/admindocs/views.py:62 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "tag:" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 -#: contrib/admindocs/views.py:95 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "filtro:" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 -#: contrib/admindocs/views.py:159 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "view:" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Aplicação %r não encontrada" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Model %(model_name)r não encontrado na aplicação %(app_label)r" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "o objeto `%(app_label)s.%(data_type)s` relacionado" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "model:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "objetos `%(app_label)s.%(object_name)s` relacionados" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "todos %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "número de %s" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Campos nos objetos %s" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Inteiro" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Booleano (Verdadeiro ou Falso)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "String (até %(max_length)s)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Inteiros separados por vírgula" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Data (sem hora)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Data e hora" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Número decimal" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "Endereço de e-mail" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Caminho de arquivo" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:344 msgid "Floating point number" msgstr "Número de ponto flutuante" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "Endereço IP" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadeiro, Falso ou Nada)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Relação com o modelo pai" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Número de telefone" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Texto" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Hora" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "Estado dos EUA (duas letras maiúsculas)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "Texto XML" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s não aparenta ser um objeto urlpattern" @@ -1776,18 +1786,26 @@ msgstr "" "Desculpe, mas seu formulário expirou. Por favor, continue preenchendo o " "formulário desta página." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Nenhum valor geométrico fornecido." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Valor geométrico inválido." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Tipo geométrico inválido." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"Ocorreu um erro ao transformar a geometria para o SRID do campo de " +"formulário de geometria." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "º" @@ -3014,7 +3032,9 @@ msgstr "O Número de Identificação Tributária (NIP) é incorreto." #: contrib/localflavor/pl/forms.py:109 msgid "National Business Register Number (REGON) consists of 9 or 14 digits." -msgstr "O Número Nacional de Registro de Negócios (REGON) consiste em 9 ou 14 dígitos." +msgstr "" +"O Número Nacional de Registro de Negócios (REGON) consiste em 9 ou 14 " +"dígitos." #: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." @@ -3903,14 +3923,14 @@ msgstr "Este valor deve ser None, True ou False." 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/related.py:792 +#: db/models/fields/related.py:816 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." -#: db/models/fields/related.py:870 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3977,11 +3997,11 @@ 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:288 forms/fields.py:862 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Informe uma data válida." -#: forms/fields.py:322 forms/fields.py:863 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Informe uma hora válida." @@ -4025,20 +4045,21 @@ msgstr "Informe uma URL válida." msgid "This URL appears to be a broken link." msgstr "A URL %s aparenta ser um link quebrado." -#: forms/fields.py:624 forms/fields.py:702 +#: forms/fields.py:625 forms/fields.py:703 #, 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:703 forms/fields.py:764 forms/models.py:776 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 +#: forms/models_flymake.py:1003 msgid "Enter a list of values." msgstr "Informe uma lista de valores." -#: forms/fields.py:891 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Informe um endereço IPv4 válido." -#: forms/fields.py:901 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" @@ -4049,25 +4070,57 @@ msgstr "" msgid "Order" msgstr "Ordem" -#: forms/models.py:299 forms/models.py:308 +#: forms/models.py:367 forms/models_flymake.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 forms/models_flymake.py:381 +#: forms/models_flymake.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s com este %(field_label)s já existe." -#: forms/models.py:651 +#: forms/models.py:594 forms/models_flymake.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Por favor, corrija o valor duplicado para %(field)s." + +#: forms/models.py:598 forms/models_flymake.py:598 +#, 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:604 forms/models_flymake.py:604 +#, python-format +msgid "" +"Please correct the duplicate data for %(field_name)s which must be unique " +"for the %(lookup)s in %(date_field)s." +msgstr "" +"Por favor corrija os dados duplicados em %(field_name)s que deverá ser único " +"para o %(lookup)s em %(date_field)s." + +#: forms/models.py:612 forms/models_flymake.py:612 +msgid "Please correct the duplicate values below." +msgstr "Por favor, corrija os valores duplicados abaixo." + +#: forms/models.py:867 forms/models_flymake.py:867 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:706 +#: forms/models.py:930 forms/models_flymake.py:930 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:777 +#: forms/models.py:1004 forms/models_flymake.py:1004 #, 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:779 +#: forms/models.py:1006 forms/models_flymake.py:1006 #, 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." @@ -4098,27 +4151,27 @@ msgstr "%.1f MB" msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "p.m." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "a.m." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "PM" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "AM" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "meia noite" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "meio dia" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index 22617dada8..52f6171529 100644 Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index 339cbf0863..2a55749061 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-10 17:08+0400\n" +"POT-Creation-Date: 2009-07-23 00:31+0400\n" "PO-Revision-Date: 2009-04-10 18:37+0400\n" "Last-Translator: Andrew Fedorov \n" "Language-Team: Russian\n" @@ -218,16 +218,16 @@ msgstr "Упрощенный китайский" msgid "Traditional Chinese" msgstr "Традиционный китайский" -#: contrib/admin/actions.py:56 +#: contrib/admin/actions.py:60 #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "Успешно удалено %(count)d %(items)s." +msgstr "Успешно удалены %(count)d %(items)s." -#: contrib/admin/actions.py:63 contrib/admin/options.py:1023 +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 msgid "Are you sure?" msgstr "Вы уверены?" -#: contrib/admin/actions.py:81 +#: contrib/admin/actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Удалить выбранные %(verbose_name_plural)s" @@ -266,15 +266,15 @@ msgstr "Этот месяц" msgid "This year" msgstr "Этот год" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Да" -#: contrib/admin/filterspecs.py:147 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Нет" -#: contrib/admin/filterspecs.py:154 forms/widgets.py:413 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Неизвестно" @@ -314,56 +314,57 @@ msgstr "записи в журнале" msgid "None" msgstr "Нет" -#: contrib/admin/options.py:517 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." msgstr "Изменён %s." -#: contrib/admin/options.py:517 contrib/admin/options.py:527 -#: contrib/comments/templates/comments/preview.html:16 forms/models.py:306 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:600 msgid "and" msgstr "и" -#: contrib/admin/options.py:522 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Добавлен %(name)s \"%(object)s\"." -#: contrib/admin/options.py:526 +#: contrib/admin/options.py:528 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Изменены %(list)s для %(name)s \"%(object)s\"." -#: contrib/admin/options.py:531 +#: contrib/admin/options.py:533 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Удалён %(name)s \"%(object)s\"." -#: contrib/admin/options.py:535 +#: contrib/admin/options.py:537 msgid "No fields changed." msgstr "Ни одно поле не изменено." -#: contrib/admin/options.py:596 contrib/auth/admin.py:67 +#: contrib/admin/options.py:599 contrib/auth/admin.py:67 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" был успешно добавлен." -#: contrib/admin/options.py:600 contrib/admin/options.py:633 +#: contrib/admin/options.py:603 contrib/admin/options.py:636 #: contrib/auth/admin.py:75 msgid "You may edit it again below." msgstr "Ниже вы можете снова его отредактировать." -#: contrib/admin/options.py:610 contrib/admin/options.py:643 +#: contrib/admin/options.py:613 contrib/admin/options.py:646 #, python-format msgid "You may add another %s below." msgstr "Ниже вы можете добавить еще один %s." -#: contrib/admin/options.py:631 +#: contrib/admin/options.py:634 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" был успешно изменён." -#: contrib/admin/options.py:639 +#: contrib/admin/options.py:642 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -371,26 +372,26 @@ msgstr "" "%(name)s \"%(obj)s\" был успешно добавлен. Ниже вы можете снова его " "отредактировать." -#: contrib/admin/options.py:770 +#: contrib/admin/options.py:773 #, python-format msgid "Add %s" msgstr "Добавить %s" -#: contrib/admin/options.py:801 contrib/admin/options.py:1001 +#: contrib/admin/options.py:804 contrib/admin/options.py:1005 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s с первичным ключом %(key)r не существует." -#: contrib/admin/options.py:858 +#: contrib/admin/options.py:861 #, python-format msgid "Change %s" msgstr "Изменить %s" -#: contrib/admin/options.py:902 +#: contrib/admin/options.py:905 msgid "Database error" msgstr "Ошибка базы данных" -#: contrib/admin/options.py:938 +#: contrib/admin/options.py:941 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -398,17 +399,17 @@ msgstr[0] "%(count)s %(name)s был успешно изменён." msgstr[1] "%(count)s %(name)s были успешно изменены." msgstr[2] "%(count)s %(name)s были успешно изменены." -#: contrib/admin/options.py:1016 +#: contrib/admin/options.py:1020 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" был успешно удалён." -#: contrib/admin/options.py:1052 +#: contrib/admin/options.py:1057 #, python-format msgid "Change history: %s" msgstr "История изменений: %s" -#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:21 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" @@ -417,11 +418,11 @@ msgstr "" "Пожалуйста, введите верные имя пользователя и пароль. Помните, оба поля " "чувствительны к регистру." -#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." msgstr "Пожалуйста, войдите снова, поскольку ваша сессия устарела." -#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -429,29 +430,29 @@ msgstr "" "Похоже, ваш браузер не настроен на прием cookies. Пожалуйста, включите " "cookies, перезагрузите страницу и попытайтесь снова." -#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/sites.py:308 contrib/admin/sites.py:314 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." msgstr "Имя пользователя не может содержать символ '@'." -#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:311 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" "Ваш адрес электронной почты не является вашим именем пользователя. " "Попробуйте '%s' взамен." -#: contrib/admin/sites.py:360 +#: contrib/admin/sites.py:367 msgid "Site administration" msgstr "Администрирование сайта" -#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:381 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" msgstr "Войти" -#: contrib/admin/sites.py:417 +#: contrib/admin/sites.py:426 #, python-format msgid "%s administration" msgstr "%s администрирование" @@ -486,7 +487,7 @@ msgstr "Изменить:" msgid "Lookup" msgstr "Поиск" -#: contrib/admin/widgets.py:236 +#: contrib/admin/widgets.py:235 msgid "Add Another" msgstr "Добавить еще" @@ -501,7 +502,7 @@ msgstr "К сожалению, запрашиваемая вами страни #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:33 +#: contrib/admin/templates/admin/base.html:54 #: contrib/admin/templates/admin/change_form.html:17 #: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 @@ -545,9 +546,8 @@ msgid "Run the selected action" msgstr "Выполнить выбранное действие" #: contrib/admin/templates/admin/actions.html:4 -#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" -msgstr "Вперёд" +msgstr "Выполнить" #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 @@ -555,18 +555,18 @@ msgstr "Вперёд" msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:27 msgid "Welcome," msgstr "Добро пожаловать," -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:32 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Документация" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:40 #: contrib/admin/templates/admin/auth/user/change_password.html:14 #: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 @@ -574,7 +574,7 @@ msgstr "Документация" msgid "Change password" msgstr "Изменить пароль" -#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" @@ -705,6 +705,10 @@ msgstr "Мои действия" msgid "None available" msgstr "Недоступно" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Неизвестный тип" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -753,6 +757,15 @@ msgstr "" msgid "Show all" msgstr "Показать все" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Сохранить" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "Найти" + #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" @@ -766,10 +779,6 @@ msgstr[2] "%(counter)s результатов" msgid "%(full_result_count)s total" msgstr "%(full_result_count)s всего" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "Сохранить" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "Сохранить как новый объект" @@ -996,144 +1005,145 @@ msgstr "сайт" msgid "template" msgstr "шаблон" -#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 -#: contrib/admindocs/views.py:62 +#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63 +#: contrib/admindocs/views.py:65 msgid "tag:" msgstr "метка:" -#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 -#: contrib/admindocs/views.py:95 +#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96 +#: contrib/admindocs/views.py:98 msgid "filter:" msgstr "фильтр:" -#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 -#: contrib/admindocs/views.py:159 +#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 +#: contrib/admindocs/views.py:162 msgid "view:" msgstr "view:" -#: contrib/admindocs/views.py:187 +#: contrib/admindocs/views.py:190 #, python-format msgid "App %r not found" msgstr "Приложение %r не найдено" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:197 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "Модель %(model_name)r не найдена в приложении %(app_label)r" -#: contrib/admindocs/views.py:206 +#: contrib/admindocs/views.py:209 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "зависимый `%(app_label)s.%(data_type)s` объект" -#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 -#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266 msgid "model:" msgstr "модель:" -#: contrib/admindocs/views.py:237 +#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "зависимые `%(app_label)s.%(object_name)s` объекты" -#: contrib/admindocs/views.py:242 +#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261 #, python-format msgid "all %s" msgstr "все %s" -#: contrib/admindocs/views.py:247 +#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266 #, python-format msgid "number of %s" msgstr "количество %s" -#: contrib/admindocs/views.py:252 +#: contrib/admindocs/views.py:271 #, python-format msgid "Fields on %s objects" msgstr "Поля для %s объектов" -#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 -#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 -#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345 +#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353 +#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356 msgid "Integer" msgstr "Целое" -#: contrib/admindocs/views.py:316 +#: contrib/admindocs/views.py:335 msgid "Boolean (Either True or False)" msgstr "Логическое (True или False)" -#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355 #, python-format msgid "String (up to %(max_length)s)" msgstr "Строка (до %(max_length)s)" -#: contrib/admindocs/views.py:318 +#: contrib/admindocs/views.py:337 msgid "Comma-separated integers" msgstr "Целые, разделенные запятыми" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:338 msgid "Date (without time)" msgstr "Дата (без указания времени)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:339 msgid "Date (with time)" msgstr "Дата (с указанием времени)" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:340 msgid "Decimal number" msgstr "Десятичное число" -#: contrib/admindocs/views.py:322 +#: contrib/admindocs/views.py:341 msgid "E-mail address" msgstr "Адрес электронной почты" -#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 -#: contrib/admindocs/views.py:327 +#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343 +#: contrib/admindocs/views.py:346 msgid "File path" msgstr "Путь к файлу" -#: contrib/admindocs/views.py:325 +#: contrib/admindocs/views.py:344 msgid "Floating point number" -msgstr "Число с плавающей точкой" +msgstr "Число с плавающей запятой" -#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +#: contrib/admindocs/views.py:348 contrib/comments/models.py:60 msgid "IP address" msgstr "IP-адрес" -#: contrib/admindocs/views.py:331 +#: contrib/admindocs/views.py:350 msgid "Boolean (Either True, False or None)" msgstr "Логическое (True, False или None)" -#: contrib/admindocs/views.py:332 +#: contrib/admindocs/views.py:351 msgid "Relation to parent model" msgstr "Связь с родительской моделью" -#: contrib/admindocs/views.py:333 +#: contrib/admindocs/views.py:352 msgid "Phone number" msgstr "Номер телефона" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:357 msgid "Text" msgstr "Текст" -#: contrib/admindocs/views.py:339 +#: contrib/admindocs/views.py:358 msgid "Time" msgstr "Время" -#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:341 +#: contrib/admindocs/views.py:360 msgid "U.S. state (two uppercase letters)" msgstr "Штат США (две заглавные буквы)" -#: contrib/admindocs/views.py:342 +#: contrib/admindocs/views.py:361 msgid "XML text" msgstr "XML текст" -#: contrib/admindocs/views.py:368 +#: contrib/admindocs/views.py:387 #, python-format msgid "%s does not appear to be a urlpattern object" msgstr "%s не похож на объект urlpattern" @@ -1475,7 +1485,7 @@ msgid "" msgstr "" "Если что-нибудь введете в это поле, то ваш комментарий будет признан спамом" -#: contrib/comments/models.py:22 contrib/contenttypes/models.py:71 +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 msgid "content type" msgstr "тип содержимого" @@ -1598,8 +1608,7 @@ msgstr "Спасибо за подтверждение" #: contrib/comments/templates/comments/flagged.html:7 msgid "" "Thanks for taking the time to improve the quality of discussion on our site" -msgstr "" -"Спасибо, что заботитесь о качестве обсуждений на нашем сайте" +msgstr "Спасибо, что заботитесь о качестве общения на нашем сайте" #: contrib/comments/templates/comments/delete.html:4 msgid "Remove a comment" @@ -1647,7 +1656,7 @@ msgstr "Предпросмотр" #: contrib/comments/templates/comments/moderation_queue.html:4 #: contrib/comments/templates/comments/moderation_queue.html:19 msgid "Comment moderation queue" -msgstr "Очередь модерирования комментариев" +msgstr "Очередь модерации комментариев" #: contrib/comments/templates/comments/moderation_queue.html:26 msgid "No comments to moderate" @@ -1705,11 +1714,11 @@ msgstr "Опубликуйте ваш комментарий" msgid "or make changes" msgstr "или внесите изменения" -#: contrib/contenttypes/models.py:67 +#: contrib/contenttypes/models.py:70 msgid "python model class name" msgstr "имя класса модели" -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "типы содержимого" @@ -1725,7 +1734,7 @@ msgid "" "This value must contain only letters, numbers, underscores, dashes or " "slashes." msgstr "" -"Значение должно состоять только из букв, цифр, знаков подчеркивания, тире " +"Значение должно состоять только из букв, цифр, знаков подчеркивания, дефиса " "или наклонной черты вправо." #: contrib/flatpages/admin.py:22 @@ -1780,18 +1789,24 @@ msgstr "" "Мы сожалеем, но ваша форма устарела. Пожалуйста, продолжите заполнять форму " "на этой странице." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." msgstr "Не указано значение геометрии." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." msgstr "Неверное значение геометрии." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." msgstr "Неверный тип геометрии." +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "Произошла ошибка во время преобразования геометрии в SRID." + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "" @@ -1888,7 +1903,7 @@ msgstr "Введите почтовый индекс в формате NNNN ил #: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 #: contrib/localflavor/pe/forms.py:51 msgid "This field requires only numbers." -msgstr "Это поле требует только числа." +msgstr "Это поле принимает только числа." #: contrib/localflavor/ar/forms.py:50 msgid "This field requires 7 or 8 digits." @@ -1941,7 +1956,7 @@ msgstr "Вена" #: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16 #: contrib/localflavor/no/forms.py:12 msgid "Enter a zip code in the format XXXX." -msgstr "Введите правильный индекс в формате XXXX.." +msgstr "Введите правильный индекс в формате XXXX." #: contrib/localflavor/at/forms.py:48 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format." @@ -2157,7 +2172,7 @@ msgstr "Пардубицкий край" #: contrib/localflavor/cz/cz_regions.py:17 msgid "Vysocina Region" -msgstr "Высочинский край" +msgstr "Край Высочина" #: contrib/localflavor/cz/cz_regions.py:18 msgid "South Moravian Region" @@ -2182,7 +2197,7 @@ msgstr "Введите почтовый индекс в формате XXXXX и #: contrib/localflavor/cz/forms.py:47 msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." msgstr "" -"Введите номер свидетельства о рождении в формате XXXXXX/XXXX or XXXXXXXXXX." +"Введите номер свидетельства о рождении в формате XXXXXX/XXXX или XXXXXXXXXX." #: contrib/localflavor/cz/forms.py:48 msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" @@ -3080,7 +3095,7 @@ msgstr "Подляское" #: contrib/localflavor/pl/pl_voivodeships.py:18 msgid "Pomerania" -msgstr "Померания" +msgstr "Поморское" #: contrib/localflavor/pl/pl_voivodeships.py:19 msgid "Silesia" @@ -3871,60 +3886,60 @@ msgstr "выводимое имя" msgid "sites" msgstr "сайты" -#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:700 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." msgstr "Это значение должно быть целым числом." -#: db/models/fields/__init__.py:387 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." -msgstr "Значение должно либо True, либо False." +msgstr "Значение должно быть либо True, либо False." -#: db/models/fields/__init__.py:420 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." msgstr "Это поле не может быть нулевым." -#: db/models/fields/__init__.py:436 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." msgstr "Введите цифры, разделенные запятыми." -#: db/models/fields/__init__.py:467 +#: db/models/fields/__init__.py:474 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Введите правильную дату в формате YYYY-MM-DD." -#: db/models/fields/__init__.py:476 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Неправильная дата: %s" -#: db/models/fields/__init__.py:540 db/models/fields/__init__.py:558 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 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:594 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." msgstr "Это значение должно быть целым числом." -#: db/models/fields/__init__.py:676 +#: db/models/fields/__init__.py:686 msgid "This value must be a float." msgstr "Это значение должно быть числом с плавающей запятой." -#: db/models/fields/__init__.py:736 +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." -msgstr "Значение должно либо True, либо False." +msgstr "Значение должно быть None, True или False." -#: db/models/fields/__init__.py:839 db/models/fields/__init__.py:853 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." msgstr "Введите правильное время в формате HH:MM[:ss[.uuuuuu]]." -#: db/models/fields/related.py:792 +#: db/models/fields/related.py:816 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Удерживайте \"Control\" (или \"Command\" на Mac) для выбора нескольких " "значений." -#: db/models/fields/related.py:870 +#: db/models/fields/related.py:894 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -3994,11 +4009,11 @@ msgstr "Убедитесь, что ввели не больше %s цифр по msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Убедитесь, что ввели не больше %s цифр до запятой." -#: forms/fields.py:288 forms/fields.py:862 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Введите правильную дату." -#: forms/fields.py:322 forms/fields.py:863 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." msgstr "Введите правильное время." @@ -4042,58 +4057,90 @@ msgstr "Введите правильный URL." msgid "This URL appears to be a broken link." msgstr "Похоже, что это нерабочая ссылка." -#: forms/fields.py:624 forms/fields.py:702 +#: forms/fields.py:625 forms/fields.py:703 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "Выберите корректный вариант. %(value)s нет среди допустимых значений." -#: forms/fields.py:703 forms/fields.py:764 forms/models.py:776 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003 msgid "Enter a list of values." msgstr "Введите список значений." -#: forms/fields.py:891 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." msgstr "Введите правильный IPv4 адрес." -#: forms/fields.py:901 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -"Значение должно состоять только из букв, цифр, знаков подчеркивания или тире." +"Значение должно состоять только из букв, цифр, знаков подчеркивания или " +"дефиса." #: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Порядок" -#: forms/models.py:299 forms/models.py:308 +#: forms/models.py:367 +#, python-format +msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." +msgstr "" +"Значение в поле %(field_name)s должно быть уникальным для %(lookup)s в поле %" +"(date_field)s." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "%(model_name)s с таким %(field_label)s уже существует." -#: forms/models.py:651 -msgid "The inline foreign key did not match the parent instance primary key." -msgstr "Вторичный ключ не совпадает с первичным ключом родителя." +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Пожалуйста, измените повторяющееся значение в поле %(field)s." -#: forms/models.py:706 +#: forms/models.py:598 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "" +"Пожалуйста, измените значение в поле %(field)s, оно должно быть уникальным." + +#: forms/models.py:604 +#, 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:612 +msgid "Please correct the duplicate values below." +msgstr "Пожалуйста, измените повторяющиеся значения ниже." + +#: forms/models.py:867 +msgid "The inline foreign key did not match the parent instance primary key." +msgstr "Внешний ключ не совпадает с первичным ключом родителя." + +#: forms/models.py:930 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Выберите корректный вариант. Вашего варианта нет среди допустимых значений." -#: forms/models.py:777 +#: forms/models.py:1004 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "Выберите корректный вариант. %s нет среди допустимых значений." -#: forms/models.py:779 +#: forms/models.py:1006 #, python-format msgid "\"%s\" is not a valid value for a primary key." msgstr "\"%s\" не является верным значением для первичного ключа." -#: template/defaultfilters.py:765 +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "да,нет,может быть" -#: template/defaultfilters.py:796 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" @@ -4101,42 +4148,42 @@ msgstr[0] "%(size)d байт" msgstr[1] "%(size)d байта" msgstr[2] "%(size)d байт" -#: template/defaultfilters.py:798 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f КБ" -#: template/defaultfilters.py:800 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f МБ" -#: template/defaultfilters.py:801 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f ГБ" -#: utils/dateformat.py:41 +#: utils/dateformat.py:42 msgid "p.m." msgstr "п.п." -#: utils/dateformat.py:42 +#: utils/dateformat.py:43 msgid "a.m." msgstr "д.п." -#: utils/dateformat.py:47 +#: utils/dateformat.py:48 msgid "PM" msgstr "ПП" -#: utils/dateformat.py:48 +#: utils/dateformat.py:49 msgid "AM" msgstr "ДП" -#: utils/dateformat.py:97 +#: utils/dateformat.py:98 msgid "midnight" msgstr "полночь" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "полдень" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index 137d4507f8..6f3d087f0a 100644 Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index 5010ed2c0c..f441837c7f 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -1,223 +1,238 @@ +# This file is distributed under the same license as the Django package. +# msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-23 22:52+0100\n" -"PO-Revision-Date: 2009-01-25 18:55+0100\n" -"Last-Translator: Nebojsa Djordjevic \n" -"Language-Team: Nesh & Petar & Janos Guljas \n" +"POT-Creation-Date: 2009-05-08 22:50+0200\n" +"PO-Revision-Date: 2009-04-01 18:38+0200\n" +"Last-Translator: Janos Guljas \n" +"Language-Team: Branko Vukelic & Janos Guljas " +" & Nesh & Petar \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Poedit-Country: YUGOSLAVIA\n" -"X-Poedit-SourceCharset: utf-8\n" -"X-Poedit-Basepath: ../../../../\n" -"X-Poedit-Language: Serbian\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 msgid "Arabic" -msgstr "Арапски" +msgstr "арапски" #: conf/global_settings.py:45 msgid "Bengali" -msgstr "Бенгалски" +msgstr "бенгалски" #: conf/global_settings.py:46 msgid "Bulgarian" -msgstr "Бугарски" +msgstr "бугарски" #: conf/global_settings.py:47 msgid "Catalan" -msgstr "Каталонски" +msgstr "каталонски" #: conf/global_settings.py:48 msgid "Czech" -msgstr "Чешки" +msgstr "чешки" #: conf/global_settings.py:49 msgid "Welsh" -msgstr "Велшски" +msgstr "велшки" #: conf/global_settings.py:50 msgid "Danish" -msgstr "Дански" +msgstr "дански" #: conf/global_settings.py:51 msgid "German" -msgstr "Немачки" +msgstr "немачки" #: conf/global_settings.py:52 msgid "Greek" -msgstr "Грчки" +msgstr "грчки" #: conf/global_settings.py:53 msgid "English" -msgstr "Енглески" +msgstr "енглески" #: conf/global_settings.py:54 msgid "Spanish" -msgstr "Шпански" +msgstr "шпански" #: conf/global_settings.py:55 msgid "Estonian" -msgstr "Естонски" +msgstr "естонски" #: conf/global_settings.py:56 msgid "Argentinean Spanish" -msgstr "Шпански (Аргентина)" +msgstr "аргентински шпански" #: conf/global_settings.py:57 msgid "Basque" -msgstr "Баскијски" +msgstr "баскијски" #: conf/global_settings.py:58 msgid "Persian" -msgstr "Персијски" +msgstr "персијски" #: conf/global_settings.py:59 msgid "Finnish" -msgstr "Фински" +msgstr "фински" #: conf/global_settings.py:60 msgid "French" -msgstr "Француски" +msgstr "француски" #: conf/global_settings.py:61 msgid "Irish" -msgstr "Ирски" +msgstr "ирски" #: conf/global_settings.py:62 msgid "Galician" -msgstr "Галски" +msgstr "галски" #: conf/global_settings.py:63 msgid "Hungarian" -msgstr "Мађарски" +msgstr "мађарски" #: conf/global_settings.py:64 msgid "Hebrew" -msgstr "Хебрејски" +msgstr "хебрејски" #: conf/global_settings.py:65 msgid "Hindi" -msgstr "Хинди" +msgstr "хинду" #: conf/global_settings.py:66 msgid "Croatian" -msgstr "Хрватски" +msgstr "хрватски" #: conf/global_settings.py:67 msgid "Icelandic" -msgstr "Исландски" +msgstr "исландски" #: conf/global_settings.py:68 msgid "Italian" -msgstr "Италијански" +msgstr "италијански" #: conf/global_settings.py:69 msgid "Japanese" -msgstr "Јапански" +msgstr "јапански" #: conf/global_settings.py:70 msgid "Georgian" -msgstr "Грузијски" +msgstr "грузијски" #: conf/global_settings.py:71 msgid "Korean" -msgstr "Корејски" +msgstr "корејски" #: conf/global_settings.py:72 msgid "Khmer" -msgstr "Кмерски" +msgstr "камбодијски" #: conf/global_settings.py:73 msgid "Kannada" -msgstr "Канада" +msgstr "канада" #: conf/global_settings.py:74 msgid "Latvian" -msgstr "Латвијски" +msgstr "латвијски" #: conf/global_settings.py:75 msgid "Lithuanian" -msgstr "Litvanijski" +msgstr "литвански" #: conf/global_settings.py:76 msgid "Macedonian" -msgstr "Македонски" +msgstr "македонски" #: conf/global_settings.py:77 msgid "Dutch" -msgstr "Холандски" +msgstr "холандски" #: conf/global_settings.py:78 msgid "Norwegian" -msgstr "Норвешки" +msgstr "норвешки" #: conf/global_settings.py:79 msgid "Polish" -msgstr "Пољски" +msgstr "пољски" #: conf/global_settings.py:80 msgid "Portuguese" -msgstr "Португалски" +msgstr "португалски" #: conf/global_settings.py:81 msgid "Brazilian Portuguese" -msgstr "Бразилски" +msgstr "бразилски португалски" #: conf/global_settings.py:82 msgid "Romanian" -msgstr "Rumunski" +msgstr "румунски" #: conf/global_settings.py:83 msgid "Russian" -msgstr "Руски" +msgstr "руски" #: conf/global_settings.py:84 msgid "Slovak" -msgstr "Словачки" +msgstr "словачки" #: conf/global_settings.py:85 msgid "Slovenian" -msgstr "Словеначки" +msgstr "словеначки" #: conf/global_settings.py:86 msgid "Serbian" -msgstr "Српски" +msgstr "српски" #: conf/global_settings.py:87 msgid "Swedish" -msgstr "Шведски" +msgstr "шведски" #: conf/global_settings.py:88 msgid "Tamil" -msgstr "Тамилски" +msgstr "тамилски" #: conf/global_settings.py:89 msgid "Telugu" -msgstr "Телугу" +msgstr "телугу" #: conf/global_settings.py:90 msgid "Thai" -msgstr "Таи" +msgstr "тајландски" #: conf/global_settings.py:91 msgid "Turkish" -msgstr "Турски" +msgstr "турски" #: conf/global_settings.py:92 msgid "Ukrainian" -msgstr "Украјински" +msgstr "украјински" #: conf/global_settings.py:93 msgid "Simplified Chinese" -msgstr "Кинески (поједностављен)" +msgstr "новокинески" #: conf/global_settings.py:94 msgid "Traditional Chinese" -msgstr "Традиционални Кинески" +msgstr "старокинески" + +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Успешно обрисано: %(count)d %(items)s." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 +msgid "Are you sure?" +msgstr "Да ли сте сигурни?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Бриши означене објекте класе %(verbose_name_plural)s" #: contrib/admin/filterspecs.py:44 #, python-format @@ -225,49 +240,53 @@ msgid "" "

                              By %s:

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

                                По %s:

                                \n" +"

                                %s:

                                \n" "
                                  \n" -#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:91 -#: contrib/admin/filterspecs.py:146 contrib/admin/filterspecs.py:172 +#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 msgid "All" -msgstr "Све" - -#: contrib/admin/filterspecs.py:112 -msgid "Any date" -msgstr "Било који датум" +msgstr "Сви" #: contrib/admin/filterspecs.py:113 +msgid "Any date" +msgstr "Сви датуми" + +#: contrib/admin/filterspecs.py:114 msgid "Today" msgstr "Данас" -#: contrib/admin/filterspecs.py:116 +#: contrib/admin/filterspecs.py:117 msgid "Past 7 days" -msgstr "У последњих 7 дана" +msgstr "Последњих 7 дана" -#: contrib/admin/filterspecs.py:118 +#: contrib/admin/filterspecs.py:119 msgid "This month" -msgstr "Овога месеца" +msgstr "Овај месец" -#: contrib/admin/filterspecs.py:120 +#: contrib/admin/filterspecs.py:121 msgid "This year" -msgstr "Ове године" +msgstr "Ова година" -#: contrib/admin/filterspecs.py:146 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "Yes" msgstr "Да" -#: contrib/admin/filterspecs.py:146 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 msgid "No" msgstr "Не" -#: contrib/admin/filterspecs.py:153 forms/widgets.py:391 +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 msgid "Unknown" msgstr "Непознато" +#: contrib/admin/helpers.py:14 +msgid "Action:" +msgstr "Радња:" + #: contrib/admin/models.py:19 msgid "action time" -msgstr "време активности" +msgstr "време радње" #: contrib/admin/models.py:22 msgid "object id" @@ -279,7 +298,7 @@ msgstr "опис објекта" #: contrib/admin/models.py:24 msgid "action flag" -msgstr "ознака активности" +msgstr "ознака радње" #: contrib/admin/models.py:25 msgid "change message" @@ -287,201 +306,207 @@ msgstr "опис измене" #: contrib/admin/models.py:28 msgid "log entry" -msgstr "унос у дневнику измена" +msgstr "запис у логовима" #: contrib/admin/models.py:29 msgid "log entries" -msgstr "уноси у дневнику измена" +msgstr "записи у логовима" -#: contrib/admin/options.py:60 contrib/admin/options.py:121 +#: contrib/admin/options.py:133 contrib/admin/options.py:147 msgid "None" -msgstr "Ništa" +msgstr "Ништа" -#: contrib/admin/options.py:338 +#: contrib/admin/options.py:519 #, python-format msgid "Changed %s." -msgstr "Измењен %s." +msgstr "Измењена поља %s" -#: contrib/admin/options.py:338 contrib/admin/options.py:348 -#: contrib/comments/templates/comments/preview.html:15 forms/models.py:288 +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:587 msgid "and" msgstr "и" -#: contrib/admin/options.py:343 +#: contrib/admin/options.py:524 #, python-format msgid "Added %(name)s \"%(object)s\"." -msgstr "Додато %(name)s \"%(object)s\"." - -#: contrib/admin/options.py:347 -#, python-format -msgid "Changed %(list)s for %(name)s \"%(object)s\"." -msgstr "Промењено %(list)s за %(name)s \"%(object)s\"." - -#: contrib/admin/options.py:352 -#, python-format -msgid "Deleted %(name)s \"%(object)s\"." -msgstr "Обрисано %(name)s \"%(object)s\"." - -#: contrib/admin/options.py:356 -msgid "No fields changed." -msgstr "Ниједно поље није измењено." - -#: contrib/admin/options.py:417 contrib/auth/admin.py:51 -#, python-format -msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "Успешно додат %(name)s \"%(obj)s\"." - -#: contrib/admin/options.py:421 contrib/admin/options.py:454 -#: contrib/auth/admin.py:59 -msgid "You may edit it again below." -msgstr "Можете га поново изменити." - -#: contrib/admin/options.py:431 contrib/admin/options.py:464 -#, python-format -msgid "You may add another %s below." -msgstr "Можете додати још један %s." - -#: contrib/admin/options.py:452 -#, python-format -msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "Успешно измењен: %(name)s \"%(obj)s\"." - -#: contrib/admin/options.py:460 -#, python-format -msgid "" -"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "%(name)s \"%(obj)s\" је успешно додат. Можете га поново изменити." +msgstr "Сачуван објекат „%(object)s“ класе %(name)s." #: contrib/admin/options.py:528 #, python-format -msgid "Add %s" -msgstr "Додајте %s" +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "Измењена поља %(list)s објеката „%(object)s“ класе %(name)s ." -#: contrib/admin/options.py:559 contrib/admin/options.py:673 +#: contrib/admin/options.py:533 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "Обрисан објекат „%(object)s“ класе %(name)s." + +#: contrib/admin/options.py:537 +msgid "No fields changed." +msgstr "Без измена у пољима." + +#: contrib/admin/options.py:598 contrib/auth/admin.py:67 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "Објекат „%(obj)s“ класе %(name)s сачуван је успешно." + +#: contrib/admin/options.py:602 contrib/admin/options.py:635 +#: contrib/auth/admin.py:75 +msgid "You may edit it again below." +msgstr "Доле можете поново уносити измене." + +#: contrib/admin/options.py:612 contrib/admin/options.py:645 +#, python-format +msgid "You may add another %s below." +msgstr "Доле можете додати нови објекат класе %s" + +#: contrib/admin/options.py:633 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "Објекат „%(obj)s“ класе %(name)s измењен је успешно." + +#: contrib/admin/options.py:641 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" +"Објекат „%(obj)s“ класе %(name)s додат је успешно. Доле можете унети додатне " +"измене." + +#: contrib/admin/options.py:772 +#, python-format +msgid "Add %s" +msgstr "Додај објекат класе %s" + +#: contrib/admin/options.py:803 contrib/admin/options.py:1003 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(name)s објекат са примарним кључем %(key)r не постоји." +msgstr "Објекат класе %(name)s са примарним кључем %(key)r не постоји." -#: contrib/admin/options.py:606 +#: contrib/admin/options.py:860 #, python-format msgid "Change %s" -msgstr "Измени %s" +msgstr "Измени објекат класе %s" -#: contrib/admin/options.py:638 +#: contrib/admin/options.py:904 msgid "Database error" msgstr "Грешка у бази података" -#: contrib/admin/options.py:688 +#: contrib/admin/options.py:940 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s објекат класе %(name)s измењен је успешно." +msgstr[1] "%(count)s објеката класе %(name)s измењени су успешно." +msgstr[2] "%(count)s објекта класе %(name)s измењено је успешно." + +#: contrib/admin/options.py:1018 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Успешно обрисан: %(name)s \"%(obj)s\"." +msgstr "Објекат „%(obj)s“ класе %(name)s обрисан је успешно." -#: contrib/admin/options.py:695 -msgid "Are you sure?" -msgstr "Да ли сте сигурни?" - -#: contrib/admin/options.py:724 +#: contrib/admin/options.py:1054 #, python-format msgid "Change history: %s" -msgstr "Историја измена: %s" +msgstr "Историјат измена: %s" -#: contrib/admin/sites.py:16 contrib/admin/views/decorators.py:14 +#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 #: contrib/auth/forms.py:80 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -"Унесите исправно корисничко име и лозинку. Напомена: оба поља праве разлику " -"између великих и малих слова." +"Унесите тачно корисничко име и лозинку. Пазите на разлику између малих и " +"великих слова у оба поља" -#: contrib/admin/sites.py:226 contrib/admin/views/decorators.py:40 +#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 msgid "Please log in again, because your session has expired." -msgstr "" -"Поново се пријавите пошто је ваша сесија истекла. Не брините, ваши подаци су " -"сачувани." +msgstr "Пријавите се поново пошто је ваша сесија истекла." -#: contrib/admin/sites.py:233 contrib/admin/views/decorators.py:47 +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." msgstr "" -"Ваш интернет читач није прихватио \"cookie\". Након активирања одговарајуће " -"опције поново учитајте страну." +"Изгледа да ваш браузер није подешен да прима колачиће. Укључите колачиће, " +"освежите ову страницу и пробајте поново." -#: contrib/admin/sites.py:249 contrib/admin/sites.py:255 +#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." -msgstr "Корисничка имена не могу садржати карактер '@'." +msgstr "Корисничка имена не смеју садржати знак „@“." -#: contrib/admin/sites.py:252 contrib/admin/views/decorators.py:62 +#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "Ваше корисничко име није дата адреса електронске поште. Покушајте са '%s'." +msgstr "Ваша имејл адреса није ваше корисничко име. Пробајте са „%s“." -#: contrib/admin/sites.py:312 +#: contrib/admin/sites.py:360 msgid "Site administration" -msgstr "Администрација сајта" +msgstr "Администрација система" -#: contrib/admin/sites.py:325 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 #: contrib/admin/templates/registration/password_reset_complete.html:14 #: contrib/admin/views/decorators.py:20 msgid "Log in" -msgstr "Пријавите се" +msgstr "Пријава" -#: contrib/admin/sites.py:372 +#: contrib/admin/sites.py:417 #, python-format msgid "%s administration" -msgstr "%s администрација" +msgstr "Администрација %s" -#: contrib/admin/util.py:138 +#: contrib/admin/util.py:168 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" -msgstr "Једно или више %(fieldname)s у %(name)s: %(obj)s" +msgstr "Једно или више поља %(fieldname)s у %(name)s: %(obj)s" -#: contrib/admin/util.py:143 +#: contrib/admin/util.py:173 #, python-format msgid "One or more %(fieldname)s in %(name)s:" -msgstr "Један или више %(fieldname)s у %(name)s:" +msgstr "Једно или више поља %(fieldname)s у %(name)s" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Date:" msgstr "Датум:" -#: contrib/admin/widgets.py:70 +#: contrib/admin/widgets.py:71 msgid "Time:" msgstr "Време:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Currently:" msgstr "Тренутно:" -#: contrib/admin/widgets.py:94 +#: contrib/admin/widgets.py:95 msgid "Change:" -msgstr "Измените:" +msgstr "Измена:" -#: contrib/admin/widgets.py:123 +#: contrib/admin/widgets.py:124 msgid "Lookup" -msgstr "Преглед" +msgstr "Претражи" -#: contrib/admin/widgets.py:230 +#: contrib/admin/widgets.py:236 msgid "Add Another" -msgstr "Додајте" +msgstr "Додај још један" #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 msgid "Page not found" -msgstr "Страна није пронађена" +msgstr "Страница није пронађена" #: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." -msgstr "Тражена страна не постоји." +msgstr "Жао нам је, тражена страница није пронађена." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/app_index.html:8 -#: contrib/admin/templates/admin/base.html:30 +#: contrib/admin/templates/admin/base.html:31 #: contrib/admin/templates/admin/change_form.html:17 -#: contrib/admin/templates/admin/change_list.html:8 +#: contrib/admin/templates/admin/change_list.html:25 #: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:6 #: contrib/admin/templates/admin/invalid_setup.html:4 #: contrib/admin/templates/admin/object_history.html:6 #: contrib/admin/templates/admin/auth/user/change_password.html:10 @@ -494,7 +519,7 @@ msgstr "Тражена страна не постоји." #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Home" -msgstr "Почетна страна" +msgstr "Почетна" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -512,7 +537,17 @@ msgstr "Грешка на серверу (500)" msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." -msgstr "Догодила се грешка која је пријављена администраторима." +msgstr "" +"Дошло је до грешке. Администратор сајта је обавештен имејлом и грешка ће " +"бити ускоро отклоњена. Хвала на стрпљењу." + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Покрени одабрану радњу" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Почни" #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 @@ -520,30 +555,30 @@ msgstr "Догодила се грешка која је пријављена а msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 msgid "Welcome," msgstr "Добродошли," -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Документација" -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/auth/user/change_password.html:13 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 +#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" -msgstr "Измените лозинку" +msgstr "Промена лозинке" -#: contrib/admin/templates/admin/base.html:25 +#: contrib/admin/templates/admin/base.html:26 #: contrib/admin/templates/registration/password_change_done.html:3 #: contrib/admin/templates/registration/password_change_form.html:3 msgid "Log out" -msgstr "Одјавите се" +msgstr "Одјава" #: contrib/admin/templates/admin/base_site.html:4 msgid "Django site admin" @@ -556,40 +591,41 @@ msgstr "Django администрација" #: contrib/admin/templates/admin/change_form.html:20 #: contrib/admin/templates/admin/index.html:29 msgid "Add" -msgstr "Додајте" +msgstr "Додај" #: contrib/admin/templates/admin/change_form.html:27 #: contrib/admin/templates/admin/object_history.html:10 msgid "History" -msgstr "Историја" +msgstr "Историјат" #: contrib/admin/templates/admin/change_form.html:28 #: contrib/admin/templates/admin/edit_inline/stacked.html:13 #: contrib/admin/templates/admin/edit_inline/tabular.html:27 msgid "View on site" -msgstr "Погледај на сајту" +msgstr "Преглед на сајту" #: contrib/admin/templates/admin/change_form.html:38 -#: contrib/admin/templates/admin/auth/user/change_password.html:22 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." msgid_plural "Please correct the errors below." -msgstr[0] "Исправите доле наведену грешку." -msgstr[1] "Исправите доле наведене грешке." -msgstr[2] "Исправите доле наведене грешке." +msgstr[0] "Исправите грешку доле." +msgstr[1] "Исправите грешке доле." +msgstr[2] "Исправите грешке доле." -#: contrib/admin/templates/admin/change_list.html:16 +#: contrib/admin/templates/admin/change_list.html:46 #, python-format msgid "Add %(name)s" -msgstr "Додајте %(name)s" +msgstr "Додај објекат класе %(name)s" -#: contrib/admin/templates/admin/change_list.html:26 +#: contrib/admin/templates/admin/change_list.html:65 msgid "Filter" msgstr "Филтер" #: contrib/admin/templates/admin/delete_confirmation.html:10 -#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 msgid "Delete" -msgstr "Обришите" +msgstr "Обриши" #: contrib/admin/templates/admin/delete_confirmation.html:16 #, python-format @@ -598,8 +634,9 @@ msgid "" "related objects, but your account doesn't have permission to delete the " "following types of objects:" msgstr "" -"Брисањем %(object_name)s '%(escaped_object)s' дошло би до брисања " -"придружених објеката, али немате права да бришете следеће објекте:" +"Уклањање %(object_name)s „%(escaped_object)s“ повлачи уклањање свих објеката " +"који су повезани са овим објектом, али ваш налог нема дозволе за брисање " +"следећих типова објеката:" #: contrib/admin/templates/admin/delete_confirmation.html:23 #, python-format @@ -607,42 +644,71 @@ msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -"Да ли сте сигурни да желите да обришете %(object_name)s \"%(escaped_object)s" -"\"? Такође ће бити обрисани следећи придружени објекти:" +"Да сигурни да желите да обришете %(object_name)s „%(escaped_object)s“? " +"Следећи објекти који су у вези са овим објектом ће такође бити обрисани:" #: contrib/admin/templates/admin/delete_confirmation.html:28 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:33 msgid "Yes, I'm sure" msgstr "Да, сигуран сам" +#: contrib/admin/templates/admin/delete_selected_confirmation.html:9 +msgid "Delete multiple objects" +msgstr "Брисање више објеката" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:15 +#, python-format +msgid "" +"Deleting the %(object_name)s would result in deleting related objects, but " +"your account doesn't have permission to delete the following types of " +"objects:" +msgstr "" +"Уклањање %(object_name)s повлачи уклањање свих објеката који су повезани са " +"овим објектом, али ваш налог нема дозволе за брисање следећих типова " +"објеката:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:22 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(object_name)s objects? All of " +"the following objects and it's related items will be deleted:" +msgstr "" +"Да сигурни да желите да обришете одабране %(object_name)s? Следећи објекти " +"који су у вези са овим објектом ће такође бити обрисани:" + #: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " -msgstr " По %(filter_title)s" +msgstr " %(filter_title)s " #: contrib/admin/templates/admin/index.html:18 #, python-format msgid "Models available in the %(name)s application." -msgstr "Доступни модели у апликацији %(name)s." +msgstr "Модели доступни у апликацији %(name)s." #: contrib/admin/templates/admin/index.html:35 msgid "Change" -msgstr "Измените" +msgstr "Измени" #: contrib/admin/templates/admin/index.html:45 msgid "You don't have permission to edit anything." -msgstr "Немате права да вршите измене." +msgstr "Немате дозволе да уносите било какве измене." #: contrib/admin/templates/admin/index.html:53 msgid "Recent Actions" -msgstr "Последње активности" +msgstr "Последње радње" #: contrib/admin/templates/admin/index.html:54 msgid "My Actions" -msgstr "Моје активности" +msgstr "Моје радње" #: contrib/admin/templates/admin/index.html:58 msgid "None available" -msgstr "Без активности" +msgstr "Нема података" + +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Непознат садржај" #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" @@ -650,12 +716,12 @@ msgid "" "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Нешто није у реду са вашом исталацијом базе података. Проверите да ли су све " -"табеле креиране и читљиве од стране дефинисаног корисника." +"Нешто није уреду са вашом базом података. Проверите да ли постоје " +"одговарајуће табеле и да ли одговарајући корисник има приступ бази." #: contrib/admin/templates/admin/login.html:19 msgid "Username:" -msgstr "Корисничко име:" +msgstr "Корисник:" #: contrib/admin/templates/admin/login.html:22 msgid "Password:" @@ -672,28 +738,28 @@ msgstr "Корисник" #: contrib/admin/templates/admin/object_history.html:24 #: contrib/comments/templates/comments/moderation_queue.html:33 msgid "Action" -msgstr "Активност" +msgstr "Радња" #: contrib/admin/templates/admin/object_history.html:30 -#: utils/translation/trans_real.py:404 +#: utils/translation/trans_real.py:400 msgid "DATETIME_FORMAT" -msgstr "d.m.Y. H:i:s" +msgstr "j. N. Y. G:i T" #: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -"Овај објекат нема историју промена. Највероватније није додат коришћењем " -"администрације сајта." +"Овај објекат нема забележен историјат измена. Вероватно није додат кроз овај " +"сајт за администрацију." #: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Прикажи све" #: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Нађи" +msgid "Search" +msgstr "Претрага" #: contrib/admin/templates/admin/search_form.html:10 #, python-format @@ -705,83 +771,83 @@ msgstr[2] "%(counter)s резултата" #: contrib/admin/templates/admin/search_form.html:10 #, python-format -msgid "%(full_result_count)s тотал" -msgstr "%(full_result_count)s укупно" +msgid "%(full_result_count)s total" +msgstr "укупно %(full_result_count)s" #: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" -msgstr "Снимите" +msgstr "Сачувај" #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" -msgstr "Снимите као нови" +msgstr "Сачувај као нови" #: contrib/admin/templates/admin/submit_line.html:6 msgid "Save and add another" -msgstr "Снимите и додај још један" +msgstr "Сачувај и додај следећи" #: contrib/admin/templates/admin/submit_line.html:7 msgid "Save and continue editing" -msgstr "Снимите и наставите са изменама" +msgstr "Сачувај и настави са изменама" #: contrib/admin/templates/admin/auth/user/add_form.html:6 msgid "" "First, enter a username and password. Then, you'll be able to edit more user " "options." msgstr "" -"Прво унесите корисничко име и лозинку да би сте могли мењати остале опције " -"за корисника." +"Прво унесите корисничко име и лозинку. Потом ћете моћи да мењате још " +"корисничких подешавања." #: contrib/admin/templates/admin/auth/user/add_form.html:13 #: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59 msgid "Username" -msgstr "Корисничко име" +msgstr "Корисник" #: contrib/admin/templates/admin/auth/user/add_form.html:20 -#: contrib/admin/templates/admin/auth/user/change_password.html:33 -#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 msgid "Password" msgstr "Лозинка" #: contrib/admin/templates/admin/auth/user/add_form.html:26 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/auth/forms.py:185 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/auth/forms.py:186 msgid "Password (again)" -msgstr "Лозинка (поново)" +msgstr "Лозинка (поновите)" #: contrib/admin/templates/admin/auth/user/add_form.html:27 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 msgid "Enter the same password as above, for verification." -msgstr "Због провере, поновите лозинку." +msgstr "Ради провере тачности поново унесите лозинку коју сте унели горе." -#: contrib/admin/templates/admin/auth/user/change_password.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." msgstr "Унесите нову лозинку за корисника %(username)s." #: contrib/admin/templates/admin/edit_inline/tabular.html:15 msgid "Delete?" -msgstr "Обришите?" +msgstr "Брисање?" #: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." -msgstr "Хвала Вам на посети." +msgstr "Хвала што сте данас провели време на овом сајту." #: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" -msgstr "Пријавите се поново" +msgstr "Поновна пријава" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 #: contrib/admin/templates/registration/password_change_form.html:6 #: contrib/admin/templates/registration/password_change_form.html:10 msgid "Password change" -msgstr "Измените лозинку" +msgstr "Измена лозинке" #: contrib/admin/templates/registration/password_change_done.html:6 #: contrib/admin/templates/registration/password_change_done.html:10 msgid "Password change successful" -msgstr "Лозинка је успешно измењена" +msgstr "Успешна измена лозинке" #: contrib/admin/templates/registration/password_change_done.html:12 msgid "Your password was changed." @@ -792,8 +858,8 @@ msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Унесите стару лозинку, након тога унесите нову лозинку два пута, ради " -"провере исправности уноса." +"Из безбедносних разлога прво унесите своју стару лозинку, а нову затим " +"унесите два пута да бисмо могли да проверимо да ли сте је правилно унели." #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -807,12 +873,12 @@ msgstr "Нова лозинка:" #: contrib/admin/templates/registration/password_change_form.html:21 #: contrib/admin/templates/registration/password_reset_confirm.html:20 msgid "Confirm password:" -msgstr "Потврдите нову лозинку:" +msgstr "Потврда лозинке:" #: contrib/admin/templates/registration/password_change_form.html:23 #: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "Change my password" -msgstr "Измените моју лозинку" +msgstr "Измени моју лозинку" #: contrib/admin/templates/registration/password_reset_complete.html:4 #: contrib/admin/templates/registration/password_reset_confirm.html:6 @@ -826,15 +892,15 @@ msgstr "Ресетовање лозинке" #: contrib/admin/templates/registration/password_reset_complete.html:6 #: contrib/admin/templates/registration/password_reset_complete.html:10 msgid "Password reset complete" -msgstr "Ресетовање лозинке је завршено" +msgstr "Ресетовање лозинке успешно" #: contrib/admin/templates/registration/password_reset_complete.html:12 msgid "Your password has been set. You may go ahead and log in now." -msgstr "Ваша лозинка је ресетована. Можете се поново логовати." +msgstr "Ваша лозинка је постављена. Можете се пријавити." #: contrib/admin/templates/registration/password_reset_confirm.html:4 msgid "Password reset confirmation" -msgstr "Потврдите лозинку" +msgstr "Потврда ресетовања лозинке" #: contrib/admin/templates/registration/password_reset_confirm.html:12 msgid "Enter new password" @@ -845,246 +911,253 @@ msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -"Унесите нову лозинку два пута, ради провере исправности уноса." +"Унесите нову лозинку два пута како бисмо могли да проверимо да ли сте је " +"правилно унели." #: contrib/admin/templates/registration/password_reset_confirm.html:26 msgid "Password reset unsuccessful" -msgstr "Ваша лозинка није успешно ресетована" +msgstr "Ресетовање лозинке неуспешно" #: contrib/admin/templates/registration/password_reset_confirm.html:28 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -"Линк за ресетовање лозинке није валидан, вероватно јер је већ" -"био коришћен. затражите ново ресетовање лозинке" +"Линк за ресетовање лозинке није важећи, вероватно зато што је већ " +"искоришћен. Поново затражите ресетовање лозинке." #: contrib/admin/templates/registration/password_reset_done.html:6 #: contrib/admin/templates/registration/password_reset_done.html:10 msgid "Password reset successful" -msgstr "Ваша лозинка је успешно ресетована" +msgstr "Ресетовање лозинке успешно." #: contrib/admin/templates/registration/password_reset_done.html:12 msgid "" "We've e-mailed you instructions for setting your password to the e-mail " "address you submitted. You should be receiving it shortly." msgstr "" -"Нова лозинка вам је послата на задату адресу електронске поште. Електронска " -"порука би требао да стигне у наредних неколико минута." +"Послали смо упутства за постављање нове лозинке на имејл адресу коју сте нам " +"дали. Упутства ћете добити ускоро." #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" -msgstr "Примили сте овај имејл јер сте затражили ресетовање лозинке" +msgstr "Ову поруку сте примили зато што сте захтевали ресетовање лозинке" #: contrib/admin/templates/registration/password_reset_email.html:3 #, python-format msgid "for your user account at %(site_name)s" -msgstr "за Ваш кориснички налог на %(site_name)s" +msgstr "за ваш кориснички налог на сајту %(site_name)s" #: contrib/admin/templates/registration/password_reset_email.html:5 msgid "Please go to the following page and choose a new password:" -msgstr "Отворите следећу интернет страну и промените лозинку:" +msgstr "Идите на следећу страницу и поставите нову лозинку." #: contrib/admin/templates/registration/password_reset_email.html:9 msgid "Your username, in case you've forgotten:" -msgstr "Ваше корисничко име, у случају да сте заборавили:" +msgstr "Уколико сте заборавили, ваше корисничко име:" #: contrib/admin/templates/registration/password_reset_email.html:11 msgid "Thanks for using our site!" -msgstr "Хвала Вам на посети!" +msgstr "Хвала што користите наш сајт!" #: contrib/admin/templates/registration/password_reset_email.html:13 #, python-format msgid "The %(site_name)s team" -msgstr "%(site_name)s тим" +msgstr "Екипа сајта %(site_name)s" #: contrib/admin/templates/registration/password_reset_form.html:12 msgid "" "Forgotten your password? Enter your e-mail address below, and we'll e-mail " "instructions for setting a new one." msgstr "" -"Заборавили сте своју лозинку? Унесите вашу адресу електронске поште и добићете " -"упутства за промену лозинке." +"Заборавили сте лозинку? Унесите своју имејл адресу доле и послаћемо вам " +"упутства за постављање нове." #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" -msgstr "Адреса електронске поште:" +msgstr "Имејл адреса:" #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "Reset my password" -msgstr "Ресетујте моју лозинку" +msgstr "Ресетуј моју лозинку" -#: contrib/admin/templatetags/admin_list.py:284 +#: contrib/admin/templatetags/admin_list.py:299 msgid "All dates" msgstr "Сви датуми" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s" -msgstr "Изаберите %s" +msgstr "Одабери објекат класе %s" -#: contrib/admin/views/main.py:69 +#: contrib/admin/views/main.py:70 #, python-format msgid "Select %s to change" -msgstr "Изаберите %s за измену" +msgstr "Одабери објекат класе %s за измену" -#: contrib/admin/views/template.py:36 contrib/sites/models.py:38 +#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 msgid "site" msgstr "сајт" -#: contrib/admin/views/template.py:38 +#: contrib/admin/views/template.py:39 msgid "template" -msgstr "назив шаблона" +msgstr "темплејт" -#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59 -#: contrib/admindocs/views.py:61 +#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 +#: contrib/admindocs/views.py:62 msgid "tag:" -msgstr "ознака:" +msgstr "таг:" -#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92 -#: contrib/admindocs/views.py:94 +#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 +#: contrib/admindocs/views.py:95 msgid "filter:" msgstr "филтер:" -#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156 -#: contrib/admindocs/views.py:158 +#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 +#: contrib/admindocs/views.py:159 msgid "view:" -msgstr "изглед:" +msgstr "вју:" -#: contrib/admindocs/views.py:186 +#: contrib/admindocs/views.py:187 #, python-format msgid "App %r not found" -msgstr "Апликација %r није нађена" +msgstr "Апликација %r није пронађена" -#: contrib/admindocs/views.py:193 +#: contrib/admindocs/views.py:194 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" -msgstr "Модел %(model_name)r није нађен у апликацији %(app_label)r" +msgstr "Модел %(model_name)r није пронађен у апликацији %(app_label)r" -#: contrib/admindocs/views.py:205 +#: contrib/admindocs/views.py:206 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" -msgstr "повезани `%(app_label)s.%(data_type)s` објекти" +msgstr "повезани објекти класе `%(app_label)s.%(data_type)s`" -#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227 -#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246 +#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 msgid "model:" msgstr "модел:" -#: contrib/admindocs/views.py:236 +# WARN: possible breakage in future +# This string is interpolated in strings below, which can cause breakage in +# future releases. +#: contrib/admindocs/views.py:237 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" -msgstr "повезани `%(app_label)s.%(object_name)s` објекти" +msgstr "класе `%(app_label)s.%(object_name)s`" -#: contrib/admindocs/views.py:241 +# WARN: possible breakage in future +#: contrib/admindocs/views.py:242 #, python-format msgid "all %s" -msgstr "сви %s" +msgstr "сви повезани објекти %s" -#: contrib/admindocs/views.py:246 +# WARN: possible breakage in future +#: contrib/admindocs/views.py:247 #, python-format msgid "number of %s" -msgstr "број %s" +msgstr "број повезаних објеката %s" -#: contrib/admindocs/views.py:251 +# WARN: possible breakage in future +#: contrib/admindocs/views.py:252 #, python-format msgid "Fields on %s objects" -msgstr "Поља у %s објеката" +msgstr "Поља у повезаним објектима %s" -#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325 -#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333 -#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336 +#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 +#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 msgid "Integer" msgstr "Цео број" -#: contrib/admindocs/views.py:315 +#: contrib/admindocs/views.py:316 msgid "Boolean (Either True or False)" -msgstr "Логичка вредност (Тачно или Нетачно)" +msgstr "Булова вредност (True или False)" -#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335 +#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 #, python-format msgid "String (up to %(max_length)s)" -msgstr "Низ карактера (максимално %(max_length)s карактера)" - -#: contrib/admindocs/views.py:317 -msgid "Comma-separated integers" -msgstr "Бројеви раздвојени запетама" +msgstr "Стринг (највише %(max_length)s знакова)" #: contrib/admindocs/views.py:318 +msgid "Comma-separated integers" +msgstr "Цели бројеви раздвојени запетама" + +#: contrib/admindocs/views.py:319 msgid "Date (without time)" msgstr "Датум (без времена)" -#: contrib/admindocs/views.py:319 +#: contrib/admindocs/views.py:320 msgid "Date (with time)" msgstr "Датум (са временом)" -#: contrib/admindocs/views.py:320 +#: contrib/admindocs/views.py:321 msgid "Decimal number" msgstr "Децимални број" -#: contrib/admindocs/views.py:321 +#: contrib/admindocs/views.py:322 msgid "E-mail address" -msgstr "Aдреса електронске поште" +msgstr "Имејл адреса" -#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323 -#: contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:327 msgid "File path" -msgstr "Путања до фајла" +msgstr "Путања фајла" -#: contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:325 msgid "Floating point number" -msgstr "Вредност са покретним зарезом" +msgstr "Број са покреном запетом" -#: contrib/admindocs/views.py:328 contrib/comments/models.py:58 +#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 msgid "IP address" msgstr "IP адреса" -#: contrib/admindocs/views.py:330 -msgid "Boolean (Either True, False or None)" -msgstr "Логичка вредност (Тачно, Нетачно или празно)" - #: contrib/admindocs/views.py:331 -msgid "Relation to parent model" -msgstr "Релација ка надређеном објекту" +msgid "Boolean (Either True, False or None)" +msgstr "Булова вредност (True, False или None)" #: contrib/admindocs/views.py:332 -msgid "Phone number" -msgstr "Телефонски број" +msgid "Relation to parent model" +msgstr "Веза са родитељским моделом" -#: contrib/admindocs/views.py:337 +#: contrib/admindocs/views.py:333 +msgid "Phone number" +msgstr "Број телефона" + +#: contrib/admindocs/views.py:338 msgid "Text" msgstr "Текст" -#: contrib/admindocs/views.py:338 +#: contrib/admindocs/views.py:339 msgid "Time" msgstr "Време" -#: contrib/admindocs/views.py:339 contrib/comments/forms.py:21 +#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 #: contrib/comments/templates/comments/moderation_queue.html:37 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 msgid "URL" msgstr "URL" -#: contrib/admindocs/views.py:340 -msgid "U.S. state (two uppercase letters)" -msgstr "Држава у оквиру САД (два велика слова)" - #: contrib/admindocs/views.py:341 +msgid "U.S. state (two uppercase letters)" +msgstr "Држава у САД (два велика слова)" + +#: contrib/admindocs/views.py:342 msgid "XML text" msgstr "XML текст" -#: contrib/admindocs/views.py:367 +#: contrib/admindocs/views.py:368 #, python-format msgid "%s does not appear to be a urlpattern object" -msgstr "%s није urlpattern објект" +msgstr "%s не изгледа као urlpattern објекат" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" -msgstr "Bookmarklets" +msgstr "Букмарклети" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:4 msgid "Documentation bookmarklets" -msgstr "Документациони \"bookmarklets\"" +msgstr "Букмарклети документације" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:8 msgid "" @@ -1097,56 +1170,58 @@ msgid "" "your computer is \"internal\").

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

                                  Да бисте инсталирали \"bookmarklet\", одвуците линк у " -"Ваше \"bookmark\"-е, или кликните десним тастером и додајте га. Сада можете " -"да изаберете \"bookmark\" са било које стране на сајту. Напомена: приступ " -"одређеним странама мора бити са компјутера чија је IP адреса означена као " -"\"internal\" (контактирајте систем администратора ако нисте сигурни да ли је " -"ваш IP означен као \"internal\").

                                  \n" +"

                                  Да бисте инсталирали букмарклет, превуците линк до својих\n" +"букмаркова или кликните десним дугметом и додајте међу букмарке. Након тога\n" +"букмарклетима можете приступити са сваке странице на сајту. Имајте на уму\n" +"да неки букмарклети захтевају да сајту приступите са рачунара који су\n" +"означени као „интерни“ (питајте администратора вашег система уколико нисте\n" +"сигурни да ли је ваш рачунар „интерни“).

                                  \n" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:18 msgid "Documentation for this page" -msgstr "Документација за ову страну" +msgstr "Документација за ову страницу" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:19 msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." msgstr "" -"Прелази са било које стране на страну са документацијом за „изглед“ који " -"генерише ту страну." +"Води од било које странице до документаицје погледа који је генерисао ту " +"страницу." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:21 msgid "Show object ID" -msgstr "Прикажите ID објекта" +msgstr "Прикажи ID објекта" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:22 msgid "" "Shows the content-type and unique ID for pages that represent a single " "object." msgstr "" -"Приказује тип садржаја и јединствени ID стране које представља један " +"Приказује content-type и јединствени ID за страницу која преставља један " "објекат." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:24 msgid "Edit this object (current window)" -msgstr "Измена објекта (у активном прозору)" +msgstr "Измени овај објекат (у овом прозору)" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:25 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "Прелази на страну администрације за стране које представљају објект." +msgstr "" +"Води у администрациони страницу за странице које престављају један објекат" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:27 msgid "Edit this object (new window)" -msgstr "Измени објекат (нови прозор)" +msgstr "Измени овај објекат (нови прозор)" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:28 msgid "As above, but opens the admin page in a new window." -msgstr "Као изнад, само отвара страну администрације у новом прозору." +msgstr "" +"Исто као претходни, али отвара администрациону страницу у новом прозору." #: contrib/auth/admin.py:21 msgid "Personal info" -msgstr "Личне информације" +msgstr "Лични подаци" #: contrib/auth/admin.py:22 msgid "Permissions" @@ -1160,208 +1235,214 @@ msgstr "Важни датуми" msgid "Groups" msgstr "Групе" -#: contrib/auth/admin.py:64 +#: contrib/auth/admin.py:80 msgid "Add user" -msgstr "Додајте корисника" +msgstr "Додај корисника" -#: contrib/auth/admin.py:90 +#: contrib/auth/admin.py:106 msgid "Password changed successfully." -msgstr "Лозинка је успешно измењена." +msgstr "Лозинка успешно измењена." -#: contrib/auth/admin.py:96 +#: contrib/auth/admin.py:112 #, python-format msgid "Change password: %s" -msgstr "Измените лозинку: %s" +msgstr "Измени лозинку: %s" #: contrib/auth/forms.py:15 contrib/auth/forms.py:48 -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." msgstr "" -"Обавезно. До 30 карактера (само слова, бројеви и доња црта „_“)." +"Неопходно. Највише 30 словних места. Само алфанумерички знаци (слова, бројке " +"и доња црта)." -# nesh: Ovo je opis za stari SlugField #: contrib/auth/forms.py:16 contrib/auth/forms.py:49 msgid "This value must contain only letters, numbers and underscores." -msgstr "Ово поље може садржати само слова, бројеве и доњу црту „_“." +msgstr "Ова вредност може садржати само слова, бројке и доње црте." #: contrib/auth/forms.py:18 msgid "Password confirmation" -msgstr "Потврдите лозинку" +msgstr "Потврда лозинке" #: contrib/auth/forms.py:30 msgid "A user with that username already exists." -msgstr "Корисник већ постоји." +msgstr "Корисник са тим корисничким именом већ постоји." -#: contrib/auth/forms.py:36 contrib/auth/forms.py:154 -#: contrib/auth/forms.py:196 +#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:197 msgid "The two password fields didn't match." -msgstr "Поља за лозинку нису иста." +msgstr "Два поља за лозинке се нису поклопила." #: contrib/auth/forms.py:82 msgid "This account is inactive." -msgstr "Неактивни налог." +msgstr "Овај налог је неактиван." #: contrib/auth/forms.py:87 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -"Ваш интернет читач није прихватио „cookie.“ „Cookie“ подршка је потребна " -"да бисте могли да се пријавите." +"Изгледа да су колачићи искључени у вашем браузеру. Они морају бити укључени " +"да би сте се пријавили." #: contrib/auth/forms.py:100 msgid "E-mail" -msgstr "Адреса електронске поште" +msgstr "Имејл адреса" #: contrib/auth/forms.py:109 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -"Ова адреса електронске поште није повезана ни са једним корисничким налогом. Да ли сте " -"сигурни да сте регистровани?" +"Та имејл адреса није у вези ни са једним налогом. Да ли сте сигурни да сте " +"се већ регистровали?" -#: contrib/auth/forms.py:134 +#: contrib/auth/forms.py:135 #, python-format msgid "Password reset on %s" -msgstr "Ресетовање лозинке за %s" +msgstr "Ресетовање лозинке на %s" -#: contrib/auth/forms.py:142 +#: contrib/auth/forms.py:143 msgid "New password" msgstr "Нова лозинка" -#: contrib/auth/forms.py:143 +#: contrib/auth/forms.py:144 msgid "New password confirmation" msgstr "Потврда нове лозинке" -#: contrib/auth/forms.py:168 +#: contrib/auth/forms.py:169 msgid "Old password" msgstr "Стара лозинка" -#: contrib/auth/forms.py:176 +#: contrib/auth/forms.py:177 msgid "Your old password was entered incorrectly. Please enter it again." -msgstr "Погрешна стара лозинка. Унесите је поново." +msgstr "Ваша стара лознка није правилно унесена. Унесите је поново." -#: contrib/auth/models.py:72 contrib/auth/models.py:95 +#: contrib/auth/models.py:63 contrib/auth/models.py:86 msgid "name" msgstr "име" -#: contrib/auth/models.py:74 +#: contrib/auth/models.py:65 msgid "codename" msgstr "шифра дозволе" -#: contrib/auth/models.py:77 +#: contrib/auth/models.py:68 msgid "permission" msgstr "дозвола" -#: contrib/auth/models.py:78 contrib/auth/models.py:96 +#: contrib/auth/models.py:69 contrib/auth/models.py:87 msgid "permissions" msgstr "дозволе" -#: contrib/auth/models.py:99 +#: contrib/auth/models.py:90 msgid "group" msgstr "група" -#: contrib/auth/models.py:100 contrib/auth/models.py:146 +#: contrib/auth/models.py:91 contrib/auth/models.py:138 msgid "groups" msgstr "групе" -#: contrib/auth/models.py:136 +#: contrib/auth/models.py:128 msgid "username" msgstr "корисничко име" -#: contrib/auth/models.py:137 +#: contrib/auth/models.py:129 msgid "first name" msgstr "име" -#: contrib/auth/models.py:138 +#: contrib/auth/models.py:130 msgid "last name" msgstr "презиме" -#: contrib/auth/models.py:139 +#: contrib/auth/models.py:131 msgid "e-mail address" -msgstr "адреса електронске поште" +msgstr "имејл адреса" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "password" msgstr "лозинка" -#: contrib/auth/models.py:140 +#: contrib/auth/models.py:132 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." msgstr "" -"Користите '[algo]$[salt]$[hexdigest]' или промени " -"лозинку." +"Користите '[algo]$[salt]$[hexdigest]' или формулар за " +"унос лозинке." -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "staff status" -msgstr "дозвољен приступ администрацији сајта" +msgstr "статус члана посаде" -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:133 msgid "Designates whether the user can log into this admin site." -msgstr "Да ли корисник има приступ администраторском делу сајта." +msgstr "" +"Означава да ли корисник може да се пријави на овај сајт за администрацију." -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "active" msgstr "активан" -#: contrib/auth/models.py:142 +#: contrib/auth/models.py:134 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." -msgstr "Означава активне кориснике. Користите уместо брисања налога." +msgstr "" +"Означава да ли се корисник сматра активним. Деселектујте ово уместо да " +"бришете налог." -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "superuser status" msgstr "статус администратора" -#: contrib/auth/models.py:143 +#: contrib/auth/models.py:135 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." -msgstr "Означава кориснике који имају сва права." +msgstr "" +"Означава да ли корисник има све дозволе без додељивања појединачних дозвола." -#: contrib/auth/models.py:144 +#: contrib/auth/models.py:136 msgid "last login" -msgstr "време последње посете" +msgstr "последња пријава" -#: contrib/auth/models.py:145 +#: contrib/auth/models.py:137 msgid "date joined" -msgstr "датум отварања налога" +msgstr "датум регистрације" -#: contrib/auth/models.py:147 +#: contrib/auth/models.py:139 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -"Уз ручно додата права, корисник ће добити сва права из група којима припада." +"Поред ручно додељених дозвола, овај корисник ће имати и дозволе додељене " +"гурпама којима припада." -#: contrib/auth/models.py:148 +#: contrib/auth/models.py:140 msgid "user permissions" msgstr "корисничке дозволе" -#: contrib/auth/models.py:152 +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 msgid "user" msgstr "корисник" -#: contrib/auth/models.py:153 +#: contrib/auth/models.py:145 msgid "users" msgstr "корисници" -#: contrib/auth/models.py:308 +#: contrib/auth/models.py:301 msgid "message" msgstr "порука" -#: contrib/auth/views.py:50 +#: contrib/auth/views.py:56 msgid "Logged out" -msgstr "Одјављени сте" +msgstr "Одјављен" -#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428 +#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 msgid "Enter a valid e-mail address." -msgstr "Унесите исправну адресу електронске поште." +msgstr "Унесите важећу имејл адресу." #: contrib/comments/admin.py:11 msgid "Content" @@ -1371,97 +1452,115 @@ msgstr "Садржај" msgid "Metadata" msgstr "Метаподаци" -#: contrib/comments/forms.py:19 +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "Коментари на сајту %(site_name)s" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Скорији коментари на сајту %(site_name)s" + +#: contrib/comments/forms.py:93 #: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" msgstr "Име" -#: contrib/comments/forms.py:20 +#: contrib/comments/forms.py:94 msgid "Email address" -msgstr "Адреса електронске поште" +msgstr "Имејл адреса" -#: contrib/comments/forms.py:22 +#: contrib/comments/forms.py:96 #: contrib/comments/templates/comments/moderation_queue.html:35 msgid "Comment" -msgstr "Коментар" +msgstr "Коментари" -#: contrib/comments/forms.py:25 -msgid "" -"If you enter anything in this field your comment will be treated as spam" -msgstr "Уколико унесете нешто у ово поље, Ваш коментар ће бити третиран као спам" - -#: contrib/comments/forms.py:125 +#: contrib/comments/forms.py:173 #, python-format msgid "Watch your mouth! The word %s is not allowed here." msgid_plural "Watch your mouth! The words %s are not allowed here." -msgstr[0] "Припази на језик! %s реч није овде дозвољена." -msgstr[1] "Припази на језик! %s речи нису овде дозвољене." -msgstr[2] "Припази на језик! %s речи нису овде дозвољене." +msgstr[0] "Пази на језик! Реч „%s“ овде није дозвољена." +msgstr[1] "Пази на језик! Речи „%s“ овде нису дозвољене." +msgstr[2] "Пази на језик! Речи „%s“ овде нису дозвољене." -#: contrib/comments/models.py:23 +#: contrib/comments/forms.py:180 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "Ако ишта унесете у ово поље, Ваш коментар ће се сматрати спамом." + +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "тип садржаја" + +#: contrib/comments/models.py:24 msgid "object ID" msgstr "ID објекта" -#: contrib/comments/models.py:50 -msgid "user's name" -msgstr "име корисника" - -#: contrib/comments/models.py:51 -msgid "user's email address" -msgstr "адреса електронске поште корисника" - #: contrib/comments/models.py:52 -msgid "user's URL" -msgstr "веб сајт корисника" +msgid "user's name" +msgstr "корисниково име" + +#: contrib/comments/models.py:53 +msgid "user's email address" +msgstr "корисникова имејл адреса" #: contrib/comments/models.py:54 +msgid "user's URL" +msgstr "корисников URL" + +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 msgid "comment" msgstr "коментар" -#: contrib/comments/models.py:57 -msgid "date/time submitted" -msgstr "датум/време слања" - #: contrib/comments/models.py:59 -msgid "is public" -msgstr "да ли је јавни" +msgid "date/time submitted" +msgstr "датум/време постављања" -#: contrib/comments/models.py:60 -msgid "" -"Uncheck this box to make the comment effectively disappear from the site." -msgstr "Одзначите ово поље како коментар не би био видљив на сајту." +#: contrib/comments/models.py:61 +msgid "is public" +msgstr "јавно" #: contrib/comments/models.py:62 -msgid "is removed" -msgstr "да ли је обрисан" +msgid "" +"Uncheck this box to make the comment effectively disappear from the site." +msgstr "" +"Деселектујте ову кућицу ако желите да порука фактични нестане са овог сајта." -#: contrib/comments/models.py:63 +#: contrib/comments/models.py:64 +msgid "is removed" +msgstr "уклоњен" + +#: contrib/comments/models.py:65 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." msgstr "" -"Изаберите ако је коментар неодговарајући. Биће исписано „Овај коментар је " -"обрисан“ уместо текста коментара." +"Обележите ову кућицу ако је коментар неприкладан. Порука о уклањању ће бити " +"приказана уместо коментара." -# nesh: skethcy??? -# petar: Pojma nemam sta im to znaci -#: contrib/comments/models.py:115 +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "коментари" + +#: contrib/comments/models.py:119 msgid "" "This comment was posted by an authenticated user and thus the name is read-" "only." msgstr "" -"Komentar je poslat od strane пријављеног korisnika тако да име не може да се мења." +"Овај коментар је поставио пријављен корисник и зато је поље са именом " +"закључано." -# nesh: skethcy??? -# petar: Pojma nemam sta im to znaci -#: contrib/comments/models.py:124 +#: contrib/comments/models.py:128 msgid "" "This comment was posted by an authenticated user and thus the email is read-" "only." msgstr "" -"Komentar je poslat od strane пријављеног korisnika тако да адреса електронсе поште не може да се мења." +"Овај коментар је поставио пријављен корисник и зато је поље са имејл адресом " +"закључано." -#: contrib/comments/models.py:149 +#: contrib/comments/models.py:153 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1470,95 +1569,111 @@ msgid "" "\n" "http://%(domain)s%(url)s" msgstr "" -"Послао %(user)s дана %(date)s\n" +"Поставио %(user)s, %(date)s\n" "\n" "%(comment)s\n" "\n" "http://%(domain)s%(url)s" +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "ознака" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "датум" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "ознака коментара" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "ознаке коментара" + #: contrib/comments/templates/comments/approve.html:4 msgid "Approve a comment" -msgstr "Одобрите коментар" +msgstr "Одобрење коментара" #: contrib/comments/templates/comments/approve.html:7 msgid "Really make this comment public?" -msgstr "Да ли стрварно желите да овај коментар буде јавно видљив?" +msgstr "Да ли заиста желите да означите овај коментар јавним?" #: contrib/comments/templates/comments/approve.html:12 #: contrib/comments/templates/comments/moderation_queue.html:49 msgid "Approve" -msgstr "Одобрите" +msgstr "Одобри" #: contrib/comments/templates/comments/approved.html:4 msgid "Thanks for approving" -msgstr "Хвала Вам на потврди" +msgstr "Хвала на одобрењу!" #: contrib/comments/templates/comments/approved.html:7 #: contrib/comments/templates/comments/deleted.html:7 #: contrib/comments/templates/comments/flagged.html:7 msgid "" "Thanks for taking the time to improve the quality of discussion on our site" -msgstr "Хвала Вам на времену које сте посветили дискуцији на сајту" +msgstr "Хвала на учешћу у унапређењу квалитета дискусија на нашем сајту." #: contrib/comments/templates/comments/delete.html:4 msgid "Remove a comment" -msgstr "Избришите коментар" +msgstr "Обриши коментар" #: contrib/comments/templates/comments/delete.html:7 msgid "Really remove this comment?" -msgstr "Да ли стрварно желите да избришете овај коментар?" +msgstr "Да ли заиста желите да обришете овај коментар?" #: contrib/comments/templates/comments/delete.html:12 #: contrib/comments/templates/comments/moderation_queue.html:53 msgid "Remove" -msgstr "Избришите" +msgstr "Обриши" #: contrib/comments/templates/comments/deleted.html:4 msgid "Thanks for removing" -msgstr "Hvala Vam na брисању" +msgstr "Хвала што користите наш сајт!" #: contrib/comments/templates/comments/flag.html:4 msgid "Flag this comment" -msgstr "Означите овај коментар" +msgstr "Означавање коментара" #: contrib/comments/templates/comments/flag.html:7 msgid "Really flag this comment?" -msgstr "Да ли стварно желите да означите овај коментар?" +msgstr "Да ли заиста желите да означите овај коментар?" #: contrib/comments/templates/comments/flag.html:12 msgid "Flag" -msgstr "Означите" +msgstr "Означи" #: contrib/comments/templates/comments/flagged.html:4 msgid "Thanks for flagging" -msgstr "Хвала на означавању!" - -#: contrib/comments/templates/comments/form.html:16 -#: contrib/comments/templates/comments/preview.html:31 -msgid "Post" -msgstr "" +msgstr "Хвала што сте означили коментар." #: contrib/comments/templates/comments/form.html:17 #: contrib/comments/templates/comments/preview.html:32 +msgid "Post" +msgstr "Постави" + +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 msgid "Preview" -msgstr "Преглед коментара" +msgstr "Преглед" #: contrib/comments/templates/comments/moderation_queue.html:4 #: contrib/comments/templates/comments/moderation_queue.html:19 msgid "Comment moderation queue" -msgstr "Коментари на чекању за модерацију" +msgstr "Коментари који чекају на одобрење" #: contrib/comments/templates/comments/moderation_queue.html:26 msgid "No comments to moderate" -msgstr "Нема коментара за модерацију" +msgstr "Нема коментара на чекању" #: contrib/comments/templates/comments/moderation_queue.html:36 msgid "Email" -msgstr "Адреса електронске поште" +msgstr "Имејл адреса" #: contrib/comments/templates/comments/moderation_queue.html:38 msgid "Authenticated?" -msgstr "Идентификован?" +msgstr "Пријављен?" #: contrib/comments/templates/comments/moderation_queue.html:39 msgid "IP Address" @@ -1578,41 +1693,37 @@ msgstr "не" #: contrib/comments/templates/comments/posted.html:4 msgid "Thanks for commenting" -msgstr "Хвала на коментарисању" +msgstr "Хвала на коментару" #: contrib/comments/templates/comments/posted.html:7 msgid "Thank you for your comment" -msgstr "Хвала на Вашем коментару" +msgstr "Хвала што сте оставили свој коментар" #: contrib/comments/templates/comments/preview.html:4 -#: contrib/comments/templates/comments/preview.html:12 +#: contrib/comments/templates/comments/preview.html:13 msgid "Preview your comment" -msgstr "Преглед Ваших коментара" +msgstr "Прегледај коментар" -#: contrib/comments/templates/comments/preview.html:10 +#: contrib/comments/templates/comments/preview.html:11 msgid "Please correct the error below" msgid_plural "Please correct the errors below" -msgstr[0] "Исправите доле наведену грешку." -msgstr[1] "Исправите доле наведене грешке." -msgstr[2] "Исправите доле наведене грешке." +msgstr[0] "Исправите грешку доле." +msgstr[1] "Исправите грешке доле." +msgstr[2] "Исправите грешке доле." -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "Post your comment" -msgstr "Поставите Ваш кометар" +msgstr "Постави коментар" -#: contrib/comments/templates/comments/preview.html:15 +#: contrib/comments/templates/comments/preview.html:16 msgid "or make changes" -msgstr "или измените" +msgstr "или изврши измене" -#: contrib/contenttypes/models.py:67 +#: contrib/contenttypes/models.py:70 msgid "python model class name" -msgstr "назив python модула" +msgstr "име python класе модела" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "тип садржаја" - -#: contrib/contenttypes/models.py:72 +#: contrib/contenttypes/models.py:75 msgid "content types" msgstr "типови садржаја" @@ -1620,20 +1731,20 @@ msgstr "типови садржаја" msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -"Пример: '/o-nama/kontakt/'. Проверите да ли сте унели '/' на почетку и на " -"крају." +"Пример: '/about/contact/'. Пазите на то да постоје и почетне и завршне косе " +"црте." #: contrib/flatpages/admin.py:11 msgid "" "This value must contain only letters, numbers, underscores, dashes or " "slashes." msgstr "" -"Ово поље може садржати само слова, бројеве, доњу црту „_“, црту „-“ и косе " +"Ова вредност може садржати само слова, бројке, доње црте, цртице или косе " "црте." #: contrib/flatpages/admin.py:22 msgid "Advanced options" -msgstr "Напредне опције" +msgstr "Напредна подешавања" #: contrib/flatpages/models.py:8 msgid "title" @@ -1645,75 +1756,78 @@ msgstr "садржај" #: contrib/flatpages/models.py:10 msgid "enable comments" -msgstr "омогућите коментаре" +msgstr "омогући коментарисање" #: contrib/flatpages/models.py:11 msgid "template name" -msgstr "назив шаблона" +msgstr "назив темплејта" #: contrib/flatpages/models.py:12 msgid "" "Example: 'flatpages/contact_page.html'. If this isn't provided, the system " "will use 'flatpages/default.html'." msgstr "" -"Пример: 'flatpages/kontakt-stranica.html'. Ако не задате систем ће користити " -"'flatpages/default.html'." +"Пример: 'flatpages/contact_page.html'. Ако ово оставите празним, систем ће " +"користити 'flatpages/default.html'." #: contrib/flatpages/models.py:13 msgid "registration required" -msgstr "само за регистроване кориснике" +msgstr "потребна регистрација" #: contrib/flatpages/models.py:13 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" -"Ако изаберете ову опцију само пријављени корисници ће имати приступ датој " -"страни." +"Ако је ово обележено, само ће пријављени корисници моћи да виде ову страницу." #: contrib/flatpages/models.py:18 msgid "flat page" -msgstr "статична страна" +msgstr "флет страница" #: contrib/flatpages/models.py:19 msgid "flat pages" -msgstr "статичне стране" +msgstr "флет странице" #: contrib/formtools/wizard.py:130 msgid "" "We apologize, but your form has expired. Please continue filling out the " "form from this page." msgstr "" +"Жао нам је, али Ваша сесија је истекла. Попуњавање формулара наставите на " +"овој страници." -#: contrib/gis/forms/fields.py:14 +#: contrib/gis/forms/fields.py:17 msgid "No geometry value provided." -msgstr "" +msgstr "Нисте задали параметре за геометрију." -#: contrib/gis/forms/fields.py:15 +#: contrib/gis/forms/fields.py:18 msgid "Invalid geometry value." -msgstr "" +msgstr "Неисправан параметар за геометрију." -#: contrib/gis/forms/fields.py:16 +#: contrib/gis/forms/fields.py:19 msgid "Invalid geometry type." +msgstr "Непостојећи тип геометрије." + +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." msgstr "" -# th/rd se ne koriste kod nas #: contrib/humanize/templatetags/humanize.py:19 msgid "th" -msgstr "" +msgstr "-и" -# vidi "th" #: contrib/humanize/templatetags/humanize.py:19 msgid "st" -msgstr "" +msgstr "-ви" -# vidi "th" #: contrib/humanize/templatetags/humanize.py:19 msgid "nd" -msgstr "" +msgstr "-и" -# vidi "th" #: contrib/humanize/templatetags/humanize.py:19 msgid "rd" -msgstr "" +msgstr "-и" #: contrib/humanize/templatetags/humanize.py:51 #, python-format @@ -1735,9 +1849,9 @@ msgstr[2] "%(value).1f милијарди" #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f билион" -msgstr[1] "%(value).1f билиона" -msgstr[2] "%(value).1f билиона" +msgstr[0] "%(value).1f трилион" +msgstr[1] "%(value).1f трилиона" +msgstr[2] "%(value).1f трилиона" #: contrib/humanize/templatetags/humanize.py:73 msgid "one" @@ -1777,7 +1891,7 @@ msgstr "девет" #: contrib/humanize/templatetags/humanize.py:93 msgid "today" -msgstr "данас" +msgstr "десет" #: contrib/humanize/templatetags/humanize.py:95 msgid "tomorrow" @@ -1789,94 +1903,93 @@ msgstr "јуче" #: contrib/localflavor/ar/forms.py:27 msgid "Enter a postal code in the format NNNN or ANNNNAAA." -msgstr "" +msgstr "Унесите поштански број у формату НННН или АННННААА." #: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96 #: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 #: contrib/localflavor/pe/forms.py:51 msgid "This field requires only numbers." -msgstr "У ово поље се могу унети само бројеви." +msgstr "Ово поље мора садржати само бројке." #: contrib/localflavor/ar/forms.py:50 msgid "This field requires 7 or 8 digits." -msgstr "Морате унете 7 или 8 цифара." +msgstr "Ово поље мора садржати 7 или 8 цифара" #: contrib/localflavor/ar/forms.py:79 msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." -msgstr "" +msgstr "Унестие важећи CUIT у формату XX-XXXXXXXX-X or XXXXXXXXXXXX." #: contrib/localflavor/ar/forms.py:80 msgid "Invalid CUIT." -msgstr "" +msgstr "Неважећи CUIT" #: contrib/localflavor/at/at_states.py:5 msgid "Burgenland" -msgstr "" +msgstr "Бургенланд" #: contrib/localflavor/at/at_states.py:6 msgid "Carinthia" -msgstr "" +msgstr "Каринтија" #: contrib/localflavor/at/at_states.py:7 msgid "Lower Austria" -msgstr "" +msgstr "Доња Аустрија" #: contrib/localflavor/at/at_states.py:8 msgid "Upper Austria" -msgstr "" +msgstr "Горња Аустрија" #: contrib/localflavor/at/at_states.py:9 msgid "Salzburg" -msgstr "" +msgstr "Салцбург" #: contrib/localflavor/at/at_states.py:10 msgid "Styria" -msgstr "" +msgstr "Стирија" #: contrib/localflavor/at/at_states.py:11 msgid "Tyrol" -msgstr "" +msgstr "Тирол" #: contrib/localflavor/at/at_states.py:12 msgid "Vorarlberg" -msgstr "" +msgstr "Воралбер" #: contrib/localflavor/at/at_states.py:13 msgid "Vienna" -msgstr "" +msgstr "Беч" #: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16 #: contrib/localflavor/no/forms.py:12 msgid "Enter a zip code in the format XXXX." -msgstr "Унесите зип код у формату XXXX." +msgstr "Унесите поштански број у формату XXXX." #: contrib/localflavor/at/forms.py:48 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format." msgstr "" +"Унесите важећи аустријски број социјалног осигурања у формату XXXX XXXXXX." #: contrib/localflavor/au/forms.py:16 msgid "Enter a 4 digit post code." -msgstr "" +msgstr "Унесите четвороцифрени поштански број" #: contrib/localflavor/br/forms.py:21 msgid "Enter a zip code in the format XXXXX-XXX." -msgstr "Унесите зип код у формату XXXXX-XXX." +msgstr "Унесите поштански број у формату XXXXX-XXX." -# nesh: tel. brojevi su u američkom formatu, ovo se ionako neće koristiti u i18n delu #: contrib/localflavor/br/forms.py:30 msgid "Phone numbers must be in XX-XXXX-XXXX format." -msgstr "" -"Телефонски бројеви морају бити у формату XXX-XXX-XXXX." +msgstr "Број телефона мора бити у формату XX-XXXX-XXXX." #: contrib/localflavor/br/forms.py:58 msgid "" "Select a valid brazilian state. That state is not one of the available " "states." -msgstr "" +msgstr "Одаберите постојећу бразилску државу. Та држава није међу понуђенима." #: contrib/localflavor/br/forms.py:94 msgid "Invalid CPF number." -msgstr "" +msgstr "Неважећи CPF број" #: contrib/localflavor/br/forms.py:95 msgid "This field requires at most 11 digits or 14 characters." @@ -1888,11 +2001,11 @@ msgstr "" #: contrib/localflavor/br/forms.py:136 msgid "This field requires at least 14 digits" -msgstr "У ово поље морате унети бар 14 цифара" +msgstr "" #: contrib/localflavor/ca/forms.py:17 msgid "Enter a postal code in the format XXX XXX." -msgstr "Унесите поштански број у формату XXX XXX" +msgstr "" #: contrib/localflavor/ca/forms.py:88 msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." @@ -2000,7 +2113,7 @@ msgstr "" #: contrib/localflavor/ch/ch_states.py:30 msgid "Zurich" -msgstr "Cirih" +msgstr "" #: contrib/localflavor/ch/forms.py:64 msgid "" @@ -2020,6 +2133,82 @@ msgstr "" msgid "The Chilean RUT is not valid." msgstr "" +#: contrib/localflavor/cz/cz_regions.py:8 +msgid "Prague" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:9 +msgid "Central Bohemian Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:10 +msgid "South Bohemian Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:11 +msgid "Pilsen Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:12 +msgid "Carlsbad Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:13 +msgid "Usti Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:14 +msgid "Liberec Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:15 +msgid "Hradec Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:16 +msgid "Pardubice Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:17 +msgid "Vysocina Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:18 +msgid "South Moravian Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:19 +msgid "Olomouc Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:20 +msgid "Zlin Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:21 +msgid "Moravian-Silesian Region" +msgstr "" + +#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "" + +#: contrib/localflavor/cz/forms.py:47 +msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." +msgstr "" + +#: contrib/localflavor/cz/forms.py:48 +msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" +msgstr "" + +#: contrib/localflavor/cz/forms.py:49 +msgid "Enter a valid birth number." +msgstr "" + +#: contrib/localflavor/cz/forms.py:106 +msgid "Enter a valid IC number." +msgstr "" + #: contrib/localflavor/de/de_states.py:5 msgid "Baden-Wuerttemberg" msgstr "" @@ -2030,7 +2219,7 @@ msgstr "" #: contrib/localflavor/de/de_states.py:7 msgid "Berlin" -msgstr "Берлин" +msgstr "" #: contrib/localflavor/de/de_states.py:8 msgid "Brandenburg" @@ -2038,11 +2227,11 @@ msgstr "" #: contrib/localflavor/de/de_states.py:9 msgid "Bremen" -msgstr "Бремен" +msgstr "" #: contrib/localflavor/de/de_states.py:10 msgid "Hamburg" -msgstr "Хамбург" +msgstr "" #: contrib/localflavor/de/de_states.py:11 msgid "Hessen" @@ -2087,7 +2276,7 @@ msgstr "" #: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 #: contrib/localflavor/fr/forms.py:15 msgid "Enter a zip code in the format XXXXX." -msgstr "Унесите зип код у формату XXXXX." +msgstr "" #: contrib/localflavor/de/forms.py:41 msgid "" @@ -2340,7 +2529,7 @@ msgstr "" #: contrib/localflavor/es/es_regions.py:14 msgid "Catalonia" -msgstr "Каталонија" +msgstr "" #: contrib/localflavor/es/es_regions.py:15 msgid "Extremadura" @@ -2403,11 +2592,11 @@ msgstr "" #: contrib/localflavor/fi/forms.py:28 msgid "Enter a valid Finnish social security number." -msgstr "Унесите исправан фински број социјалног осигурања." +msgstr "" #: contrib/localflavor/in_/forms.py:14 msgid "Enter a zip code in the format XXXXXXX." -msgstr "Унесите зип код у формату XXXXXXX." +msgstr "" #: contrib/localflavor/is_/forms.py:17 msgid "" @@ -2420,11 +2609,11 @@ msgstr "" #: contrib/localflavor/it/forms.py:14 msgid "Enter a valid zip code." -msgstr "Унесите исправан зип код." +msgstr "" #: contrib/localflavor/it/forms.py:43 msgid "Enter a valid Social Security number." -msgstr "Унесите исправан број социјалног осигурања." +msgstr "" #: contrib/localflavor/it/forms.py:68 msgid "Enter a valid VAT number." @@ -2752,11 +2941,11 @@ msgstr "" #: contrib/localflavor/nl/forms.py:21 msgid "Enter a valid postal code" -msgstr "Унесите исправан поштански број." +msgstr "" #: contrib/localflavor/nl/forms.py:52 msgid "Enter a valid phone number" -msgstr "Унесите исправан број телефона." +msgstr "" #: contrib/localflavor/nl/forms.py:78 msgid "Enter a valid SoFi number" @@ -2812,15 +3001,15 @@ msgstr "" #: contrib/localflavor/no/forms.py:33 msgid "Enter a valid Norwegian social security number." -msgstr "Унесите исправан норвешки број социјалног осигурања." +msgstr "" #: contrib/localflavor/pe/forms.py:24 msgid "This field requires 8 digits." -msgstr "У ово поље морате уписати 8 цифара." +msgstr "" #: contrib/localflavor/pe/forms.py:52 msgid "This field requires 11 digits." -msgstr "У ово поље морате уписати 11 цифара ." +msgstr "" #: contrib/localflavor/pl/forms.py:38 msgid "National Identification Number consists of 11 digits." @@ -2839,15 +3028,15 @@ msgstr "" msgid "Wrong checksum for the Tax Number (NIP)." msgstr "" -#: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." msgstr "" -#: contrib/localflavor/pl/forms.py:112 +#: contrib/localflavor/pl/forms.py:110 msgid "Wrong checksum for the National Business Register Number (REGON)." msgstr "" -#: contrib/localflavor/pl/forms.py:155 +#: contrib/localflavor/pl/forms.py:148 msgid "Enter a postal code in the format XX-XXX." msgstr "" @@ -2869,7 +3058,7 @@ msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:12 msgid "Lodz" -msgstr "Лођ" +msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:13 msgid "Lesser Poland" @@ -2927,19 +3116,13 @@ msgstr "" msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format" msgstr "" -# nesh: tel. brojevi su u američkom formatu, ovo se ionako neće koristiti u i18n delu #: contrib/localflavor/ro/forms.py:171 msgid "Phone numbers must be in XXXX-XXXXXX format." msgstr "" -"Телефонски бројеви морају бити у формату XXXX-XXXXXX." #: contrib/localflavor/ro/forms.py:194 msgid "Enter a valid postal code in the format XXXXXX" -msgstr "Унесите исправан поштански број у формату XXXXXX" - -#: contrib/localflavor/sk/forms.py:30 -msgid "Enter a postal code in the format XXXXX or XXX XX." -msgstr "Унесите поштански број у формату XXXXX или XXX XX." +msgstr "" #: contrib/localflavor/sk/sk_districts.py:8 msgid "Banska Bystrica" @@ -3291,7 +3474,7 @@ msgstr "" #: contrib/localflavor/uk/forms.py:21 msgid "Enter a valid postcode." -msgstr "Унесите исправан поштански број." +msgstr "" #: contrib/localflavor/uk/uk_regions.py:11 msgid "Bedfordshire" @@ -3575,7 +3758,7 @@ msgstr "" #: contrib/localflavor/us/forms.py:16 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." -msgstr "Унесите зип код у формату XXXXX или XXXXX-XXXX." +msgstr "" #: contrib/localflavor/us/forms.py:54 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." @@ -3627,14 +3810,15 @@ msgstr "" #: contrib/redirects/models.py:7 msgid "redirect from" -msgstr "преусмери од" +msgstr "преусмерен са" #: contrib/redirects/models.py:8 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -"Унесите апсолутну путању без назива домена. Пример: '/dogadjaji/pretraga/'." +"Ово мора бити апсолутна путања без имена домена. На пример: '/events/" +"search/'." #: contrib/redirects/models.py:9 msgid "redirect to" @@ -3645,7 +3829,7 @@ msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -"Може бити апсолутна путања (као горе) или потпун URL који почиње са " +"Ово може бити или апсолутна путања (као горе) или пун URL који почиње са " "'http://'." #: contrib/redirects/models.py:13 @@ -3666,7 +3850,7 @@ msgstr "подаци сесије" #: contrib/sessions/models.py:48 msgid "expire date" -msgstr "датум престанка важења сесије" +msgstr "датум застаревања" #: contrib/sessions/models.py:53 msgid "session" @@ -3678,74 +3862,80 @@ msgstr "сесије" #: contrib/sites/models.py:32 msgid "domain name" -msgstr "назив домена" +msgstr "име домена" #: contrib/sites/models.py:33 msgid "display name" -msgstr "назив" +msgstr "приказано име" #: contrib/sites/models.py:39 msgid "sites" msgstr "сајтови" -#: db/models/fields/__init__.py:348 db/models/fields/__init__.py:683 +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 msgid "This value must be an integer." -msgstr "Вредност мора бити цео број." +msgstr "Ова вредност мора бити целобројна." -#: db/models/fields/__init__.py:379 +#: db/models/fields/__init__.py:388 msgid "This value must be either True or False." -msgstr "Вредност мора бити True или False." +msgstr "Ова вредност мора бити True или False." -#: db/models/fields/__init__.py:412 +#: db/models/fields/__init__.py:427 msgid "This field cannot be null." -msgstr "Поље не може садржати празну вредност." +msgstr "Ово поље не може остати празно." -#: db/models/fields/__init__.py:428 +#: db/models/fields/__init__.py:443 msgid "Enter only digits separated by commas." -msgstr "Унесите бројеве раздвојене запетама." +msgstr "Унесите само бројке раздвојене запетама." -#: db/models/fields/__init__.py:459 +#: db/models/fields/__init__.py:474 msgid "Enter a valid date in YYYY-MM-DD format." -msgstr "Унесите исправан датум у YYYY-MM-DD формату." +msgstr "Унесите исправан датум у формату ГГГГ-ММ-ДД." -#: db/models/fields/__init__.py:468 +#: db/models/fields/__init__.py:483 #, python-format msgid "Invalid date: %s" msgstr "Неисправан датум: %s" -#: db/models/fields/__init__.py:532 db/models/fields/__init__.py:550 +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format." -msgstr "" -"Унесите исправан датум и време у YYYY-MM-DD HH:MM[ss[.uuuuuu]] формату." +msgstr "Унесите исправан датум/време у формату ГГГГ-ММ-ДД ЧЧ:ММ[:сс[.уууууу]." -#: db/models/fields/__init__.py:586 +#: db/models/fields/__init__.py:601 msgid "This value must be a decimal number." -msgstr "Вредност мора бити децимални број." +msgstr "Ова вредност мора бити децимални број" -#: db/models/fields/__init__.py:719 +#: db/models/fields/__init__.py:686 +msgid "This value must be a float." +msgstr "Ова вредност мора бити број са клизећом запетом" + +#: db/models/fields/__init__.py:746 msgid "This value must be either None, True or False." -msgstr "Вредност мора бити None, True или False." +msgstr "Ова вредност мора бити или None, или True, или False." -#: db/models/fields/__init__.py:817 db/models/fields/__init__.py:831 +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." -msgstr "Унесите исправно време у HH:MM[:ss[.uuuuuu]] формату." +msgstr "Унесите исправно време у формату ЧЧ:ММ[:сс[.уууууу]]." -#: db/models/fields/related.py:761 +#: db/models/fields/related.py:792 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" -"Користите „Ctrl“ (PC) или „Јабуку“ (Мек) да бисте селектовали више " -"ставки." +"Држите „Control“, или „Command“ на Mac-у да бисте обележили више од једне " +"ставке." -#: db/models/fields/related.py:838 +#: db/models/fields/related.py:870 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." +msgid_plural "" "Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr "Унесите исправне %(self)s ID вредности. Вредност %(value)r је неисправна." +msgstr[0] "Унесите исправан %(self)s IDs. Вредност %(value)r је неисправна." +msgstr[1] "Унесите исправан %(self)s IDs. Вредности %(value)r су неисправне." +msgstr[2] "Унесите исправан %(self)s IDs. Вредности %(value)r су неисправне." #: forms/fields.py:54 msgid "This field is required." -msgstr "Обавезно поље." +msgstr "Ово поље се мора попунити." #: forms/fields.py:55 msgid "Enter a valid value." @@ -3754,12 +3944,16 @@ msgstr "Унесите исправну вредност." #: forms/fields.py:138 #, python-format msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." -msgstr "Проверите дужину, максимум је %(max)d карактера (добијено %(length)d)." +msgstr "" +"Ово поље мора садржати највише %(max)d словних места (тренутно има %(length)" +"d)." #: forms/fields.py:139 #, python-format msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." -msgstr "Проверите дужину, минимум је %(min)d карактера (добијено %(length)d)." +msgstr "" +"Ово поље мора садржати најмање %(min)d словних места (тренутно има %(length)" +"d." #: forms/fields.py:166 msgid "Enter a whole number." @@ -3768,12 +3962,12 @@ msgstr "Унесите цео број." #: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225 #, python-format msgid "Ensure this value is less than or equal to %s." -msgstr "Вредност мора бити мања или једнака од %s." +msgstr "Ова вредност мора да буде мања од %s или тачно толико." #: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226 #, python-format msgid "Ensure this value is greater than or equal to %s." -msgstr "Проверите да ли је вредност већа или једнака од %s." +msgstr "Ова вредност мора бити већа од %s или тачно толико." #: forms/fields.py:195 forms/fields.py:224 msgid "Enter a number." @@ -3782,105 +3976,148 @@ msgstr "Унесите број." #: forms/fields.py:227 #, python-format msgid "Ensure that there are no more than %s digits in total." -msgstr "Проверите да нема више од %s цифара." +msgstr "Не сме бити укупно више од %s цифара. Проверите." #: forms/fields.py:228 #, python-format msgid "Ensure that there are no more than %s decimal places." -msgstr "Проверите да нема више од %s децималних места." +msgstr "Не сме бити укупно више од %s децималних места. Проверите." #: forms/fields.py:229 #, python-format msgid "Ensure that there are no more than %s digits before the decimal point." -msgstr "Проверите да нема више од %s цифара у целом делу." +msgstr "Не сме бити укупно више од %s цифара пре запете. Проверите." -#: forms/fields.py:287 forms/fields.py:849 +#: forms/fields.py:288 forms/fields.py:863 msgid "Enter a valid date." msgstr "Унесите исправан датум." -#: forms/fields.py:321 forms/fields.py:850 +#: forms/fields.py:322 forms/fields.py:864 msgid "Enter a valid time." -msgstr "Унесите исправно време." +msgstr "Унесите исправно време" -#: forms/fields.py:360 +#: forms/fields.py:361 msgid "Enter a valid date/time." -msgstr "Унесите исправан датум и време." - -#: forms/fields.py:446 -msgid "No file was submitted. Check the encoding type on the form." -msgstr "Фајл није послат, проверите тип енкодирања формулара." +msgstr "Унесите исправан датум/време." #: forms/fields.py:447 -msgid "No file was submitted." -msgstr "Фајл није послат." +msgid "No file was submitted. Check the encoding type on the form." +msgstr "Фајл није пребачен. Проверите тип енкодирања формулара." #: forms/fields.py:448 -msgid "The submitted file is empty." -msgstr "Послати фајл је празан." +msgid "No file was submitted." +msgstr "Фајл није пребачен." -#: forms/fields.py:477 +#: forms/fields.py:449 +msgid "The submitted file is empty." +msgstr "Пребачен фајл је празан." + +#: forms/fields.py:450 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "" +"Назив фајла мора да садржи бар %(max)d словних места (тренутно има %(length)" +"d)." + +#: forms/fields.py:483 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -"Пошаљите исправну слику. Фајл који сте послали или није слика или је сам " -"фајл оштећен." +"Пребаците исправан фајл. Фајл који је пребачен или није слика, или је " +"оштећен." -#: forms/fields.py:538 +#: forms/fields.py:544 msgid "Enter a valid URL." msgstr "Унесите исправан URL." -#: forms/fields.py:539 +#: forms/fields.py:545 msgid "This URL appears to be a broken link." -msgstr "Овај URL је неисправан линк." +msgstr "Овај URL изгледа не води никуда." -#: forms/fields.py:618 forms/fields.py:696 +#: forms/fields.py:625 forms/fields.py:703 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "Изаберите исправну опцију. %(value)s није међу њима." +msgstr "" +"%(value)s није међу понуђеним вредностима. Одаберите једну од понуђених." -#: forms/fields.py:697 forms/fields.py:758 forms/models.py:714 +#: forms/fields.py:704 forms/fields.py:765 forms/models.py:962 msgid "Enter a list of values." msgstr "Унесите листу вредности." -#: forms/fields.py:878 +#: forms/fields.py:892 msgid "Enter a valid IPv4 address." -msgstr "Унесите IPv4 адресу." +msgstr "Унесите исправну IPv4 адресу." -#: forms/fields.py:888 +#: forms/fields.py:902 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -"Ово поље може садржати само слова, бројеве, доњу црту „_“, црту „-“ и косе " -"црте." +"Унесите исрпаван „слаг“, који се састоји од слова, бројки, доњих црта или " +"циртица." -#: forms/formsets.py:242 forms/formsets.py:244 +#: forms/formsets.py:271 forms/formsets.py:273 msgid "Order" msgstr "Редослед" -#: forms/models.py:281 forms/models.py:290 +#: forms/models.py:367 +#, python-format +msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." +msgstr "%(field_name)s мора да буде јединствен за %(date_field)s %(lookup)s." + +#: forms/models.py:381 forms/models.py:389 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." -msgstr "%(model_name)s са овим %(field_label)s већ постоји." +msgstr "%(model_name)s са овом вредношћу %(field_label)s већ постоји." #: forms/models.py:581 -msgid "The inline foreign key did not match the parent instance primary key." +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Исправите дуплиран садржај за поља: %(field)s." + +#: forms/models.py:585 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." msgstr "" +"Исправите дуплиран садржај за поља: %(field)s, који мора да буде јединствен." -#: forms/models.py:644 +#: forms/models.py:591 +#, 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:599 +msgid "Please correct the duplicate values below." +msgstr "Исправите дуплиране вредности доле." + +#: forms/models.py:837 +msgid "The inline foreign key did not match the parent instance primary key." +msgstr "Страни кључ се није поклопио са инстанцом родитељског кључа." + +#: forms/models.py:892 msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "Изаберите исправна опцију. Изабрана опција није исправна." +msgstr "Одабрана вредност није међу понуђенима. Одаберите једну од понуђених." -#: forms/models.py:715 +#: forms/models.py:963 #, python-format msgid "Select a valid choice. %s is not one of the available choices." -msgstr "Изаберите исправну опцију. Опција %s није исправна." +msgstr "%s није међу понуђеним вредностима. Одаберите једну од понуђених." -#: template/defaultfilters.py:743 +#: forms/models.py:965 +#, python-format +msgid "\"%s\" is not a valid value for a primary key." +msgstr "„%s“ није исправна вредност за примарни кључ." + +#: template/defaultfilters.py:767 msgid "yes,no,maybe" msgstr "да,не,можда" -#: template/defaultfilters.py:774 +#: template/defaultfilters.py:798 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" @@ -3888,42 +4125,42 @@ msgstr[0] "%(size)d бајт" msgstr[1] "%(size)d бајта" msgstr[2] "%(size)d бајтова" -#: template/defaultfilters.py:776 +#: template/defaultfilters.py:800 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:778 +#: template/defaultfilters.py:802 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:779 +#: template/defaultfilters.py:803 #, python-format msgid "%.1f GB" msgstr "%.1f GB" -#: utils/dateformat.py:41 -msgid "p.m." -msgstr "поподне" - #: utils/dateformat.py:42 -msgid "a.m." -msgstr "преподне" +msgid "p.m." +msgstr "по п." -#: utils/dateformat.py:47 -msgid "PM" -msgstr "поподне" +#: utils/dateformat.py:43 +msgid "a.m." +msgstr "пре п." #: utils/dateformat.py:48 -msgid "AM" -msgstr "преподне" +msgid "PM" +msgstr "PM" -#: utils/dateformat.py:97 +#: utils/dateformat.py:49 +msgid "AM" +msgstr "AM" + +#: utils/dateformat.py:98 msgid "midnight" msgstr "поноћ" -#: utils/dateformat.py:99 +#: utils/dateformat.py:100 msgid "noon" msgstr "подне" @@ -3957,31 +4194,31 @@ msgstr "недеља" #: utils/dates.py:10 msgid "Mon" -msgstr "пон" +msgstr "пон." #: utils/dates.py:10 msgid "Tue" -msgstr "уто" +msgstr "уто." #: utils/dates.py:10 msgid "Wed" -msgstr "сре" +msgstr "сре." #: utils/dates.py:10 msgid "Thu" -msgstr "чет" +msgstr "чет." #: utils/dates.py:10 msgid "Fri" -msgstr "пет" +msgstr "пет." #: utils/dates.py:11 msgid "Sat" -msgstr "суб" +msgstr "суб." #: utils/dates.py:11 msgid "Sun" -msgstr "нед" +msgstr "нед." #: utils/dates.py:18 msgid "January" @@ -4033,51 +4270,51 @@ msgstr "децембар" #: utils/dates.py:23 msgid "jan" -msgstr "јан" +msgstr "јан." #: utils/dates.py:23 msgid "feb" -msgstr "феб" +msgstr "феб." #: utils/dates.py:23 msgid "mar" -msgstr "мар" +msgstr "мар." #: utils/dates.py:23 msgid "apr" -msgstr "апр" +msgstr "апр." #: utils/dates.py:23 msgid "may" -msgstr "мај" +msgstr "мај." #: utils/dates.py:23 msgid "jun" -msgstr "јун" +msgstr "јун." #: utils/dates.py:24 msgid "jul" -msgstr "јул" +msgstr "јул." #: utils/dates.py:24 msgid "aug" -msgstr "авг" +msgstr "ауг." #: utils/dates.py:24 msgid "sep" -msgstr "сеп" +msgstr "сеп." #: utils/dates.py:24 msgid "oct" -msgstr "окт" +msgstr "окт." #: utils/dates.py:24 msgid "nov" -msgstr "нов" +msgstr "нов." #: utils/dates.py:24 msgid "dec" -msgstr "дец" +msgstr "дец." #: utils/dates.py:31 msgid "Jan." @@ -4085,11 +4322,11 @@ msgstr "јан." #: utils/dates.py:31 msgid "Feb." -msgstr "феб." +msgstr "беб." #: utils/dates.py:32 msgid "Aug." -msgstr "авг." +msgstr "ауг." #: utils/dates.py:32 msgid "Sept." @@ -4150,38 +4387,38 @@ msgstr[2] "сати" msgid "minute" msgid_plural "minutes" msgstr[0] "минут" -msgstr[1] "мунута" +msgstr[1] "минута" msgstr[2] "минута" -#: utils/timesince.py:43 +#: utils/timesince.py:45 msgid "minutes" msgstr "минута" -#: utils/timesince.py:48 +#: utils/timesince.py:50 #, python-format msgid "%(number)d %(type)s" -msgstr "%(type)s: %(number)d" +msgstr "%(number)d %(type)s" -#: utils/timesince.py:54 +#: utils/timesince.py:56 #, python-format msgid ", %(number)d %(type)s" -msgstr ", %(type)s: %(number)d" +msgstr ", %(number)d %(type)s" -#: utils/translation/trans_real.py:403 +#: utils/translation/trans_real.py:399 msgid "DATE_FORMAT" -msgstr "D, d.m.Y." +msgstr "j. N Y." -#: utils/translation/trans_real.py:405 +#: utils/translation/trans_real.py:401 msgid "TIME_FORMAT" -msgstr "H:i:s" +msgstr "G:i" -#: utils/translation/trans_real.py:421 +#: utils/translation/trans_real.py:417 msgid "YEAR_MONTH_FORMAT" -msgstr "m.Y." +msgstr "F Y." -#: utils/translation/trans_real.py:422 +#: utils/translation/trans_real.py:418 msgid "MONTH_DAY_FORMAT" -msgstr "d.m." +msgstr "j. F" #: views/generic/create_update.py:114 #, python-format @@ -4191,342 +4428,9 @@ msgstr "%(verbose_name)s је успешно креиран." #: views/generic/create_update.py:156 #, python-format msgid "The %(verbose_name)s was updated successfully." -msgstr "%(verbose_name)s је успешно промењен." +msgstr "%(verbose_name)s је успешно ажуриран." #: views/generic/create_update.py:198 #, python-format msgid "The %(verbose_name)s was deleted." msgstr "%(verbose_name)s је обрисан." - -#~ msgid "DATE_WITH_TIME_FULL" -#~ msgstr "j. N Y, H:i" -#~ msgid "Your new password is: %(new_password)s" -#~ msgstr "Ваша нова лозинка је: %(new_password)s" -#~ msgid "Feel free to change this password by going to this page:" -#~ msgstr "Лозинку можете изменити на следећој страни:" -#~ msgid "headline" -#~ msgstr "наслов" -#~ msgid "rating #1" -#~ msgstr "оцена #1" -#~ msgid "rating #2" -#~ msgstr "оцена #2" -#~ msgid "rating #3" -#~ msgstr "оцена #3" -#~ msgid "rating #4" -#~ msgstr "оцена #4" -#~ msgid "rating #5" -#~ msgstr "оцена #5" -#~ msgid "rating #6" -#~ msgstr "оцена #6" -#~ msgid "rating #7" -#~ msgstr "оцена #7" -#~ msgid "rating #8" -#~ msgstr "оцена #8" -#~ msgid "is valid rating" -#~ msgstr "да ли је оцена валидна" -#~ msgid "comments" -#~ msgstr "коментари" -#~ msgid "Content object" -#~ msgstr "Објекат са садржајем" -#~ msgid "person's name" -#~ msgstr "име" -#~ msgid "ip address" -#~ msgstr "ip адреса" -#~ msgid "approved by staff" -#~ msgstr "одобрено од стране модератора" -#~ msgid "free comments" -#~ msgstr "слободни коментари" -#~ msgid "score" -#~ msgstr "резултат" -#~ msgid "score date" -#~ msgstr "датум резултата" -#~ msgid "karma score" -#~ msgstr "„карма“ резултат" -#~ msgid "karma scores" -#~ msgstr "„карма“ резултати" -#~ msgid "%(score)d rating by %(user)s" -#~ msgstr "Оцена %(score)d од стране %(user)s" -#~ msgid "" -#~ "This comment was flagged by %(user)s:\n" -#~ "\n" -#~ "%(text)s" -#~ msgstr "" -#~ "Овај коментар је означен од %(user)s:\n" -#~ "\n" -#~ "%(text)s" -#~ msgid "flag date" -#~ msgstr "датум означавања" -#~ msgid "user flag" -#~ msgstr "корисничка ознака" -#~ msgid "user flags" -#~ msgstr "корисничке ознаке" -#~ msgid "Flag by %r" -#~ msgstr "%r је означио" -#~ msgid "deletion date" -#~ msgstr "датум брисања" -#~ msgid "moderator deletion" -#~ msgstr "брисање од стране модератора" -#~ msgid "moderator deletions" -#~ msgstr "брисања од стране модератора" -#~ msgid "Moderator deletion by %r" -#~ msgstr "Обрисао модератор %r" -#~ msgid "Forgotten your password?" -#~ msgstr "Заборавили сте лозинку?" -#~ msgid "Ratings" -#~ msgstr "Оцене" -#~ msgid "Required" -#~ msgstr "Обавезан унос" -#~ msgid "Optional" -#~ msgstr "Опциони унос" -#~ msgid "Post a photo" -#~ msgstr "Пошаљите слику" -#~ msgid "Comment:" -#~ msgstr "Коментар:" -#~ msgid "Your name:" -#~ msgstr "Ваше име:" -# nesh: grrrrr, ala je rogobatno -# petar: malo sam ga izmenio da bude jasniji -#~ msgid "" -#~ "This rating is required because you've entered at least one other rating." -#~ msgstr "Ова оцена је обавезна пошто сте унели бар једну оцену." -#~ msgid "" -#~ "This comment was posted by a user who has posted fewer than %(count)s " -#~ "comment:\n" -#~ "\n" -#~ "%(text)s" -#~ msgid_plural "" -#~ "This comment was posted by a user who has posted fewer than %(count)s " -#~ "comments:\n" -#~ "\n" -#~ "%(text)s" -#~ msgstr[0] "" -#~ "Овај коментар је послат од корисника који је послао мање од %(count)s " -#~ "коментара:\n" -#~ "\n" -#~ "%(text)s" -#~ msgstr[1] "" -#~ "Овај коментар је послат од корисника који је послао мање од %(count)s " -#~ "коментара:\n" -#~ "\n" -#~ "%(text)s" -#~ msgstr[2] "" -#~ "Овај коментар је послат од корисника који је послао мање од %(count)s " -#~ "коментара:\n" -#~ "\n" -#~ "%(text)s" -#~ msgid "Only POSTs are allowed" -#~ msgstr "Једино је POST дозвољен" -#~ msgid "One or more of the required fields wasn't submitted" -#~ msgstr "Једно или више обавезних поља није послато" -#~ msgid "Somebody tampered with the comment form (security violation)" -#~ msgstr "Неко је мењао форму за коментаре (повреда сигурности)" -#~ msgid "" -#~ "The comment form had an invalid 'target' parameter -- the object ID was " -#~ "invalid" -#~ msgstr "" -#~ "Форма коментара има неисправни „target“ параметар -- ID објекта је " -#~ "неисправан" -#~ msgid "The comment form didn't provide either 'preview' or 'post'" -#~ msgstr "Овај коментар није користио ни „preview“ ни „post“" -#~ msgid "Anonymous users cannot vote" -#~ msgstr "Анонимни корисници не могу да гласају" -#~ msgid "No voting for yourself" -#~ msgstr "Не можете гласати сами за себе" -#~ msgid "Uppercase letters are not allowed here." -#~ msgstr "Велика слова нису дозвољена." -#~ msgid "Lowercase letters are not allowed here." -#~ msgstr "Мала слова нису дозвољена." -#~ msgid "Enter valid e-mail addresses separated by commas." -#~ msgstr "Унесите исправне адресе електронске поште раздвојене зарезима." -#~ msgid "Please enter a valid IP address." -#~ msgstr "Унесите исправну IP адресу." -#~ msgid "Empty values are not allowed here." -#~ msgstr "Празне вредности нису дозвољене." -#~ msgid "Non-numeric characters aren't allowed here." -#~ msgstr "Овде можете унети само бројеве." -#~ msgid "This value can't be comprised solely of digits." -#~ msgstr "Податак се не може састојати само од бројева." -#~ msgid "Only alphabetical characters are allowed here." -#~ msgstr "Овде можете користити само слова." -#~ msgid "Enter a valid time in HH:MM format." -#~ msgstr "Унесите исправно време у HH:MM формату." -#~ msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -#~ msgstr "Унесите исправан датум и време у YYYY-MM-DD HH:MM формату." -#~ msgid "The URL %s does not point to a valid image." -#~ msgstr "URL %s не показује на исправну слику" -# nesh: tel. brojevi su u američkom formatu, ovo se ionako neće koristiti u i18n delu -#~ msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -#~ msgstr "" -#~ "Телефонски бројеви морају бити у формату XXX-XXX-XXXX. \"%s\" је " -#~ "неисправан." -#~ msgid "The URL %s does not point to a valid QuickTime video." -#~ msgstr "URL %s не показује на исправан QuickTime видео фајл." -#~ msgid "A valid URL is required." -#~ msgstr "Унесите исправан URL." -#~ msgid "" -#~ "Valid HTML is required. Specific errors are:\n" -#~ "%s" -#~ msgstr "" -#~ "Унесите исправан HTML. Грешке су:\n" -#~ "%s" -#~ msgid "Badly formed XML: %s" -#~ msgstr "Неисправан XML: %s" -#~ msgid "Invalid URL: %s" -#~ msgstr "Неисправан URL: %s" -#~ msgid "The URL %s is a broken link." -#~ msgstr "URL %s је неисправан линк." -# nesh: Ni ovo nije interesantno za i18n -#~ msgid "Enter a valid U.S. state abbreviation." -#~ msgstr "Унесите исправну скраћеницу за U.S. државу." -#~ msgid "This field must match the '%s' field." -#~ msgstr "Ово поље мора бити једнако са пољем '%s'." -#~ msgid "Please enter something for at least one field." -#~ msgstr "Морате попунити барем једно поље." -#~ msgid "Please enter both fields or leave them both empty." -#~ msgstr "Попуните оба поља или оба оставите празна." -#~ msgid "This field must be given if %(field)s is %(value)s" -#~ msgstr "" -#~ "Ово поље мора бити унето ако поље %(field)s има вредност %(value)s" -#~ msgid "This field must be given if %(field)s is not %(value)s" -#~ msgstr "" -#~ "Ово поље мора бити унето ако поље %(field)s нема вредност %(value)s" -#~ msgid "Duplicate values are not allowed." -#~ msgstr "Дупле вредности нису дозвољене." -#~ msgid "This value must be between %(lower)s and %(upper)s." -#~ msgstr "Вредност мора бити између %(lower)s и %(upper)s." -#~ msgid "This value must be at least %s." -#~ msgstr "Вредност мора бити најмање %s." -#~ msgid "This value must be no more than %s." -#~ msgstr "Вредност не сме бити већа од %s." -#~ msgid "This value must be a power of %s." -#~ msgstr "Вредност мора бити степена %s." -#~ msgid "Please enter a valid decimal number." -#~ msgstr "Унесите исправан децимални број." -#~ msgid "Please enter a valid decimal number with at most %s total digit." -#~ msgid_plural "" -#~ "Please enter a valid decimal number with at most %s total digits." -#~ msgstr[0] "Унесите исправан децимални број са %s цифром." -#~ msgstr[1] "Унесите исправан децимални број са %s цифре." -#~ msgstr[2] "Унесите исправан децимални број са %s цифара." -#~ msgid "" -#~ "Please enter a valid decimal number with a whole part of at most %s digit." -#~ msgid_plural "" -#~ "Please enter a valid decimal number with a whole part of at most %s " -#~ "digits." -#~ msgstr[0] "" -#~ "Унесите исправан децимални број са целим делом од највише %s цифре." -#~ msgstr[1] "" -#~ "Унесите исправан децимални број са целим делом од највише %s цифре." -#~ msgstr[2] "" -#~ "Унесите исправан децимални број са целим делом од највише %s цифара." -#~ msgid "Please enter a valid decimal number with at most %s decimal place." -#~ msgid_plural "" -#~ "Please enter a valid decimal number with at most %s decimal places." -#~ msgstr[0] "Унесите децимални број са највише %s децималним местом." -#~ msgstr[1] "Унесите децимални број са највише %s децимална места." -#~ msgstr[2] "Унесите децимални број са највише %s децималних места." -#~ msgid "Please enter a valid floating point number." -#~ msgstr "Унесите исправан децимални број." -#~ msgid "Make sure your uploaded file is at least %s bytes big." -#~ msgstr "Величина фајла мора бити најмање %s бајтова." -#~ msgid "Make sure your uploaded file is at most %s bytes big." -#~ msgstr "Величина фајла мора бити највише %s бајтова." -#~ msgid "The format for this field is wrong." -#~ msgstr "Погрешан формат поља." -#~ msgid "This field is invalid." -#~ msgstr "Неисправно поље." -#~ msgid "Could not retrieve anything from %s." -#~ msgstr "Ништа није могло да се преузме са URL-a %s." -#~ msgid "" -#~ "The URL %(url)s returned the invalid Content-Type header '%(contenttype)" -#~ "s'." -#~ msgstr "" -#~ "Са URL-a %(url)s се вратио погрешан Content-Type header '%(contenttype)s'." -#~ msgid "" -#~ "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts " -#~ "with \"%(start)s\".)" -#~ msgstr "" -#~ "Затворите незатворен таг „%(tag)s“ из реда %(line)s. (Ред почиње са „%" -#~ "(start)s“.)" -#~ msgid "" -#~ "Some text starting on line %(line)s is not allowed in that context. (Line " -#~ "starts with \"%(start)s\".)" -#~ msgstr "" -#~ "Текст који почиње у реду %(line)s није дозвољен у овом контексту. (Ред " -#~ "почиње са „%(start)s“.)" -#~ msgid "" -#~ "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with " -#~ "\"%(start)s\".)" -#~ msgstr "" -#~ "Атрибут „%(attr)s“ у ред %(line)s је неисправан. (Ред почиње са „%" -#~ "(start)s“.)" -#~ msgid "" -#~ "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" -#~ "(start)s\".)" -#~ msgstr "" -#~ "Таг „<%(tag)s>“ у реду %(line)s је неисправан. (Ред почиње „%(start)s“.)" -#~ msgid "" -#~ "A tag on line %(line)s is missing one or more required attributes. (Line " -#~ "starts with \"%(start)s\".)" -#~ msgstr "" -#~ "Тагу у реду %(line)s недостаје један или више атрибута. (Ред почиње сa " -#~ "„%(start)s“.)" -#~ msgid "" -#~ "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " -#~ "starts with \"%(start)s\".)" -#~ msgstr "" -#~ "Атрибут „%(attr)s“ у реду %(line)s има неисправну вредност. (Ред " -#~ "почиње са „%(start)s“.)" -#~ msgid "" -#~ "%(object)s with this %(type)s already exists for the given %(field)s." -#~ msgstr "%(object)s са овим типом %(type)s већ постоји за поље %(field)s." -#~ msgid "Enter a valid filename." -#~ msgstr "Унесите исправно име фајла." -#~ msgid "Please enter a valid %s." -#~ msgstr "Унесите исправан %s." -#~ msgid "Ensure your text is less than %s character." -#~ msgid_plural "Ensure your text is less than %s characters." -#~ msgstr[0] "Текст мора имати мање од %s слова." -#~ msgstr[1] "Текст мора имати мање од %s слова." -#~ msgstr[2] "Текст мора имати мање од %s слова." -#~ msgid "Line breaks are not allowed here." -#~ msgstr "Нови редови овде нису дозвољени." -#~ msgid "Select a valid choice; „%(data)s“ is not in %(choices)s." -#~ msgstr "Изаберите ispravnu опцију: „%(data)s“ није у %(choices)s." -#~ msgid "Enter a whole number between -32,768 and 32,767." -#~ msgstr "Унесите цеo број између -32,768 и 32,767." -#~ msgid "Enter a positive number." -#~ msgstr "Унесите позитиван број." -#~ msgid "Enter a whole number between 0 and 32,767." -#~ msgstr "Унесите цеo број између 0 и 32,767." -#~ msgid "Added %s." -#~ msgstr "Додат %s" -#~ msgid "Deleted %s." -#~ msgstr "Обрисан %s." -#~ msgid "Have you forgotten your password?" -#~ msgstr "" -#~ "Да ли сте заборавили вашу лозинку??" -#~ msgid "Use '[algo]$[salt]$[hexdigest]'" -#~ msgstr "Користите '[algo]$[salt]$[hexdigest]'" -#~ msgid "Separate multiple IDs with commas." -#~ msgstr "Одвојите вишеструке ID вредности запетама." -#~ msgid "Comments" -#~ msgstr "Коментари" -#~ msgid "String (up to 50)" -#~ msgstr "Низ карактера (максимално 50 карактера)" -#~ msgid "label" -#~ msgstr "ознака" -#~ msgid "package" -#~ msgstr "пакет" -#~ msgid "packages" -#~ msgstr "пакети" -#~ msgid "Error in Template" -#~ msgstr "Грешка у шаблону" -#~ msgid "" -#~ "\n" -#~ "In template %(name)s, error at line %(line)s:\n" -#~ msgstr "" -#~ "\n" -#~ "У шаблону %(name)s, грешка у реду %(line)s:\n" -#~ msgid "count" -#~ msgstr "одброј" diff --git a/django/conf/locale/sr/LC_MESSAGES/djangojs.mo b/django/conf/locale/sr/LC_MESSAGES/djangojs.mo index 645c324c8b..f4ccb23ecc 100644 Binary files a/django/conf/locale/sr/LC_MESSAGES/djangojs.mo and b/django/conf/locale/sr/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/sr/LC_MESSAGES/djangojs.po b/django/conf/locale/sr/LC_MESSAGES/djangojs.po index dda1a7da84..8e11a0c302 100644 --- a/django/conf/locale/sr/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/sr/LC_MESSAGES/djangojs.po @@ -1,51 +1,50 @@ -# This file is distributed under the same license as the PACKAGE package. +# This file is distributed under the same license as the Django package. # msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-23 23:46+0100\n" -"PO-Revision-Date: 2008-07-29 12:53+0100\n" -"Last-Translator: Nebojsa Djordjevic \n" -"Language-Team: Nesh & Petar & Janos Guljas " +"POT-Creation-Date: 2009-03-30 14:00+0200\n" +"PO-Revision-Date: 2009-03-30 14:04+0200\n" +"Last-Translator: Janos Guljas \n" +"Language-Team: Branko Vukelic & Janos Guljas " +" & Nesh & Petar \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Country: YUGOSLAVIA\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Poedit-Language: Serbian\n" -"X-Poedit-SourceCharset: utf-8\n" #: contrib/admin/media/js/SelectFilter2.js:33 #, perl-format msgid "Available %s" -msgstr "Доступно %s" +msgstr "Доступни %s" #: contrib/admin/media/js/SelectFilter2.js:41 msgid "Choose all" -msgstr "Изаберите све" +msgstr "Додај све" #: contrib/admin/media/js/SelectFilter2.js:46 msgid "Add" -msgstr "Додајте" +msgstr "Додај" #: contrib/admin/media/js/SelectFilter2.js:48 msgid "Remove" -msgstr "Избаците" +msgstr "Уклони" #: contrib/admin/media/js/SelectFilter2.js:53 #, perl-format msgid "Chosen %s" -msgstr "Изабрано %s" +msgstr "Одабрани %s" #: contrib/admin/media/js/SelectFilter2.js:54 msgid "Select your choice(s) and click " -msgstr "Изаберите потребно и кликните" +msgstr "Направите избор и кликните " #: contrib/admin/media/js/SelectFilter2.js:59 msgid "Clear all" -msgstr "Обришите све" +msgstr "Врати све" #: contrib/admin/media/js/calendar.js:24 #: contrib/admin/media/js/dateparse.js:32 @@ -67,7 +66,7 @@ msgstr "недеља понедељак уторак среда четвртак #: contrib/admin/media/js/admin/CollapsedFieldsets.js:34 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:72 msgid "Show" -msgstr "Прикажи" +msgstr "Покажи" #: contrib/admin/media/js/admin/CollapsedFieldsets.js:63 msgid "Hide" @@ -76,7 +75,7 @@ msgstr "Сакриј" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:47 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 msgid "Now" -msgstr "Сада" +msgstr "Тренутно време" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:51 msgid "Clock" @@ -84,7 +83,7 @@ msgstr "Сат" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:78 msgid "Choose a time" -msgstr "Изаберите време" +msgstr "Одабир времена" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 msgid "Midnight" @@ -92,7 +91,7 @@ msgstr "Поноћ" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 msgid "6 a.m." -msgstr "6 сати" +msgstr "18ч" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:84 msgid "Noon" diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo b/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo new file mode 100644 index 0000000000..15f3af540e Binary files /dev/null and b/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/django.po b/django/conf/locale/sr_Latn/LC_MESSAGES/django.po new file mode 100644 index 0000000000..fd7ae5f869 --- /dev/null +++ b/django/conf/locale/sr_Latn/LC_MESSAGES/django.po @@ -0,0 +1,4436 @@ +# This file is distributed under the same license as the Django package. +# +msgid "" +msgstr "" +"Project-Id-Version: Django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-05-08 22:50+0200\n" +"PO-Revision-Date: 2009-04-01 18:38+0200\n" +"Last-Translator: Janos Guljas \n" +"Language-Team: Branko Vukelic & Janos Guljas " +" & Nesh & Petar \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: conf/global_settings.py:44 +msgid "Arabic" +msgstr "arapski" + +#: conf/global_settings.py:45 +msgid "Bengali" +msgstr "bengalski" + +#: conf/global_settings.py:46 +msgid "Bulgarian" +msgstr "bugarski" + +#: conf/global_settings.py:47 +msgid "Catalan" +msgstr "katalonski" + +#: conf/global_settings.py:48 +msgid "Czech" +msgstr "češki" + +#: conf/global_settings.py:49 +msgid "Welsh" +msgstr "velški" + +#: conf/global_settings.py:50 +msgid "Danish" +msgstr "danski" + +#: conf/global_settings.py:51 +msgid "German" +msgstr "nemački" + +#: conf/global_settings.py:52 +msgid "Greek" +msgstr "grčki" + +#: conf/global_settings.py:53 +msgid "English" +msgstr "engleski" + +#: conf/global_settings.py:54 +msgid "Spanish" +msgstr "španski" + +#: conf/global_settings.py:55 +msgid "Estonian" +msgstr "estonski" + +#: conf/global_settings.py:56 +msgid "Argentinean Spanish" +msgstr "argentinski španski" + +#: conf/global_settings.py:57 +msgid "Basque" +msgstr "baskijski" + +#: conf/global_settings.py:58 +msgid "Persian" +msgstr "persijski" + +#: conf/global_settings.py:59 +msgid "Finnish" +msgstr "finski" + +#: conf/global_settings.py:60 +msgid "French" +msgstr "francuski" + +#: conf/global_settings.py:61 +msgid "Irish" +msgstr "irski" + +#: conf/global_settings.py:62 +msgid "Galician" +msgstr "galski" + +#: conf/global_settings.py:63 +msgid "Hungarian" +msgstr "mađarski" + +#: conf/global_settings.py:64 +msgid "Hebrew" +msgstr "hebrejski" + +#: conf/global_settings.py:65 +msgid "Hindi" +msgstr "hindu" + +#: conf/global_settings.py:66 +msgid "Croatian" +msgstr "hrvatski" + +#: conf/global_settings.py:67 +msgid "Icelandic" +msgstr "islandski" + +#: conf/global_settings.py:68 +msgid "Italian" +msgstr "italijanski" + +#: conf/global_settings.py:69 +msgid "Japanese" +msgstr "japanski" + +#: conf/global_settings.py:70 +msgid "Georgian" +msgstr "gruzijski" + +#: conf/global_settings.py:71 +msgid "Korean" +msgstr "korejski" + +#: conf/global_settings.py:72 +msgid "Khmer" +msgstr "kambodijski" + +#: conf/global_settings.py:73 +msgid "Kannada" +msgstr "kanada" + +#: conf/global_settings.py:74 +msgid "Latvian" +msgstr "latvijski" + +#: conf/global_settings.py:75 +msgid "Lithuanian" +msgstr "litvanski" + +#: conf/global_settings.py:76 +msgid "Macedonian" +msgstr "makedonski" + +#: conf/global_settings.py:77 +msgid "Dutch" +msgstr "holandski" + +#: conf/global_settings.py:78 +msgid "Norwegian" +msgstr "norveški" + +#: conf/global_settings.py:79 +msgid "Polish" +msgstr "poljski" + +#: conf/global_settings.py:80 +msgid "Portuguese" +msgstr "portugalski" + +#: conf/global_settings.py:81 +msgid "Brazilian Portuguese" +msgstr "brazilski portugalski" + +#: conf/global_settings.py:82 +msgid "Romanian" +msgstr "rumunski" + +#: conf/global_settings.py:83 +msgid "Russian" +msgstr "ruski" + +#: conf/global_settings.py:84 +msgid "Slovak" +msgstr "slovački" + +#: conf/global_settings.py:85 +msgid "Slovenian" +msgstr "slovenački" + +#: conf/global_settings.py:86 +msgid "Serbian" +msgstr "srpski" + +#: conf/global_settings.py:87 +msgid "Swedish" +msgstr "švedski" + +#: conf/global_settings.py:88 +msgid "Tamil" +msgstr "tamilski" + +#: conf/global_settings.py:89 +msgid "Telugu" +msgstr "telugu" + +#: conf/global_settings.py:90 +msgid "Thai" +msgstr "tajlandski" + +#: conf/global_settings.py:91 +msgid "Turkish" +msgstr "turski" + +#: conf/global_settings.py:92 +msgid "Ukrainian" +msgstr "ukrajinski" + +#: conf/global_settings.py:93 +msgid "Simplified Chinese" +msgstr "novokineski" + +#: conf/global_settings.py:94 +msgid "Traditional Chinese" +msgstr "starokineski" + +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Uspešno obrisano: %(count)d %(items)s." + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1025 +msgid "Are you sure?" +msgstr "Da li ste sigurni?" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Briši označene objekte klase %(verbose_name_plural)s" + +#: contrib/admin/filterspecs.py:44 +#, python-format +msgid "" +"

                                  By %s:

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

                                    %s:

                                    \n" +"
                                      \n" + +#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 +msgid "All" +msgstr "Svi" + +#: contrib/admin/filterspecs.py:113 +msgid "Any date" +msgstr "Svi datumi" + +#: contrib/admin/filterspecs.py:114 +msgid "Today" +msgstr "Danas" + +#: contrib/admin/filterspecs.py:117 +msgid "Past 7 days" +msgstr "Poslednjih 7 dana" + +#: contrib/admin/filterspecs.py:119 +msgid "This month" +msgstr "Ovaj mesec" + +#: contrib/admin/filterspecs.py:121 +msgid "This year" +msgstr "Ova godina" + +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 +msgid "Yes" +msgstr "Da" + +#: contrib/admin/filterspecs.py:147 forms/widgets.py:434 +msgid "No" +msgstr "Ne" + +#: contrib/admin/filterspecs.py:154 forms/widgets.py:434 +msgid "Unknown" +msgstr "Nepoznato" + +#: contrib/admin/helpers.py:14 +msgid "Action:" +msgstr "Radnja:" + +#: contrib/admin/models.py:19 +msgid "action time" +msgstr "vreme radnje" + +#: contrib/admin/models.py:22 +msgid "object id" +msgstr "id objekta" + +#: contrib/admin/models.py:23 +msgid "object repr" +msgstr "opis objekta" + +#: contrib/admin/models.py:24 +msgid "action flag" +msgstr "oznaka radnje" + +#: contrib/admin/models.py:25 +msgid "change message" +msgstr "opis izmene" + +#: contrib/admin/models.py:28 +msgid "log entry" +msgstr "zapis u logovima" + +#: contrib/admin/models.py:29 +msgid "log entries" +msgstr "zapisi u logovima" + +#: contrib/admin/options.py:133 contrib/admin/options.py:147 +msgid "None" +msgstr "Ništa" + +#: contrib/admin/options.py:519 +#, python-format +msgid "Changed %s." +msgstr "Izmenjena polja %s" + +#: contrib/admin/options.py:519 contrib/admin/options.py:529 +#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388 +#: forms/models.py:587 +msgid "and" +msgstr "i" + +#: contrib/admin/options.py:524 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "Sačuvan objekat „%(object)s“ klase %(name)s." + +#: contrib/admin/options.py:528 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "Izmenjena polja %(list)s objekata „%(object)s“ klase %(name)s ." + +#: contrib/admin/options.py:533 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "Obrisan objekat „%(object)s“ klase %(name)s." + +#: contrib/admin/options.py:537 +msgid "No fields changed." +msgstr "Bez izmena u poljima." + +#: contrib/admin/options.py:598 contrib/auth/admin.py:67 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "Objekat „%(obj)s“ klase %(name)s sačuvan je uspešno." + +#: contrib/admin/options.py:602 contrib/admin/options.py:635 +#: contrib/auth/admin.py:75 +msgid "You may edit it again below." +msgstr "Dole možete ponovo unositi izmene." + +#: contrib/admin/options.py:612 contrib/admin/options.py:645 +#, python-format +msgid "You may add another %s below." +msgstr "Dole možete dodati novi objekat klase %s" + +#: contrib/admin/options.py:633 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "Objekat „%(obj)s“ klase %(name)s izmenjen je uspešno." + +#: contrib/admin/options.py:641 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" +"Objekat „%(obj)s“ klase %(name)s dodat je uspešno. Dole možete uneti dodatne " +"izmene." + +#: contrib/admin/options.py:772 +#, python-format +msgid "Add %s" +msgstr "Dodaj objekat klase %s" + +#: contrib/admin/options.py:803 contrib/admin/options.py:1003 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "Objekat klase %(name)s sa primarnim ključem %(key)r ne postoji." + +#: contrib/admin/options.py:860 +#, python-format +msgid "Change %s" +msgstr "Izmeni objekat klase %s" + +#: contrib/admin/options.py:904 +msgid "Database error" +msgstr "Greška u bazi podataka" + +#: contrib/admin/options.py:940 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s objekat klase %(name)s izmenjen je uspešno." +msgstr[1] "%(count)s objekata klase %(name)s izmenjeni su uspešno." +msgstr[2] "%(count)s objekta klase %(name)s izmenjeno je uspešno." + +#: contrib/admin/options.py:1018 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Objekat „%(obj)s“ klase %(name)s obrisan je uspešno." + +#: contrib/admin/options.py:1054 +#, python-format +msgid "Change history: %s" +msgstr "Istorijat izmena: %s" + +#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14 +#: contrib/auth/forms.py:80 +msgid "" +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." +msgstr "" +"Unesite tačno korisničko ime i lozinku. Pazite na razliku između malih i " +"velikih slova u oba polja" + +#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40 +msgid "Please log in again, because your session has expired." +msgstr "Prijavite se ponovo pošto je vaša sesija istekla." + +#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47 +msgid "" +"Looks like your browser isn't configured to accept cookies. Please enable " +"cookies, reload this page, and try again." +msgstr "" +"Izgleda da vaš brauzer nije podešen da prima kolačiće. Uključite kolačiće, " +"osvežite ovu stranicu i probajte ponovo." + +#: contrib/admin/sites.py:301 contrib/admin/sites.py:307 +#: contrib/admin/views/decorators.py:66 +msgid "Usernames cannot contain the '@' character." +msgstr "Korisnička imena ne smeju sadržati znak „@“." + +#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62 +#, python-format +msgid "Your e-mail address is not your username. Try '%s' instead." +msgstr "Vaša imejl adresa nije vaše korisničko ime. Probajte sa „%s“." + +#: contrib/admin/sites.py:360 +msgid "Site administration" +msgstr "Administracija sistema" + +#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26 +#: contrib/admin/templates/registration/password_reset_complete.html:14 +#: contrib/admin/views/decorators.py:20 +msgid "Log in" +msgstr "Prijava" + +#: contrib/admin/sites.py:417 +#, python-format +msgid "%s administration" +msgstr "Administracija %s" + +#: contrib/admin/util.py:168 +#, python-format +msgid "One or more %(fieldname)s in %(name)s: %(obj)s" +msgstr "Jedno ili više polja %(fieldname)s u %(name)s: %(obj)s" + +#: contrib/admin/util.py:173 +#, python-format +msgid "One or more %(fieldname)s in %(name)s:" +msgstr "Jedno ili više polja %(fieldname)s u %(name)s" + +#: contrib/admin/widgets.py:71 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:71 +msgid "Time:" +msgstr "Vreme:" + +#: contrib/admin/widgets.py:95 +msgid "Currently:" +msgstr "Trenutno:" + +#: contrib/admin/widgets.py:95 +msgid "Change:" +msgstr "Izmena:" + +#: contrib/admin/widgets.py:124 +msgid "Lookup" +msgstr "Pretraži" + +#: contrib/admin/widgets.py:236 +msgid "Add Another" +msgstr "Dodaj još jedan" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Stranica nije pronađena" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Žao nam je, tražena stranica nije pronađena." + +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/app_index.html:8 +#: contrib/admin/templates/admin/base.html:31 +#: contrib/admin/templates/admin/change_form.html:17 +#: contrib/admin/templates/admin/change_list.html:25 +#: contrib/admin/templates/admin/delete_confirmation.html:6 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:6 +#: contrib/admin/templates/admin/invalid_setup.html:4 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/admin/auth/user/change_password.html:10 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_complete.html:4 +#: contrib/admin/templates/registration/password_reset_confirm.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 +msgid "Home" +msgstr "Početna" + +#: contrib/admin/templates/admin/500.html:4 +msgid "Server error" +msgstr "Greška na serveru" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Greška na serveru (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Greška na serveru (500)" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"Došlo je do greške. Administrator sajta je obavešten imejlom i greška će " +"biti uskoro otklonjena. Hvala na strpljenju." + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Pokreni odabranu radnju" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Počni" + +#: contrib/admin/templates/admin/app_index.html:10 +#: contrib/admin/templates/admin/index.html:19 +#, python-format +msgid "%(name)s" +msgstr "%(name)s" + +#: contrib/admin/templates/admin/base.html:26 +msgid "Welcome," +msgstr "Dobrodošli," + +#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Dokumentacija" + +#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:47 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +msgid "Change password" +msgstr "Promena lozinke" + +#: contrib/admin/templates/admin/base.html:26 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +msgid "Log out" +msgstr "Odjava" + +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django administracija sajta" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Django administracija" + +#: contrib/admin/templates/admin/change_form.html:20 +#: contrib/admin/templates/admin/index.html:29 +msgid "Add" +msgstr "Dodaj" + +#: contrib/admin/templates/admin/change_form.html:27 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "Istorijat" + +#: contrib/admin/templates/admin/change_form.html:28 +#: contrib/admin/templates/admin/edit_inline/stacked.html:13 +#: contrib/admin/templates/admin/edit_inline/tabular.html:27 +msgid "View on site" +msgstr "Pregled na sajtu" + +#: contrib/admin/templates/admin/change_form.html:38 +#: contrib/admin/templates/admin/change_list.html:54 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Ispravite grešku dole." +msgstr[1] "Ispravite greške dole." +msgstr[2] "Ispravite greške dole." + +#: contrib/admin/templates/admin/change_list.html:46 +#, python-format +msgid "Add %(name)s" +msgstr "Dodaj objekat klase %(name)s" + +#: contrib/admin/templates/admin/change_list.html:65 +msgid "Filter" +msgstr "Filter" + +#: contrib/admin/templates/admin/delete_confirmation.html:10 +#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275 +msgid "Delete" +msgstr "Obriši" + +#: contrib/admin/templates/admin/delete_confirmation.html:16 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"Uklanjanje %(object_name)s „%(escaped_object)s“ povlači uklanjanje svih objekata " +"koji su povezani sa ovim objektom, ali vaš nalog nema dozvole za brisanje " +"sledećih tipova objekata:" + +#: contrib/admin/templates/admin/delete_confirmation.html:23 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"Da sigurni da želite da obrišete %(object_name)s „%(escaped_object)s“? " +"Sledeći objekti koji su u vezi sa ovim objektom će takođe biti obrisani:" + +#: contrib/admin/templates/admin/delete_confirmation.html:28 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:33 +msgid "Yes, I'm sure" +msgstr "Da, siguran sam" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:9 +msgid "Delete multiple objects" +msgstr "Brisanje više objekata" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:15 +#, python-format +msgid "" +"Deleting the %(object_name)s would result in deleting related objects, but " +"your account doesn't have permission to delete the following types of " +"objects:" +msgstr "" +"Uklanjanje %(object_name)s povlači uklanjanje svih objekata koji su povezani sa " +"ovim objektom, ali vaš nalog nema dozvole za brisanje sledećih tipova " +"objekata:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:22 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(object_name)s objects? All of " +"the following objects and it's related items will be deleted:" +msgstr "" +"Da sigurni da želite da obrišete odabrane %(object_name)s? Sledeći objekti " +"koji su u vezi sa ovim objektom će takođe biti obrisani:" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr " %(filter_title)s " + +#: contrib/admin/templates/admin/index.html:18 +#, python-format +msgid "Models available in the %(name)s application." +msgstr "Modeli dostupni u aplikaciji %(name)s." + +#: contrib/admin/templates/admin/index.html:35 +msgid "Change" +msgstr "Izmeni" + +#: contrib/admin/templates/admin/index.html:45 +msgid "You don't have permission to edit anything." +msgstr "Nemate dozvole da unosite bilo kakve izmene." + +#: contrib/admin/templates/admin/index.html:53 +msgid "Recent Actions" +msgstr "Poslednje radnje" + +#: contrib/admin/templates/admin/index.html:54 +msgid "My Actions" +msgstr "Moje radnje" + +#: contrib/admin/templates/admin/index.html:58 +msgid "None available" +msgstr "Nema podataka" + +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "Nepoznat sadržaj" + +#: contrib/admin/templates/admin/invalid_setup.html:7 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"Nešto nije uredu sa vašom bazom podataka. Proverite da li postoje " +"odgovarajuće tabele i da li odgovarajući korisnik ima pristup bazi." + +#: contrib/admin/templates/admin/login.html:19 +msgid "Username:" +msgstr "Korisnik:" + +#: contrib/admin/templates/admin/login.html:22 +msgid "Password:" +msgstr "Lozinka:" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "Datum/vreme" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "Korisnik" + +#: contrib/admin/templates/admin/object_history.html:24 +#: contrib/comments/templates/comments/moderation_queue.html:33 +msgid "Action" +msgstr "Radnja" + +#: contrib/admin/templates/admin/object_history.html:30 +#: utils/translation/trans_real.py:400 +msgid "DATETIME_FORMAT" +msgstr "j. N. Y. G:i T" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"Ovaj objekat nema zabeležen istorijat izmena. Verovatno nije dodat kroz ovaj " +"sajt za administraciju." + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "Prikaži sve" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "Pretraga" + +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "1 result" +msgid_plural "%(counter)s results" +msgstr[0] "1 rezultat" +msgstr[1] "%(counter)s rezultata" +msgstr[2] "%(counter)s rezultata" + +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "%(full_result_count)s total" +msgstr "ukupno %(full_result_count)s" + +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Sačuvaj" + +#: contrib/admin/templates/admin/submit_line.html:5 +msgid "Save as new" +msgstr "Sačuvaj kao novi" + +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Save and add another" +msgstr "Sačuvaj i dodaj sledeći" + +#: contrib/admin/templates/admin/submit_line.html:7 +msgid "Save and continue editing" +msgstr "Sačuvaj i nastavi sa izmenama" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Prvo unesite korisničko ime i lozinku. Potom ćete moći da menjate još " +"korisničkih podešavanja." + +#: contrib/admin/templates/admin/auth/user/add_form.html:13 +#: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59 +msgid "Username" +msgstr "Korisnik" + +#: contrib/admin/templates/admin/auth/user/add_form.html:20 +#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185 +msgid "Password" +msgstr "Lozinka" + +#: contrib/admin/templates/admin/auth/user/add_form.html:26 +#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#: contrib/auth/forms.py:186 +msgid "Password (again)" +msgstr "Lozinka (ponovite)" + +#: contrib/admin/templates/admin/auth/user/add_form.html:27 +#: contrib/admin/templates/admin/auth/user/change_password.html:41 +msgid "Enter the same password as above, for verification." +msgstr "Radi provere tačnosti ponovo unesite lozinku koju ste uneli gore." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "Unesite novu lozinku za korisnika %(username)s." + +#: contrib/admin/templates/admin/edit_inline/tabular.html:15 +msgid "Delete?" +msgstr "Brisanje?" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Hvala što ste danas proveli vreme na ovom sajtu." + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Ponovna prijava" + +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_change_form.html:6 +#: contrib/admin/templates/registration/password_change_form.html:10 +msgid "Password change" +msgstr "Izmena lozinke" + +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_done.html:10 +msgid "Password change successful" +msgstr "Uspešna izmena lozinke" + +#: contrib/admin/templates/registration/password_change_done.html:12 +msgid "Your password was changed." +msgstr "Vaša lozinka je izmenjena." + +#: contrib/admin/templates/registration/password_change_form.html:12 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"Iz bezbednosnih razloga prvo unesite svoju staru lozinku, a novu zatim " +"unesite dva puta da bismo mogli da proverimo da li ste je pravilno uneli." + +#: contrib/admin/templates/registration/password_change_form.html:17 +msgid "Old password:" +msgstr "Stara lozinka:" + +#: contrib/admin/templates/registration/password_change_form.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:18 +msgid "New password:" +msgstr "Nova lozinka:" + +#: contrib/admin/templates/registration/password_change_form.html:21 +#: contrib/admin/templates/registration/password_reset_confirm.html:20 +msgid "Confirm password:" +msgstr "Potvrda lozinke:" + +#: contrib/admin/templates/registration/password_change_form.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "Change my password" +msgstr "Izmeni moju lozinku" + +#: contrib/admin/templates/registration/password_reset_complete.html:4 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:10 +msgid "Password reset" +msgstr "Resetovanje lozinke" + +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_complete.html:10 +msgid "Password reset complete" +msgstr "Resetovanje lozinke uspešno" + +#: contrib/admin/templates/registration/password_reset_complete.html:12 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "Vaša lozinka je postavljena. Možete se prijaviti." + +#: contrib/admin/templates/registration/password_reset_confirm.html:4 +msgid "Password reset confirmation" +msgstr "Potvrda resetovanja lozinke" + +#: contrib/admin/templates/registration/password_reset_confirm.html:12 +msgid "Enter new password" +msgstr "Unesite novu lozinku" + +#: contrib/admin/templates/registration/password_reset_confirm.html:14 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" +"Unesite novu lozinku dva puta kako bismo mogli da proverimo da li ste je " +"pravilno uneli." + +#: contrib/admin/templates/registration/password_reset_confirm.html:26 +msgid "Password reset unsuccessful" +msgstr "Resetovanje lozinke neuspešno" + +#: contrib/admin/templates/registration/password_reset_confirm.html:28 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" +"Link za resetovanje lozinke nije važeći, verovatno zato što je već " +"iskorišćen. Ponovo zatražite resetovanje lozinke." + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "Resetovanje lozinke uspešno." + +#: contrib/admin/templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed you instructions for setting your password to the e-mail " +"address you submitted. You should be receiving it shortly." +msgstr "" +"Poslali smo uputstva za postavljanje nove lozinke na imejl adresu koju ste nam " +"dali. Uputstva ćete dobiti uskoro." + +#: contrib/admin/templates/registration/password_reset_email.html:2 +msgid "You're receiving this e-mail because you requested a password reset" +msgstr "Ovu poruku ste primili zato što ste zahtevali resetovanje lozinke" + +#: contrib/admin/templates/registration/password_reset_email.html:3 +#, python-format +msgid "for your user account at %(site_name)s" +msgstr "za vaš korisnički nalog na sajtu %(site_name)s" + +#: contrib/admin/templates/registration/password_reset_email.html:5 +msgid "Please go to the following page and choose a new password:" +msgstr "Idite na sledeću stranicu i postavite novu lozinku." + +#: contrib/admin/templates/registration/password_reset_email.html:9 +msgid "Your username, in case you've forgotten:" +msgstr "Ukoliko ste zaboravili, vaše korisničko ime:" + +#: contrib/admin/templates/registration/password_reset_email.html:11 +msgid "Thanks for using our site!" +msgstr "Hvala što koristite naš sajt!" + +#: contrib/admin/templates/registration/password_reset_email.html:13 +#, python-format +msgid "The %(site_name)s team" +msgstr "Ekipa sajta %(site_name)s" + +#: contrib/admin/templates/registration/password_reset_form.html:12 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll e-mail " +"instructions for setting a new one." +msgstr "" +"Zaboravili ste lozinku? Unesite svoju imejl adresu dole i poslaćemo vam " +"uputstva za postavljanje nove." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "Imejl adresa:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Resetuj moju lozinku" + +#: contrib/admin/templatetags/admin_list.py:299 +msgid "All dates" +msgstr "Svi datumi" + +#: contrib/admin/views/main.py:70 +#, python-format +msgid "Select %s" +msgstr "Odaberi objekat klase %s" + +#: contrib/admin/views/main.py:70 +#, python-format +msgid "Select %s to change" +msgstr "Odaberi objekat klase %s za izmenu" + +#: contrib/admin/views/template.py:37 contrib/sites/models.py:38 +msgid "site" +msgstr "sajt" + +#: contrib/admin/views/template.py:39 +msgid "template" +msgstr "templejt" + +#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60 +#: contrib/admindocs/views.py:62 +msgid "tag:" +msgstr "tag:" + +#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93 +#: contrib/admindocs/views.py:95 +msgid "filter:" +msgstr "filter:" + +#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157 +#: contrib/admindocs/views.py:159 +msgid "view:" +msgstr "vju:" + +#: contrib/admindocs/views.py:187 +#, python-format +msgid "App %r not found" +msgstr "Aplikacija %r nije pronađena" + +#: contrib/admindocs/views.py:194 +#, python-format +msgid "Model %(model_name)r not found in app %(app_label)r" +msgstr "Model %(model_name)r nije pronađen u aplikaciji %(app_label)r" + +#: contrib/admindocs/views.py:206 +#, python-format +msgid "the related `%(app_label)s.%(data_type)s` object" +msgstr "povezani objekti klase `%(app_label)s.%(data_type)s`" + +#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:228 +#: contrib/admindocs/views.py:242 contrib/admindocs/views.py:247 +msgid "model:" +msgstr "model:" + +# WARN: possible breakage in future +# This string is interpolated in strings below, which can cause breakage in +# future releases. +#: contrib/admindocs/views.py:237 +#, python-format +msgid "related `%(app_label)s.%(object_name)s` objects" +msgstr "klase `%(app_label)s.%(object_name)s`" + +# WARN: possible breakage in future +#: contrib/admindocs/views.py:242 +#, python-format +msgid "all %s" +msgstr "svi povezani objekti %s" + +# WARN: possible breakage in future +#: contrib/admindocs/views.py:247 +#, python-format +msgid "number of %s" +msgstr "broj povezanih objekata %s" + +# WARN: possible breakage in future +#: contrib/admindocs/views.py:252 +#, python-format +msgid "Fields on %s objects" +msgstr "Polja u povezanim objektima %s" + +#: contrib/admindocs/views.py:315 contrib/admindocs/views.py:326 +#: contrib/admindocs/views.py:328 contrib/admindocs/views.py:334 +#: contrib/admindocs/views.py:335 contrib/admindocs/views.py:337 +msgid "Integer" +msgstr "Ceo broj" + +#: contrib/admindocs/views.py:316 +msgid "Boolean (Either True or False)" +msgstr "Bulova vrednost (True ili False)" + +#: contrib/admindocs/views.py:317 contrib/admindocs/views.py:336 +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "String (najviše %(max_length)s znakova)" + +#: contrib/admindocs/views.py:318 +msgid "Comma-separated integers" +msgstr "Celi brojevi razdvojeni zapetama" + +#: contrib/admindocs/views.py:319 +msgid "Date (without time)" +msgstr "Datum (bez vremena)" + +#: contrib/admindocs/views.py:320 +msgid "Date (with time)" +msgstr "Datum (sa vremenom)" + +#: contrib/admindocs/views.py:321 +msgid "Decimal number" +msgstr "Decimalni broj" + +#: contrib/admindocs/views.py:322 +msgid "E-mail address" +msgstr "Imejl adresa" + +#: contrib/admindocs/views.py:323 contrib/admindocs/views.py:324 +#: contrib/admindocs/views.py:327 +msgid "File path" +msgstr "Putanja fajla" + +#: contrib/admindocs/views.py:325 +msgid "Floating point number" +msgstr "Broj sa pokrenom zapetom" + +#: contrib/admindocs/views.py:329 contrib/comments/models.py:60 +msgid "IP address" +msgstr "IP adresa" + +#: contrib/admindocs/views.py:331 +msgid "Boolean (Either True, False or None)" +msgstr "Bulova vrednost (True, False ili None)" + +#: contrib/admindocs/views.py:332 +msgid "Relation to parent model" +msgstr "Veza sa roditeljskim modelom" + +#: contrib/admindocs/views.py:333 +msgid "Phone number" +msgstr "Broj telefona" + +#: contrib/admindocs/views.py:338 +msgid "Text" +msgstr "Tekst" + +#: contrib/admindocs/views.py:339 +msgid "Time" +msgstr "Vreme" + +#: contrib/admindocs/views.py:340 contrib/comments/forms.py:95 +#: contrib/comments/templates/comments/moderation_queue.html:37 +#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7 +msgid "URL" +msgstr "URL" + +#: contrib/admindocs/views.py:341 +msgid "U.S. state (two uppercase letters)" +msgstr "Država u SAD (dva velika slova)" + +#: contrib/admindocs/views.py:342 +msgid "XML text" +msgstr "XML tekst" + +#: contrib/admindocs/views.py:368 +#, python-format +msgid "%s does not appear to be a urlpattern object" +msgstr "%s ne izgleda kao urlpattern objekat" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 +msgid "Bookmarklets" +msgstr "Bukmarkleti" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:4 +msgid "Documentation bookmarklets" +msgstr "Bukmarkleti dokumentacije" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:8 +msgid "" +"\n" +"

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

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

                                      Da biste instalirali bukmarklet, prevucite link do svojih\n" +"bukmarkova ili kliknite desnim dugmetom i dodajte među bukmarke. Nakon toga\n" +"bukmarkletima možete pristupiti sa svake stranice na sajtu. Imajte na umu\n" +"da neki bukmarkleti zahtevaju da sajtu pristupite sa računara koji su\n" +"označeni kao „interni“ (pitajte administratora vašeg sistema ukoliko niste\n" +"sigurni da li je vaš računar „interni“).

                                      \n" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:18 +msgid "Documentation for this page" +msgstr "Dokumentacija za ovu stranicu" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:19 +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Vodi od bilo koje stranice do dokumentaicje pogleda koji je generisao tu " +"stranicu." + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:21 +msgid "Show object ID" +msgstr "Prikaži ID objekta" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:22 +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." +msgstr "" +"Prikazuje content-type i jedinstveni ID za stranicu koja prestavlja jedan " +"objekat." + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:24 +msgid "Edit this object (current window)" +msgstr "Izmeni ovaj objekat (u ovom prozoru)" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:25 +msgid "Jumps to the admin page for pages that represent a single object." +msgstr "" +"Vodi u administracioni stranicu za stranice koje prestavljaju jedan objekat" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:27 +msgid "Edit this object (new window)" +msgstr "Izmeni ovaj objekat (novi prozor)" + +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:28 +msgid "As above, but opens the admin page in a new window." +msgstr "" +"Isto kao prethodni, ali otvara administracionu stranicu u novom prozoru." + +#: contrib/auth/admin.py:21 +msgid "Personal info" +msgstr "Lični podaci" + +#: contrib/auth/admin.py:22 +msgid "Permissions" +msgstr "Dozvole" + +#: contrib/auth/admin.py:23 +msgid "Important dates" +msgstr "Važni datumi" + +#: contrib/auth/admin.py:24 +msgid "Groups" +msgstr "Grupe" + +#: contrib/auth/admin.py:80 +msgid "Add user" +msgstr "Dodaj korisnika" + +#: contrib/auth/admin.py:106 +msgid "Password changed successfully." +msgstr "Lozinka uspešno izmenjena." + +#: contrib/auth/admin.py:112 +#, python-format +msgid "Change password: %s" +msgstr "Izmeni lozinku: %s" + +#: contrib/auth/forms.py:15 contrib/auth/forms.py:48 +#: contrib/auth/models.py:128 +msgid "" +"Required. 30 characters or fewer. Alphanumeric characters only (letters, " +"digits and underscores)." +msgstr "" +"Neophodno. Najviše 30 slovnih mesta. Samo alfanumerički znaci (slova, brojke " +"i donja crta)." + +#: contrib/auth/forms.py:16 contrib/auth/forms.py:49 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Ova vrednost može sadržati samo slova, brojke i donje crte." + +#: contrib/auth/forms.py:18 +msgid "Password confirmation" +msgstr "Potvrda lozinke" + +#: contrib/auth/forms.py:30 +msgid "A user with that username already exists." +msgstr "Korisnik sa tim korisničkim imenom već postoji." + +#: contrib/auth/forms.py:36 contrib/auth/forms.py:155 +#: contrib/auth/forms.py:197 +msgid "The two password fields didn't match." +msgstr "Dva polja za lozinke se nisu poklopila." + +#: contrib/auth/forms.py:82 +msgid "This account is inactive." +msgstr "Ovaj nalog je neaktivan." + +#: contrib/auth/forms.py:87 +msgid "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." +msgstr "" +"Izgleda da su kolačići isključeni u vašem brauzeru. Oni moraju biti uključeni " +"da bi ste se prijavili." + +#: contrib/auth/forms.py:100 +msgid "E-mail" +msgstr "Imejl adresa" + +#: contrib/auth/forms.py:109 +msgid "" +"That e-mail address doesn't have an associated user account. Are you sure " +"you've registered?" +msgstr "" +"Ta imejl adresa nije u vezi ni sa jednim nalogom. Da li ste sigurni da ste " +"se već registrovali?" + +#: contrib/auth/forms.py:135 +#, python-format +msgid "Password reset on %s" +msgstr "Resetovanje lozinke na %s" + +#: contrib/auth/forms.py:143 +msgid "New password" +msgstr "Nova lozinka" + +#: contrib/auth/forms.py:144 +msgid "New password confirmation" +msgstr "Potvrda nove lozinke" + +#: contrib/auth/forms.py:169 +msgid "Old password" +msgstr "Stara lozinka" + +#: contrib/auth/forms.py:177 +msgid "Your old password was entered incorrectly. Please enter it again." +msgstr "Vaša stara loznka nije pravilno unesena. Unesite je ponovo." + +#: contrib/auth/models.py:63 contrib/auth/models.py:86 +msgid "name" +msgstr "ime" + +#: contrib/auth/models.py:65 +msgid "codename" +msgstr "šifra dozvole" + +#: contrib/auth/models.py:68 +msgid "permission" +msgstr "dozvola" + +#: contrib/auth/models.py:69 contrib/auth/models.py:87 +msgid "permissions" +msgstr "dozvole" + +#: contrib/auth/models.py:90 +msgid "group" +msgstr "grupa" + +#: contrib/auth/models.py:91 contrib/auth/models.py:138 +msgid "groups" +msgstr "grupe" + +#: contrib/auth/models.py:128 +msgid "username" +msgstr "korisničko ime" + +#: contrib/auth/models.py:129 +msgid "first name" +msgstr "ime" + +#: contrib/auth/models.py:130 +msgid "last name" +msgstr "prezime" + +#: contrib/auth/models.py:131 +msgid "e-mail address" +msgstr "imejl adresa" + +#: contrib/auth/models.py:132 +msgid "password" +msgstr "lozinka" + +#: contrib/auth/models.py:132 +msgid "" +"Use '[algo]$[salt]$[hexdigest]' or use the change " +"password form." +msgstr "" +"Koristite '[algo]$[salt]$[hexdigest]' ili formular za " +"unos lozinke." + +#: contrib/auth/models.py:133 +msgid "staff status" +msgstr "status člana posade" + +#: contrib/auth/models.py:133 +msgid "Designates whether the user can log into this admin site." +msgstr "" +"Označava da li korisnik može da se prijavi na ovaj sajt za administraciju." + +#: contrib/auth/models.py:134 +msgid "active" +msgstr "aktivan" + +#: contrib/auth/models.py:134 +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "" +"Označava da li se korisnik smatra aktivnim. Deselektujte ovo umesto da " +"brišete nalog." + +#: contrib/auth/models.py:135 +msgid "superuser status" +msgstr "status administratora" + +#: contrib/auth/models.py:135 +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "" +"Označava da li korisnik ima sve dozvole bez dodeljivanja pojedinačnih dozvola." + +#: contrib/auth/models.py:136 +msgid "last login" +msgstr "poslednja prijava" + +#: contrib/auth/models.py:137 +msgid "date joined" +msgstr "datum registracije" + +#: contrib/auth/models.py:139 +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"Pored ručno dodeljenih dozvola, ovaj korisnik će imati i dozvole dodeljene " +"gurpama kojima pripada." + +#: contrib/auth/models.py:140 +msgid "user permissions" +msgstr "korisničke dozvole" + +#: contrib/auth/models.py:144 contrib/comments/models.py:50 +#: contrib/comments/models.py:168 +msgid "user" +msgstr "korisnik" + +#: contrib/auth/models.py:145 +msgid "users" +msgstr "korisnici" + +#: contrib/auth/models.py:301 +msgid "message" +msgstr "poruka" + +#: contrib/auth/views.py:56 +msgid "Logged out" +msgstr "Odjavljen" + +#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429 +msgid "Enter a valid e-mail address." +msgstr "Unesite važeću imejl adresu." + +#: contrib/comments/admin.py:11 +msgid "Content" +msgstr "Sadržaj" + +#: contrib/comments/admin.py:14 +msgid "Metadata" +msgstr "Metapodaci" + +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "Komentari na sajtu %(site_name)s" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "Skoriji komentari na sajtu %(site_name)s" + +#: contrib/comments/forms.py:93 +#: contrib/comments/templates/comments/moderation_queue.html:34 +msgid "Name" +msgstr "Ime" + +#: contrib/comments/forms.py:94 +msgid "Email address" +msgstr "Imejl adresa" + +#: contrib/comments/forms.py:96 +#: contrib/comments/templates/comments/moderation_queue.html:35 +msgid "Comment" +msgstr "Komentari" + +#: contrib/comments/forms.py:173 +#, python-format +msgid "Watch your mouth! The word %s is not allowed here." +msgid_plural "Watch your mouth! The words %s are not allowed here." +msgstr[0] "Pazi na jezik! Reč „%s“ ovde nije dozvoljena." +msgstr[1] "Pazi na jezik! Reči „%s“ ovde nisu dozvoljene." +msgstr[2] "Pazi na jezik! Reči „%s“ ovde nisu dozvoljene." + +#: contrib/comments/forms.py:180 +msgid "" +"If you enter anything in this field your comment will be treated as spam" +msgstr "Ako išta unesete u ovo polje, Vaš komentar će se smatrati spamom." + +#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74 +msgid "content type" +msgstr "tip sadržaja" + +#: contrib/comments/models.py:24 +msgid "object ID" +msgstr "ID objekta" + +#: contrib/comments/models.py:52 +msgid "user's name" +msgstr "korisnikovo ime" + +#: contrib/comments/models.py:53 +msgid "user's email address" +msgstr "korisnikova imejl adresa" + +#: contrib/comments/models.py:54 +msgid "user's URL" +msgstr "korisnikov URL" + +#: contrib/comments/models.py:56 contrib/comments/models.py:76 +#: contrib/comments/models.py:169 +msgid "comment" +msgstr "komentar" + +#: contrib/comments/models.py:59 +msgid "date/time submitted" +msgstr "datum/vreme postavljanja" + +#: contrib/comments/models.py:61 +msgid "is public" +msgstr "javno" + +#: contrib/comments/models.py:62 +msgid "" +"Uncheck this box to make the comment effectively disappear from the site." +msgstr "" +"Deselektujte ovu kućicu ako želite da poruka faktični nestane sa ovog sajta." + +#: contrib/comments/models.py:64 +msgid "is removed" +msgstr "uklonjen" + +#: contrib/comments/models.py:65 +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"Obeležite ovu kućicu ako je komentar neprikladan. Poruka o uklanjanju će biti " +"prikazana umesto komentara." + +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "komentari" + +#: contrib/comments/models.py:119 +msgid "" +"This comment was posted by an authenticated user and thus the name is read-" +"only." +msgstr "" +"Ovaj komentar je postavio prijavljen korisnik i zato je polje sa imenom " +"zaključano." + +#: contrib/comments/models.py:128 +msgid "" +"This comment was posted by an authenticated user and thus the email is read-" +"only." +msgstr "" +"Ovaj komentar je postavio prijavljen korisnik i zato je polje sa imejl adresom " +"zaključano." + +#: contrib/comments/models.py:153 +#, python-format +msgid "" +"Posted by %(user)s at %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" +msgstr "" +"Postavio %(user)s, %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" + +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "oznaka" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "datum" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "oznaka komentara" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "oznake komentara" + +#: contrib/comments/templates/comments/approve.html:4 +msgid "Approve a comment" +msgstr "Odobrenje komentara" + +#: contrib/comments/templates/comments/approve.html:7 +msgid "Really make this comment public?" +msgstr "Da li zaista želite da označite ovaj komentar javnim?" + +#: contrib/comments/templates/comments/approve.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:49 +msgid "Approve" +msgstr "Odobri" + +#: contrib/comments/templates/comments/approved.html:4 +msgid "Thanks for approving" +msgstr "Hvala na odobrenju!" + +#: contrib/comments/templates/comments/approved.html:7 +#: contrib/comments/templates/comments/deleted.html:7 +#: contrib/comments/templates/comments/flagged.html:7 +msgid "" +"Thanks for taking the time to improve the quality of discussion on our site" +msgstr "Hvala na učešću u unapređenju kvaliteta diskusija na našem sajtu." + +#: contrib/comments/templates/comments/delete.html:4 +msgid "Remove a comment" +msgstr "Obriši komentar" + +#: contrib/comments/templates/comments/delete.html:7 +msgid "Really remove this comment?" +msgstr "Da li zaista želite da obrišete ovaj komentar?" + +#: contrib/comments/templates/comments/delete.html:12 +#: contrib/comments/templates/comments/moderation_queue.html:53 +msgid "Remove" +msgstr "Obriši" + +#: contrib/comments/templates/comments/deleted.html:4 +msgid "Thanks for removing" +msgstr "Hvala što koristite naš sajt!" + +#: contrib/comments/templates/comments/flag.html:4 +msgid "Flag this comment" +msgstr "Označavanje komentara" + +#: contrib/comments/templates/comments/flag.html:7 +msgid "Really flag this comment?" +msgstr "Da li zaista želite da označite ovaj komentar?" + +#: contrib/comments/templates/comments/flag.html:12 +msgid "Flag" +msgstr "Označi" + +#: contrib/comments/templates/comments/flagged.html:4 +msgid "Thanks for flagging" +msgstr "Hvala što ste označili komentar." + +#: contrib/comments/templates/comments/form.html:17 +#: contrib/comments/templates/comments/preview.html:32 +msgid "Post" +msgstr "Postavi" + +#: contrib/comments/templates/comments/form.html:18 +#: contrib/comments/templates/comments/preview.html:33 +msgid "Preview" +msgstr "Pregled" + +#: contrib/comments/templates/comments/moderation_queue.html:4 +#: contrib/comments/templates/comments/moderation_queue.html:19 +msgid "Comment moderation queue" +msgstr "Komentari koji čekaju na odobrenje" + +#: contrib/comments/templates/comments/moderation_queue.html:26 +msgid "No comments to moderate" +msgstr "Nema komentara na čekanju" + +#: contrib/comments/templates/comments/moderation_queue.html:36 +msgid "Email" +msgstr "Imejl adresa" + +#: contrib/comments/templates/comments/moderation_queue.html:38 +msgid "Authenticated?" +msgstr "Prijavljen?" + +#: contrib/comments/templates/comments/moderation_queue.html:39 +msgid "IP Address" +msgstr "IP adresa" + +#: contrib/comments/templates/comments/moderation_queue.html:40 +msgid "Date posted" +msgstr "Datum postavljanja" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "yes" +msgstr "da" + +#: contrib/comments/templates/comments/moderation_queue.html:63 +msgid "no" +msgstr "ne" + +#: contrib/comments/templates/comments/posted.html:4 +msgid "Thanks for commenting" +msgstr "Hvala na komentaru" + +#: contrib/comments/templates/comments/posted.html:7 +msgid "Thank you for your comment" +msgstr "Hvala što ste ostavili svoj komentar" + +#: contrib/comments/templates/comments/preview.html:4 +#: contrib/comments/templates/comments/preview.html:13 +msgid "Preview your comment" +msgstr "Pregledaj komentar" + +#: contrib/comments/templates/comments/preview.html:11 +msgid "Please correct the error below" +msgid_plural "Please correct the errors below" +msgstr[0] "Ispravite grešku dole." +msgstr[1] "Ispravite greške dole." +msgstr[2] "Ispravite greške dole." + +#: contrib/comments/templates/comments/preview.html:16 +msgid "Post your comment" +msgstr "Postavi komentar" + +#: contrib/comments/templates/comments/preview.html:16 +msgid "or make changes" +msgstr "ili izvrši izmene" + +#: contrib/contenttypes/models.py:70 +msgid "python model class name" +msgstr "ime python klase modela" + +#: contrib/contenttypes/models.py:75 +msgid "content types" +msgstr "tipovi sadržaja" + +#: contrib/flatpages/admin.py:9 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Primer: '/about/contact/'. Pazite na to da postoje i početne i završne kose " +"crte." + +#: contrib/flatpages/admin.py:11 +msgid "" +"This value must contain only letters, numbers, underscores, dashes or " +"slashes." +msgstr "" +"Ova vrednost može sadržati samo slova, brojke, donje crte, crtice ili kose " +"crte." + +#: contrib/flatpages/admin.py:22 +msgid "Advanced options" +msgstr "Napredna podešavanja" + +#: contrib/flatpages/models.py:8 +msgid "title" +msgstr "naslov" + +#: contrib/flatpages/models.py:9 +msgid "content" +msgstr "sadržaj" + +#: contrib/flatpages/models.py:10 +msgid "enable comments" +msgstr "omogući komentarisanje" + +#: contrib/flatpages/models.py:11 +msgid "template name" +msgstr "naziv templejta" + +#: contrib/flatpages/models.py:12 +msgid "" +"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " +"will use 'flatpages/default.html'." +msgstr "" +"Primer: 'flatpages/contact_page.html'. Ako ovo ostavite praznim, sistem će " +"koristiti 'flatpages/default.html'." + +#: contrib/flatpages/models.py:13 +msgid "registration required" +msgstr "potrebna registracija" + +#: contrib/flatpages/models.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Ako je ovo obeleženo, samo će prijavljeni korisnici moći da vide ovu stranicu." + +#: contrib/flatpages/models.py:18 +msgid "flat page" +msgstr "flet stranica" + +#: contrib/flatpages/models.py:19 +msgid "flat pages" +msgstr "flet stranice" + +#: contrib/formtools/wizard.py:130 +msgid "" +"We apologize, but your form has expired. Please continue filling out the " +"form from this page." +msgstr "" +"Žao nam je, ali Vaša sesija je istekla. Popunjavanje formulara nastavite na " +"ovoj stranici." + +#: contrib/gis/forms/fields.py:17 +msgid "No geometry value provided." +msgstr "Niste zadali parametre za geometriju." + +#: contrib/gis/forms/fields.py:18 +msgid "Invalid geometry value." +msgstr "Neispravan parametar za geometriju." + +#: contrib/gis/forms/fields.py:19 +msgid "Invalid geometry type." +msgstr "Nepostojeći tip geometrije." + +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "th" +msgstr "-i" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "st" +msgstr "-vi" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "nd" +msgstr "-i" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "rd" +msgstr "-i" + +#: contrib/humanize/templatetags/humanize.py:51 +#, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "%(value).1f milion" +msgstr[1] "%(value).1f miliona" +msgstr[2] "%(value).1f miliona" + +#: contrib/humanize/templatetags/humanize.py:54 +#, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "%(value).1f milijarda" +msgstr[1] "%(value).1f milijarde" +msgstr[2] "%(value).1f milijardi" + +#: contrib/humanize/templatetags/humanize.py:57 +#, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "%(value).1f trilion" +msgstr[1] "%(value).1f triliona" +msgstr[2] "%(value).1f triliona" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "one" +msgstr "jedan" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "two" +msgstr "dva" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "three" +msgstr "tri" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "four" +msgstr "četiri" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "five" +msgstr "pet" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "six" +msgstr "šest" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "seven" +msgstr "sedam" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "eight" +msgstr "osam" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "nine" +msgstr "devet" + +#: contrib/humanize/templatetags/humanize.py:93 +msgid "today" +msgstr "deset" + +#: contrib/humanize/templatetags/humanize.py:95 +msgid "tomorrow" +msgstr "sutra" + +#: contrib/humanize/templatetags/humanize.py:97 +msgid "yesterday" +msgstr "juče" + +#: contrib/localflavor/ar/forms.py:27 +msgid "Enter a postal code in the format NNNN or ANNNNAAA." +msgstr "Unesite poštanski broj u formatu NNNN ili ANNNNAAA." + +#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96 +#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 +#: contrib/localflavor/pe/forms.py:51 +msgid "This field requires only numbers." +msgstr "Ovo polje mora sadržati samo brojke." + +#: contrib/localflavor/ar/forms.py:50 +msgid "This field requires 7 or 8 digits." +msgstr "Ovo polje mora sadržati 7 ili 8 cifara" + +#: contrib/localflavor/ar/forms.py:79 +msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." +msgstr "Unestie važeći CUIT u formatu XX-XXXXXXXX-X or XXXXXXXXXXXX." + +#: contrib/localflavor/ar/forms.py:80 +msgid "Invalid CUIT." +msgstr "Nevažeći CUIT" + +#: contrib/localflavor/at/at_states.py:5 +msgid "Burgenland" +msgstr "Burgenland" + +#: contrib/localflavor/at/at_states.py:6 +msgid "Carinthia" +msgstr "Karintija" + +#: contrib/localflavor/at/at_states.py:7 +msgid "Lower Austria" +msgstr "Donja Austrija" + +#: contrib/localflavor/at/at_states.py:8 +msgid "Upper Austria" +msgstr "Gornja Austrija" + +#: contrib/localflavor/at/at_states.py:9 +msgid "Salzburg" +msgstr "Salcburg" + +#: contrib/localflavor/at/at_states.py:10 +msgid "Styria" +msgstr "Stirija" + +#: contrib/localflavor/at/at_states.py:11 +msgid "Tyrol" +msgstr "Tirol" + +#: contrib/localflavor/at/at_states.py:12 +msgid "Vorarlberg" +msgstr "Voralber" + +#: contrib/localflavor/at/at_states.py:13 +msgid "Vienna" +msgstr "Beč" + +#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16 +#: contrib/localflavor/no/forms.py:12 +msgid "Enter a zip code in the format XXXX." +msgstr "Unesite poštanski broj u formatu XXXX." + +#: contrib/localflavor/at/forms.py:48 +msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format." +msgstr "" +"Unesite važeći austrijski broj socijalnog osiguranja u formatu XXXX XXXXXX." + +#: contrib/localflavor/au/forms.py:16 +msgid "Enter a 4 digit post code." +msgstr "Unesite četvorocifreni poštanski broj" + +#: contrib/localflavor/br/forms.py:21 +msgid "Enter a zip code in the format XXXXX-XXX." +msgstr "Unesite poštanski broj u formatu XXXXX-XXX." + +#: contrib/localflavor/br/forms.py:30 +msgid "Phone numbers must be in XX-XXXX-XXXX format." +msgstr "Broj telefona mora biti u formatu XX-XXXX-XXXX." + +#: contrib/localflavor/br/forms.py:58 +msgid "" +"Select a valid brazilian state. That state is not one of the available " +"states." +msgstr "Odaberite postojeću brazilsku državu. Ta država nije među ponuđenima." + +#: contrib/localflavor/br/forms.py:94 +msgid "Invalid CPF number." +msgstr "Nevažeći CPF broj" + +#: contrib/localflavor/br/forms.py:95 +msgid "This field requires at most 11 digits or 14 characters." +msgstr "" + +#: contrib/localflavor/br/forms.py:134 +msgid "Invalid CNPJ number." +msgstr "" + +#: contrib/localflavor/br/forms.py:136 +msgid "This field requires at least 14 digits" +msgstr "" + +#: contrib/localflavor/ca/forms.py:17 +msgid "Enter a postal code in the format XXX XXX." +msgstr "" + +#: contrib/localflavor/ca/forms.py:88 +msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:5 +msgid "Aargau" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:6 +msgid "Appenzell Innerrhoden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:7 +msgid "Appenzell Ausserrhoden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:8 +msgid "Basel-Stadt" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:9 +msgid "Basel-Land" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:10 +msgid "Berne" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:11 +msgid "Fribourg" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:12 +msgid "Geneva" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:13 +msgid "Glarus" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:14 +msgid "Graubuenden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:15 +msgid "Jura" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:16 +msgid "Lucerne" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:17 +msgid "Neuchatel" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:18 +msgid "Nidwalden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:19 +msgid "Obwalden" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:20 +msgid "Schaffhausen" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:21 +msgid "Schwyz" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:22 +msgid "Solothurn" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:23 +msgid "St. Gallen" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:24 +msgid "Thurgau" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:25 +msgid "Ticino" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:26 +msgid "Uri" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:27 +msgid "Valais" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:28 +msgid "Vaud" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:29 +msgid "Zug" +msgstr "" + +#: contrib/localflavor/ch/ch_states.py:30 +msgid "Zurich" +msgstr "" + +#: contrib/localflavor/ch/forms.py:64 +msgid "" +"Enter a valid Swiss identity or passport card number in X1234567<0 or " +"1234567890 format." +msgstr "" + +#: contrib/localflavor/cl/forms.py:29 +msgid "Enter a valid Chilean RUT." +msgstr "" + +#: contrib/localflavor/cl/forms.py:30 +msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X." +msgstr "" + +#: contrib/localflavor/cl/forms.py:31 +msgid "The Chilean RUT is not valid." +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:8 +msgid "Prague" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:9 +msgid "Central Bohemian Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:10 +msgid "South Bohemian Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:11 +msgid "Pilsen Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:12 +msgid "Carlsbad Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:13 +msgid "Usti Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:14 +msgid "Liberec Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:15 +msgid "Hradec Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:16 +msgid "Pardubice Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:17 +msgid "Vysocina Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:18 +msgid "South Moravian Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:19 +msgid "Olomouc Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:20 +msgid "Zlin Region" +msgstr "" + +#: contrib/localflavor/cz/cz_regions.py:21 +msgid "Moravian-Silesian Region" +msgstr "" + +#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "" + +#: contrib/localflavor/cz/forms.py:47 +msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX." +msgstr "" + +#: contrib/localflavor/cz/forms.py:48 +msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'" +msgstr "" + +#: contrib/localflavor/cz/forms.py:49 +msgid "Enter a valid birth number." +msgstr "" + +#: contrib/localflavor/cz/forms.py:106 +msgid "Enter a valid IC number." +msgstr "" + +#: contrib/localflavor/de/de_states.py:5 +msgid "Baden-Wuerttemberg" +msgstr "" + +#: contrib/localflavor/de/de_states.py:6 +msgid "Bavaria" +msgstr "" + +#: contrib/localflavor/de/de_states.py:7 +msgid "Berlin" +msgstr "" + +#: contrib/localflavor/de/de_states.py:8 +msgid "Brandenburg" +msgstr "" + +#: contrib/localflavor/de/de_states.py:9 +msgid "Bremen" +msgstr "" + +#: contrib/localflavor/de/de_states.py:10 +msgid "Hamburg" +msgstr "" + +#: contrib/localflavor/de/de_states.py:11 +msgid "Hessen" +msgstr "" + +#: contrib/localflavor/de/de_states.py:12 +msgid "Mecklenburg-Western Pomerania" +msgstr "" + +#: contrib/localflavor/de/de_states.py:13 +msgid "Lower Saxony" +msgstr "" + +#: contrib/localflavor/de/de_states.py:14 +msgid "North Rhine-Westphalia" +msgstr "" + +#: contrib/localflavor/de/de_states.py:15 +msgid "Rhineland-Palatinate" +msgstr "" + +#: contrib/localflavor/de/de_states.py:16 +msgid "Saarland" +msgstr "" + +#: contrib/localflavor/de/de_states.py:17 +msgid "Saxony" +msgstr "" + +#: contrib/localflavor/de/de_states.py:18 +msgid "Saxony-Anhalt" +msgstr "" + +#: contrib/localflavor/de/de_states.py:19 +msgid "Schleswig-Holstein" +msgstr "" + +#: contrib/localflavor/de/de_states.py:20 +msgid "Thuringia" +msgstr "" + +#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 +#: contrib/localflavor/fr/forms.py:15 +msgid "Enter a zip code in the format XXXXX." +msgstr "" + +#: contrib/localflavor/de/forms.py:41 +msgid "" +"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " +"format." +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:5 +msgid "Arava" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:6 +msgid "Albacete" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:7 +msgid "Alacant" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:8 +msgid "Almeria" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:9 +msgid "Avila" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:10 +msgid "Badajoz" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:11 +msgid "Illes Balears" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:12 +msgid "Barcelona" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:13 +msgid "Burgos" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:14 +msgid "Caceres" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:15 +msgid "Cadiz" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:16 +msgid "Castello" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:17 +msgid "Ciudad Real" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:18 +msgid "Cordoba" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:19 +msgid "A Coruna" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:20 +msgid "Cuenca" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:21 +msgid "Girona" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:22 +msgid "Granada" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:23 +msgid "Guadalajara" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:24 +msgid "Guipuzkoa" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:25 +msgid "Huelva" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:26 +msgid "Huesca" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:27 +msgid "Jaen" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:28 +msgid "Leon" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:29 +msgid "Lleida" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:30 +#: contrib/localflavor/es/es_regions.py:17 +msgid "La Rioja" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:31 +msgid "Lugo" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:32 +#: contrib/localflavor/es/es_regions.py:18 +msgid "Madrid" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:33 +msgid "Malaga" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:34 +msgid "Murcia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:35 +msgid "Navarre" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:36 +msgid "Ourense" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:37 +msgid "Asturias" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:38 +msgid "Palencia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:39 +msgid "Las Palmas" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:40 +msgid "Pontevedra" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:41 +msgid "Salamanca" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:42 +msgid "Santa Cruz de Tenerife" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:43 +#: contrib/localflavor/es/es_regions.py:11 +msgid "Cantabria" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:44 +msgid "Segovia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:45 +msgid "Seville" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:46 +msgid "Soria" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:47 +msgid "Tarragona" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:48 +msgid "Teruel" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:49 +msgid "Toledo" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:50 +msgid "Valencia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:51 +msgid "Valladolid" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:52 +msgid "Bizkaia" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:53 +msgid "Zamora" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:54 +msgid "Zaragoza" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:55 +msgid "Ceuta" +msgstr "" + +#: contrib/localflavor/es/es_provinces.py:56 +msgid "Melilla" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:5 +msgid "Andalusia" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:6 +msgid "Aragon" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:7 +msgid "Principality of Asturias" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:8 +msgid "Balearic Islands" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:9 +msgid "Basque Country" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:10 +msgid "Canary Islands" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:12 +msgid "Castile-La Mancha" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:13 +msgid "Castile and Leon" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:14 +msgid "Catalonia" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:15 +msgid "Extremadura" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:16 +msgid "Galicia" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:19 +msgid "Region of Murcia" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:20 +msgid "Foral Community of Navarre" +msgstr "" + +#: contrib/localflavor/es/es_regions.py:21 +msgid "Valencian Community" +msgstr "" + +#: contrib/localflavor/es/forms.py:19 +msgid "Enter a valid postal code in the range and format 01XXX - 52XXX." +msgstr "" + +#: contrib/localflavor/es/forms.py:39 +msgid "" +"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or " +"9XXXXXXXX." +msgstr "" + +#: contrib/localflavor/es/forms.py:66 +msgid "Please enter a valid NIF, NIE, or CIF." +msgstr "" + +#: contrib/localflavor/es/forms.py:67 +msgid "Please enter a valid NIF or NIE." +msgstr "" + +#: contrib/localflavor/es/forms.py:68 +msgid "Invalid checksum for NIF." +msgstr "" + +#: contrib/localflavor/es/forms.py:69 +msgid "Invalid checksum for NIE." +msgstr "" + +#: contrib/localflavor/es/forms.py:70 +msgid "Invalid checksum for CIF." +msgstr "" + +#: contrib/localflavor/es/forms.py:142 +msgid "" +"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." +msgstr "" + +#: contrib/localflavor/es/forms.py:143 +msgid "Invalid checksum for bank account number." +msgstr "" + +#: contrib/localflavor/fi/forms.py:28 +msgid "Enter a valid Finnish social security number." +msgstr "" + +#: contrib/localflavor/in_/forms.py:14 +msgid "Enter a zip code in the format XXXXXXX." +msgstr "" + +#: contrib/localflavor/is_/forms.py:17 +msgid "" +"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." +msgstr "" + +#: contrib/localflavor/is_/forms.py:18 +msgid "The Icelandic identification number is not valid." +msgstr "" + +#: contrib/localflavor/it/forms.py:14 +msgid "Enter a valid zip code." +msgstr "" + +#: contrib/localflavor/it/forms.py:43 +msgid "Enter a valid Social Security number." +msgstr "" + +#: contrib/localflavor/it/forms.py:68 +msgid "Enter a valid VAT number." +msgstr "" + +#: contrib/localflavor/jp/forms.py:16 +msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX." +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:4 +msgid "Hokkaido" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:5 +msgid "Aomori" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:6 +msgid "Iwate" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:7 +msgid "Miyagi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:8 +msgid "Akita" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:9 +msgid "Yamagata" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:10 +msgid "Fukushima" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:11 +msgid "Ibaraki" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:12 +msgid "Tochigi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:13 +msgid "Gunma" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:14 +msgid "Saitama" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:15 +msgid "Chiba" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:16 +msgid "Tokyo" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:17 +msgid "Kanagawa" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:18 +msgid "Yamanashi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:19 +msgid "Nagano" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:20 +msgid "Niigata" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:21 +msgid "Toyama" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:22 +msgid "Ishikawa" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:23 +msgid "Fukui" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:24 +msgid "Gifu" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:25 +msgid "Shizuoka" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:26 +msgid "Aichi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:27 +msgid "Mie" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:28 +msgid "Shiga" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:29 +msgid "Kyoto" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:30 +msgid "Osaka" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:31 +msgid "Hyogo" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:32 +msgid "Nara" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:33 +msgid "Wakayama" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:34 +msgid "Tottori" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:35 +msgid "Shimane" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:36 +msgid "Okayama" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:37 +msgid "Hiroshima" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:38 +msgid "Yamaguchi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:39 +msgid "Tokushima" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:40 +msgid "Kagawa" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:41 +msgid "Ehime" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:42 +msgid "Kochi" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:43 +msgid "Fukuoka" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:44 +msgid "Saga" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:45 +msgid "Nagasaki" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:46 +msgid "Kumamoto" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:47 +msgid "Oita" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:48 +msgid "Miyazaki" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:49 +msgid "Kagoshima" +msgstr "" + +#: contrib/localflavor/jp/jp_prefectures.py:50 +msgid "Okinawa" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:12 +msgid "Aguascalientes" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:13 +msgid "Baja California" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:14 +msgid "Baja California Sur" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:15 +msgid "Campeche" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:16 +msgid "Chihuahua" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:17 +msgid "Chiapas" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:18 +msgid "Coahuila" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:19 +msgid "Colima" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:20 +msgid "Distrito Federal" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:21 +msgid "Durango" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:22 +msgid "Guerrero" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:23 +msgid "Guanajuato" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:24 +msgid "Hidalgo" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:25 +msgid "Jalisco" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:26 +msgid "Estado de México" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:27 +msgid "Michoacán" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:28 +msgid "Morelos" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:29 +msgid "Nayarit" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:30 +msgid "Nuevo León" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:31 +msgid "Oaxaca" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:32 +msgid "Puebla" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:33 +msgid "Querétaro" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:34 +msgid "Quintana Roo" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:35 +msgid "Sinaloa" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:36 +msgid "San Luis Potosí" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:37 +msgid "Sonora" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:38 +msgid "Tabasco" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:39 +msgid "Tamaulipas" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:40 +msgid "Tlaxcala" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:41 +msgid "Veracruz" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:42 +msgid "Yucatán" +msgstr "" + +#: contrib/localflavor/mx/mx_states.py:43 +msgid "Zacatecas" +msgstr "" + +#: contrib/localflavor/nl/forms.py:21 +msgid "Enter a valid postal code" +msgstr "" + +#: contrib/localflavor/nl/forms.py:52 +msgid "Enter a valid phone number" +msgstr "" + +#: contrib/localflavor/nl/forms.py:78 +msgid "Enter a valid SoFi number" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:4 +msgid "Drenthe" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:5 +msgid "Flevoland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:6 +msgid "Friesland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:7 +msgid "Gelderland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:8 +msgid "Groningen" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:9 +msgid "Limburg" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:10 +msgid "Noord-Brabant" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:11 +msgid "Noord-Holland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:12 +msgid "Overijssel" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:13 +msgid "Utrecht" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:14 +msgid "Zeeland" +msgstr "" + +#: contrib/localflavor/nl/nl_provinces.py:15 +msgid "Zuid-Holland" +msgstr "" + +#: contrib/localflavor/no/forms.py:33 +msgid "Enter a valid Norwegian social security number." +msgstr "" + +#: contrib/localflavor/pe/forms.py:24 +msgid "This field requires 8 digits." +msgstr "" + +#: contrib/localflavor/pe/forms.py:52 +msgid "This field requires 11 digits." +msgstr "" + +#: contrib/localflavor/pl/forms.py:38 +msgid "National Identification Number consists of 11 digits." +msgstr "" + +#: contrib/localflavor/pl/forms.py:39 +msgid "Wrong checksum for the National Identification Number." +msgstr "" + +#: contrib/localflavor/pl/forms.py:71 +msgid "" +"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." +msgstr "" + +#: contrib/localflavor/pl/forms.py:72 +msgid "Wrong checksum for the Tax Number (NIP)." +msgstr "" + +#: contrib/localflavor/pl/forms.py:109 +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." +msgstr "" + +#: contrib/localflavor/pl/forms.py:110 +msgid "Wrong checksum for the National Business Register Number (REGON)." +msgstr "" + +#: contrib/localflavor/pl/forms.py:148 +msgid "Enter a postal code in the format XX-XXX." +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:8 +msgid "Lower Silesia" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:9 +msgid "Kuyavia-Pomerania" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:10 +msgid "Lublin" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:11 +msgid "Lubusz" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:12 +msgid "Lodz" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:13 +msgid "Lesser Poland" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:14 +msgid "Masovia" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:15 +msgid "Opole" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:16 +msgid "Subcarpatia" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:17 +msgid "Podlasie" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:18 +msgid "Pomerania" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:19 +msgid "Silesia" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:20 +msgid "Swietokrzyskie" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:21 +msgid "Warmia-Masuria" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:22 +msgid "Greater Poland" +msgstr "" + +#: contrib/localflavor/pl/pl_voivodeships.py:23 +msgid "West Pomerania" +msgstr "" + +#: contrib/localflavor/ro/forms.py:19 +msgid "Enter a valid CIF." +msgstr "" + +#: contrib/localflavor/ro/forms.py:56 +msgid "Enter a valid CNP." +msgstr "" + +#: contrib/localflavor/ro/forms.py:141 +msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format" +msgstr "" + +#: contrib/localflavor/ro/forms.py:171 +msgid "Phone numbers must be in XXXX-XXXXXX format." +msgstr "" + +#: contrib/localflavor/ro/forms.py:194 +msgid "Enter a valid postal code in the format XXXXXX" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:8 +msgid "Banska Bystrica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:9 +msgid "Banska Stiavnica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:10 +msgid "Bardejov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:11 +msgid "Banovce nad Bebravou" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:12 +msgid "Brezno" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:13 +msgid "Bratislava I" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:14 +msgid "Bratislava II" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:15 +msgid "Bratislava III" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:16 +msgid "Bratislava IV" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:17 +msgid "Bratislava V" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:18 +msgid "Bytca" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:19 +msgid "Cadca" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:20 +msgid "Detva" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:21 +msgid "Dolny Kubin" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:22 +msgid "Dunajska Streda" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:23 +msgid "Galanta" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:24 +msgid "Gelnica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:25 +msgid "Hlohovec" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:26 +msgid "Humenne" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:27 +msgid "Ilava" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:28 +msgid "Kezmarok" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:29 +msgid "Komarno" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:30 +msgid "Kosice I" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:31 +msgid "Kosice II" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:32 +msgid "Kosice III" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:33 +msgid "Kosice IV" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:34 +msgid "Kosice - okolie" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:35 +msgid "Krupina" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:36 +msgid "Kysucke Nove Mesto" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:37 +msgid "Levice" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:38 +msgid "Levoca" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:39 +msgid "Liptovsky Mikulas" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:40 +msgid "Lucenec" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:41 +msgid "Malacky" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:42 +msgid "Martin" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:43 +msgid "Medzilaborce" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:44 +msgid "Michalovce" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:45 +msgid "Myjava" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:46 +msgid "Namestovo" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:47 +msgid "Nitra" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:48 +msgid "Nove Mesto nad Vahom" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:49 +msgid "Nove Zamky" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:50 +msgid "Partizanske" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:51 +msgid "Pezinok" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:52 +msgid "Piestany" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:53 +msgid "Poltar" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:54 +msgid "Poprad" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:55 +msgid "Povazska Bystrica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:56 +msgid "Presov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:57 +msgid "Prievidza" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:58 +msgid "Puchov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:59 +msgid "Revuca" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:60 +msgid "Rimavska Sobota" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:61 +msgid "Roznava" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:62 +msgid "Ruzomberok" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:63 +msgid "Sabinov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:64 +msgid "Senec" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:65 +msgid "Senica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:66 +msgid "Skalica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:67 +msgid "Snina" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:68 +msgid "Sobrance" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:69 +msgid "Spisska Nova Ves" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:70 +msgid "Stara Lubovna" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:71 +msgid "Stropkov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:72 +msgid "Svidnik" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:73 +msgid "Sala" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:74 +msgid "Topolcany" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:75 +msgid "Trebisov" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:76 +msgid "Trencin" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:77 +msgid "Trnava" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:78 +msgid "Turcianske Teplice" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:79 +msgid "Tvrdosin" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:80 +msgid "Velky Krtis" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:81 +msgid "Vranov nad Toplou" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:82 +msgid "Zlate Moravce" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:83 +msgid "Zvolen" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:84 +msgid "Zarnovica" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:85 +msgid "Ziar nad Hronom" +msgstr "" + +#: contrib/localflavor/sk/sk_districts.py:86 +msgid "Zilina" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:8 +msgid "Banska Bystrica region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:9 +msgid "Bratislava region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:10 +msgid "Kosice region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:11 +msgid "Nitra region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:12 +msgid "Presov region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:13 +msgid "Trencin region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:14 +msgid "Trnava region" +msgstr "" + +#: contrib/localflavor/sk/sk_regions.py:15 +msgid "Zilina region" +msgstr "" + +#: contrib/localflavor/uk/forms.py:21 +msgid "Enter a valid postcode." +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:11 +msgid "Bedfordshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:12 +msgid "Buckinghamshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:14 +msgid "Cheshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:15 +msgid "Cornwall and Isles of Scilly" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:16 +msgid "Cumbria" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:17 +msgid "Derbyshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:18 +msgid "Devon" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:19 +msgid "Dorset" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:20 +msgid "Durham" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:21 +msgid "East Sussex" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:22 +msgid "Essex" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:23 +msgid "Gloucestershire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:24 +msgid "Greater London" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:25 +msgid "Greater Manchester" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:26 +msgid "Hampshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:27 +msgid "Hertfordshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:28 +msgid "Kent" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:29 +msgid "Lancashire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:30 +msgid "Leicestershire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:31 +msgid "Lincolnshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:32 +msgid "Merseyside" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:33 +msgid "Norfolk" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:34 +msgid "North Yorkshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:35 +msgid "Northamptonshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:36 +msgid "Northumberland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:37 +msgid "Nottinghamshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:38 +msgid "Oxfordshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:39 +msgid "Shropshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:40 +msgid "Somerset" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:41 +msgid "South Yorkshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:42 +msgid "Staffordshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:43 +msgid "Suffolk" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:44 +msgid "Surrey" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:45 +msgid "Tyne and Wear" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:46 +msgid "Warwickshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:47 +msgid "West Midlands" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:48 +msgid "West Sussex" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:49 +msgid "West Yorkshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:50 +msgid "Wiltshire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:51 +msgid "Worcestershire" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:55 +msgid "County Antrim" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:56 +msgid "County Armagh" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:57 +msgid "County Down" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:58 +msgid "County Fermanagh" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:59 +msgid "County Londonderry" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:60 +msgid "County Tyrone" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:64 +msgid "Clwyd" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:65 +msgid "Dyfed" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:66 +msgid "Gwent" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:67 +msgid "Gwynedd" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:68 +msgid "Mid Glamorgan" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:69 +msgid "Powys" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:70 +msgid "South Glamorgan" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:71 +msgid "West Glamorgan" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:75 +msgid "Borders" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:76 +msgid "Central Scotland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:77 +msgid "Dumfries and Galloway" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:78 +msgid "Fife" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:79 +msgid "Grampian" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:80 +msgid "Highland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:81 +msgid "Lothian" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:82 +msgid "Orkney Islands" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:83 +msgid "Shetland Islands" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:84 +msgid "Strathclyde" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:85 +msgid "Tayside" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:86 +msgid "Western Isles" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:90 +msgid "England" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:91 +msgid "Northern Ireland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:92 +msgid "Scotland" +msgstr "" + +#: contrib/localflavor/uk/uk_regions.py:93 +msgid "Wales" +msgstr "" + +#: contrib/localflavor/us/forms.py:16 +msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." +msgstr "" + +#: contrib/localflavor/us/forms.py:54 +msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." +msgstr "" + +#: contrib/localflavor/za/forms.py:20 +msgid "Enter a valid South African ID number" +msgstr "" + +#: contrib/localflavor/za/forms.py:54 +msgid "Enter a valid South African postal code" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:4 +msgid "Eastern Cape" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:5 +msgid "Free State" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:6 +msgid "Gauteng" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:7 +msgid "KwaZulu-Natal" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:8 +msgid "Limpopo" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:9 +msgid "Mpumalanga" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:10 +msgid "Northern Cape" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:11 +msgid "North West" +msgstr "" + +#: contrib/localflavor/za/za_provinces.py:12 +msgid "Western Cape" +msgstr "" + +#: contrib/redirects/models.py:7 +msgid "redirect from" +msgstr "preusmeren sa" + +#: contrib/redirects/models.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Ovo mora biti apsolutna putanja bez imena domena. Na primer: '/events/" +"search/'." + +#: contrib/redirects/models.py:9 +msgid "redirect to" +msgstr "preusmeri ka" + +#: contrib/redirects/models.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Ovo može biti ili apsolutna putanja (kao gore) ili pun URL koji počinje sa " +"'http://'." + +#: contrib/redirects/models.py:13 +msgid "redirect" +msgstr "preusmeravanje" + +#: contrib/redirects/models.py:14 +msgid "redirects" +msgstr "preusmeravanja" + +#: contrib/sessions/models.py:45 +msgid "session key" +msgstr "ključ sesije" + +#: contrib/sessions/models.py:47 +msgid "session data" +msgstr "podaci sesije" + +#: contrib/sessions/models.py:48 +msgid "expire date" +msgstr "datum zastarevanja" + +#: contrib/sessions/models.py:53 +msgid "session" +msgstr "sesija" + +#: contrib/sessions/models.py:54 +msgid "sessions" +msgstr "sesije" + +#: contrib/sites/models.py:32 +msgid "domain name" +msgstr "ime domena" + +#: contrib/sites/models.py:33 +msgid "display name" +msgstr "prikazano ime" + +#: contrib/sites/models.py:39 +msgid "sites" +msgstr "sajtovi" + +#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710 +msgid "This value must be an integer." +msgstr "Ova vrednost mora biti celobrojna." + +#: db/models/fields/__init__.py:388 +msgid "This value must be either True or False." +msgstr "Ova vrednost mora biti True ili False." + +#: db/models/fields/__init__.py:427 +msgid "This field cannot be null." +msgstr "Ovo polje ne može ostati prazno." + +#: db/models/fields/__init__.py:443 +msgid "Enter only digits separated by commas." +msgstr "Unesite samo brojke razdvojene zapetama." + +#: db/models/fields/__init__.py:474 +msgid "Enter a valid date in YYYY-MM-DD format." +msgstr "Unesite ispravan datum u formatu GGGG-MM-DD." + +#: db/models/fields/__init__.py:483 +#, python-format +msgid "Invalid date: %s" +msgstr "Neispravan datum: %s" + +#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565 +msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format." +msgstr "Unesite ispravan datum/vreme u formatu GGGG-MM-DD ČČ:MM[:ss[.uuuuuu]." + +#: db/models/fields/__init__.py:601 +msgid "This value must be a decimal number." +msgstr "Ova vrednost mora biti decimalni broj" + +#: db/models/fields/__init__.py:686 +msgid "This value must be a float." +msgstr "Ova vrednost mora biti broj sa klizećom zapetom" + +#: db/models/fields/__init__.py:746 +msgid "This value must be either None, True or False." +msgstr "Ova vrednost mora biti ili None, ili True, ili False." + +#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863 +msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format." +msgstr "Unesite ispravno vreme u formatu ČČ:MM[:ss[.uuuuuu]]." + +#: db/models/fields/related.py:792 +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." + +#: db/models/fields/related.py:870 +#, python-format +msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." +msgid_plural "" +"Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgstr[0] "Unesite ispravan %(self)s IDs. Vrednost %(value)r je neispravna." +msgstr[1] "Unesite ispravan %(self)s IDs. Vrednosti %(value)r su neispravne." +msgstr[2] "Unesite ispravan %(self)s IDs. Vrednosti %(value)r su neispravne." + +#: forms/fields.py:54 +msgid "This field is required." +msgstr "Ovo polje se mora popuniti." + +#: forms/fields.py:55 +msgid "Enter a valid value." +msgstr "Unesite ispravnu vrednost." + +#: forms/fields.py:138 +#, python-format +msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." +msgstr "" +"Ovo polje mora sadržati najviše %(max)d slovnih mesta (trenutno ima %(length)" +"d)." + +#: forms/fields.py:139 +#, python-format +msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." +msgstr "" +"Ovo polje mora sadržati najmanje %(min)d slovnih mesta (trenutno ima %(length)" +"d." + +#: forms/fields.py:166 +msgid "Enter a whole number." +msgstr "Unesite ceo broj." + +#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225 +#, python-format +msgid "Ensure this value is less than or equal to %s." +msgstr "Ova vrednost mora da bude manja od %s ili tačno toliko." + +#: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226 +#, python-format +msgid "Ensure this value is greater than or equal to %s." +msgstr "Ova vrednost mora biti veća od %s ili tačno toliko." + +#: forms/fields.py:195 forms/fields.py:224 +msgid "Enter a number." +msgstr "Unesite broj." + +#: forms/fields.py:227 +#, 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:228 +#, 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:229 +#, 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:288 forms/fields.py:863 +msgid "Enter a valid date." +msgstr "Unesite ispravan datum." + +#: forms/fields.py:322 forms/fields.py:864 +msgid "Enter a valid time." +msgstr "Unesite ispravno vreme" + +#: forms/fields.py:361 +msgid "Enter a valid date/time." +msgstr "Unesite ispravan datum/vreme." + +#: forms/fields.py:447 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "Fajl nije prebačen. Proverite tip enkodiranja formulara." + +#: forms/fields.py:448 +msgid "No file was submitted." +msgstr "Fajl nije prebačen." + +#: forms/fields.py:449 +msgid "The submitted file is empty." +msgstr "Prebačen fajl je prazan." + +#: forms/fields.py:450 +#, 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)." + +#: forms/fields.py:483 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Prebacite ispravan fajl. Fajl koji je prebačen ili nije slika, ili je " +"oštećen." + +#: forms/fields.py:544 +msgid "Enter a valid URL." +msgstr "Unesite ispravan URL." + +#: forms/fields.py:545 +msgid "This URL appears to be a broken link." +msgstr "Ovaj URL izgleda ne vodi nikuda." + +#: forms/fields.py:625 forms/fields.py:703 +#, 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:704 forms/fields.py:765 forms/models.py:962 +msgid "Enter a list of values." +msgstr "Unesite listu vrednosti." + +#: forms/fields.py:892 +msgid "Enter a valid IPv4 address." +msgstr "Unesite ispravnu IPv4 adresu." + +#: forms/fields.py:902 +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." + +#: forms/formsets.py:271 forms/formsets.py:273 +msgid "Order" +msgstr "Redosled" + +#: forms/models.py:367 +#, 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." + +#: forms/models.py:381 forms/models.py:389 +#, 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." + +#: forms/models.py:581 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "Ispravite dupliran sadržaj za polja: %(field)s." + +#: forms/models.py:585 +#, 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:591 +#, 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 "" +"Ispravite dupliran sadržaj za polja: %(field_name)s, koji mora da bude " +"jedinstven za %(lookup)s u %(date_field)s." + +#: forms/models.py:599 +msgid "Please correct the duplicate values below." +msgstr "Ispravite duplirane vrednosti dole." + +#: forms/models.py:837 +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:892 +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:963 +#, 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:965 +#, python-format +msgid "\"%s\" is not a valid value for a primary key." +msgstr "„%s“ nije ispravna vrednost za primarni ključ." + +#: template/defaultfilters.py:767 +msgid "yes,no,maybe" +msgstr "da,ne,možda" + +#: template/defaultfilters.py:798 +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "%(size)d bajt" +msgstr[1] "%(size)d bajta" +msgstr[2] "%(size)d bajtova" + +#: template/defaultfilters.py:800 +#, python-format +msgid "%.1f KB" +msgstr "%.1f KB" + +#: template/defaultfilters.py:802 +#, python-format +msgid "%.1f MB" +msgstr "%.1f MB" + +#: template/defaultfilters.py:803 +#, python-format +msgid "%.1f GB" +msgstr "%.1f GB" + +#: utils/dateformat.py:42 +msgid "p.m." +msgstr "po p." + +#: utils/dateformat.py:43 +msgid "a.m." +msgstr "pre p." + +#: utils/dateformat.py:48 +msgid "PM" +msgstr "PM" + +#: utils/dateformat.py:49 +msgid "AM" +msgstr "AM" + +#: utils/dateformat.py:98 +msgid "midnight" +msgstr "ponoć" + +#: utils/dateformat.py:100 +msgid "noon" +msgstr "podne" + +#: utils/dates.py:6 +msgid "Monday" +msgstr "ponedeljak" + +#: utils/dates.py:6 +msgid "Tuesday" +msgstr "utorak" + +#: utils/dates.py:6 +msgid "Wednesday" +msgstr "sreda" + +#: utils/dates.py:6 +msgid "Thursday" +msgstr "četvrtak" + +#: utils/dates.py:6 +msgid "Friday" +msgstr "petak" + +#: utils/dates.py:7 +msgid "Saturday" +msgstr "subota" + +#: utils/dates.py:7 +msgid "Sunday" +msgstr "nedelja" + +#: utils/dates.py:10 +msgid "Mon" +msgstr "pon." + +#: utils/dates.py:10 +msgid "Tue" +msgstr "uto." + +#: utils/dates.py:10 +msgid "Wed" +msgstr "sre." + +#: utils/dates.py:10 +msgid "Thu" +msgstr "čet." + +#: utils/dates.py:10 +msgid "Fri" +msgstr "pet." + +#: utils/dates.py:11 +msgid "Sat" +msgstr "sub." + +#: utils/dates.py:11 +msgid "Sun" +msgstr "ned." + +#: utils/dates.py:18 +msgid "January" +msgstr "januar" + +#: utils/dates.py:18 +msgid "February" +msgstr "februar" + +#: utils/dates.py:18 utils/dates.py:31 +msgid "March" +msgstr "mart" + +#: utils/dates.py:18 utils/dates.py:31 +msgid "April" +msgstr "april" + +#: utils/dates.py:18 utils/dates.py:31 +msgid "May" +msgstr "maj" + +#: utils/dates.py:18 utils/dates.py:31 +msgid "June" +msgstr "jun" + +#: utils/dates.py:19 utils/dates.py:31 +msgid "July" +msgstr "jul" + +#: utils/dates.py:19 +msgid "August" +msgstr "avgust" + +#: utils/dates.py:19 +msgid "September" +msgstr "septembar" + +#: utils/dates.py:19 +msgid "October" +msgstr "oktobar" + +#: utils/dates.py:19 +msgid "November" +msgstr "novembar" + +#: utils/dates.py:20 +msgid "December" +msgstr "decembar" + +#: utils/dates.py:23 +msgid "jan" +msgstr "jan." + +#: utils/dates.py:23 +msgid "feb" +msgstr "feb." + +#: utils/dates.py:23 +msgid "mar" +msgstr "mar." + +#: utils/dates.py:23 +msgid "apr" +msgstr "apr." + +#: utils/dates.py:23 +msgid "may" +msgstr "maj." + +#: utils/dates.py:23 +msgid "jun" +msgstr "jun." + +#: utils/dates.py:24 +msgid "jul" +msgstr "jul." + +#: utils/dates.py:24 +msgid "aug" +msgstr "aug." + +#: utils/dates.py:24 +msgid "sep" +msgstr "sep." + +#: utils/dates.py:24 +msgid "oct" +msgstr "okt." + +#: utils/dates.py:24 +msgid "nov" +msgstr "nov." + +#: utils/dates.py:24 +msgid "dec" +msgstr "dec." + +#: utils/dates.py:31 +msgid "Jan." +msgstr "jan." + +#: utils/dates.py:31 +msgid "Feb." +msgstr "beb." + +#: utils/dates.py:32 +msgid "Aug." +msgstr "aug." + +#: utils/dates.py:32 +msgid "Sept." +msgstr "sept." + +#: utils/dates.py:32 +msgid "Oct." +msgstr "okt." + +#: utils/dates.py:32 +msgid "Nov." +msgstr "nov." + +#: utils/dates.py:32 +msgid "Dec." +msgstr "dec." + +#: utils/text.py:128 +msgid "or" +msgstr "ili" + +#: utils/timesince.py:21 +msgid "year" +msgid_plural "years" +msgstr[0] "godina" +msgstr[1] "godine" +msgstr[2] "godina" + +#: utils/timesince.py:22 +msgid "month" +msgid_plural "months" +msgstr[0] "mesec" +msgstr[1] "meseca" +msgstr[2] "meseci" + +#: utils/timesince.py:23 +msgid "week" +msgid_plural "weeks" +msgstr[0] "nedelja" +msgstr[1] "nedelje" +msgstr[2] "nedelja" + +#: utils/timesince.py:24 +msgid "day" +msgid_plural "days" +msgstr[0] "dan" +msgstr[1] "dana" +msgstr[2] "dana" + +#: utils/timesince.py:25 +msgid "hour" +msgid_plural "hours" +msgstr[0] "sat" +msgstr[1] "sata" +msgstr[2] "sati" + +#: utils/timesince.py:26 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "minut" +msgstr[1] "minuta" +msgstr[2] "minuta" + +#: utils/timesince.py:45 +msgid "minutes" +msgstr "minuta" + +#: utils/timesince.py:50 +#, python-format +msgid "%(number)d %(type)s" +msgstr "%(number)d %(type)s" + +#: utils/timesince.py:56 +#, python-format +msgid ", %(number)d %(type)s" +msgstr ", %(number)d %(type)s" + +#: utils/translation/trans_real.py:399 +msgid "DATE_FORMAT" +msgstr "j. N Y." + +#: utils/translation/trans_real.py:401 +msgid "TIME_FORMAT" +msgstr "G:i" + +#: utils/translation/trans_real.py:417 +msgid "YEAR_MONTH_FORMAT" +msgstr "F Y." + +#: utils/translation/trans_real.py:418 +msgid "MONTH_DAY_FORMAT" +msgstr "j. F" + +#: views/generic/create_update.py:114 +#, python-format +msgid "The %(verbose_name)s was created successfully." +msgstr "%(verbose_name)s je uspešno kreiran." + +#: views/generic/create_update.py:156 +#, python-format +msgid "The %(verbose_name)s was updated successfully." +msgstr "%(verbose_name)s je uspešno ažuriran." + +#: views/generic/create_update.py:198 +#, python-format +msgid "The %(verbose_name)s was deleted." +msgstr "%(verbose_name)s je obrisan." diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo b/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo new file mode 100644 index 0000000000..c893429a85 Binary files /dev/null and b/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po b/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po new file mode 100644 index 0000000000..1394e1be0c --- /dev/null +++ b/django/conf/locale/sr_Latn/LC_MESSAGES/djangojs.po @@ -0,0 +1,120 @@ +# This file is distributed under the same license as the Django package. +# +msgid "" +msgstr "" +"Project-Id-Version: Django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-03-30 14:00+0200\n" +"PO-Revision-Date: 2009-03-30 14:04+0200\n" +"Last-Translator: Janos Guljas \n" +"Language-Team: Branko Vukelic & Janos Guljas " +" & Nesh & Petar \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: contrib/admin/media/js/SelectFilter2.js:33 +#, perl-format +msgid "Available %s" +msgstr "Dostupni %s" + +#: contrib/admin/media/js/SelectFilter2.js:41 +msgid "Choose all" +msgstr "Dodaj sve" + +#: contrib/admin/media/js/SelectFilter2.js:46 +msgid "Add" +msgstr "Dodaj" + +#: contrib/admin/media/js/SelectFilter2.js:48 +msgid "Remove" +msgstr "Ukloni" + +#: contrib/admin/media/js/SelectFilter2.js:53 +#, perl-format +msgid "Chosen %s" +msgstr "Odabrani %s" + +#: contrib/admin/media/js/SelectFilter2.js:54 +msgid "Select your choice(s) and click " +msgstr "Napravite izbor i kliknite " + +#: contrib/admin/media/js/SelectFilter2.js:59 +msgid "Clear all" +msgstr "Vrati sve" + +#: contrib/admin/media/js/calendar.js:24 +#: contrib/admin/media/js/dateparse.js:32 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"januar februar mart april maj jun jul avgust septembar oktobar novembar " +"decembar" + +#: contrib/admin/media/js/calendar.js:25 +msgid "S M T W T F S" +msgstr "N P U S Č P S" + +#: contrib/admin/media/js/dateparse.js:33 +msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" +msgstr "nedelja ponedeljak utorak sreda četvrtak petak subota" + +#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34 +#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72 +msgid "Show" +msgstr "Pokaži" + +#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63 +msgid "Hide" +msgstr "Sakrij" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 +msgid "Now" +msgstr "Trenutno vreme" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51 +msgid "Clock" +msgstr "Sat" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78 +msgid "Choose a time" +msgstr "Odabir vremena" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82 +msgid "Midnight" +msgstr "Ponoć" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 +msgid "6 a.m." +msgstr "18č" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84 +msgid "Noon" +msgstr "Podne" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183 +msgid "Cancel" +msgstr "Poništi" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128 +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177 +msgid "Today" +msgstr "Danas" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132 +msgid "Calendar" +msgstr "Kalendar" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175 +msgid "Yesterday" +msgstr "Juče" + +#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179 +msgid "Tomorrow" +msgstr "Sutra" diff --git a/django/conf/locale/th/LC_MESSAGES/django.mo b/django/conf/locale/th/LC_MESSAGES/django.mo index 7dce1c3fea..026ba1b1f8 100644 Binary files a/django/conf/locale/th/LC_MESSAGES/django.mo and b/django/conf/locale/th/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/th/LC_MESSAGES/django.po b/django/conf/locale/th/LC_MESSAGES/django.po index 54283660c6..fbf67de078 100644 --- a/django/conf/locale/th/LC_MESSAGES/django.po +++ b/django/conf/locale/th/LC_MESSAGES/django.po @@ -2,214 +2,215 @@ # msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: Django-1.1-rc-1\n" "Report-Msgid-Bugs-To: kowito@felspar.com\n" "POT-Creation-Date: 2008-09-02 22:36-0700\n" -"PO-Revision-Date: 2008-11-26 18:40+0700\n" +"PO-Revision-Date: 2009-07-28 22:31+0700\n" "Last-Translator: Kowit Charoenratchatabhan \n" -"Language-Team: Kowit Charoenratchatabhan,Kadsarin Sanjek, Felspar \n" +"Language-Team: Kowit Charoenratchatabhan,Kadsarin Sanjek, Felspar,Theppitak Karoonboonyanan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Thai\n" -"X-Poedit-Country: Thailand\n" +"X-Poedit-Country: THAILAND\n" "X-Poedit-SourceCharset: utf-8\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: conf/global_settings.py:44 msgid "Arabic" -msgstr "ภาษาอารบิก" +msgstr "อารบิก" #: conf/global_settings.py:45 msgid "Bengali" -msgstr "ภาษาเบงกาลี" +msgstr "เบ็งกาลี" #: conf/global_settings.py:46 msgid "Bulgarian" -msgstr "ภาษาบัลกาเรีย" +msgstr "บัลแกเรีย" #: conf/global_settings.py:47 msgid "Catalan" -msgstr "ภาษาคาตาลาน" +msgstr "คาตะลาน" #: conf/global_settings.py:48 msgid "Czech" -msgstr "ภาษาเชค" +msgstr "เช็ก" #: conf/global_settings.py:49 msgid "Welsh" -msgstr "ภาษาเวลส์" +msgstr "เวลส์" #: conf/global_settings.py:50 msgid "Danish" -msgstr "ภาษาเดนมาร์ก" +msgstr "เดนมาร์ก" #: conf/global_settings.py:51 msgid "German" -msgstr "ภาษาเยอรมัน" +msgstr "เยอรมัน" #: conf/global_settings.py:52 msgid "Greek" -msgstr "ภาษากรีก" +msgstr "กรีก" #: conf/global_settings.py:53 msgid "English" -msgstr "ภาษาอังกฤษ" +msgstr "อังกฤษ" #: conf/global_settings.py:54 msgid "Spanish" -msgstr "ภาษาสเปน" +msgstr "สเปน" #: conf/global_settings.py:55 msgid "Estonian" -msgstr "ภาษาเอสโตเนีย" +msgstr "เอสโตเนีย" #: conf/global_settings.py:56 msgid "Argentinean Spanish" -msgstr "ภาษาสเปน(อาร์เจนตินา)" +msgstr "สเปน (อาร์เจนตินา)" #: conf/global_settings.py:57 msgid "Basque" -msgstr "ภาษาบาสค์" +msgstr "แบ็ซค์" #: conf/global_settings.py:58 msgid "Persian" -msgstr "ภาษาเปอร์เชีย" +msgstr "เปอร์เชีย" #: conf/global_settings.py:59 msgid "Finnish" -msgstr "ภาษาฟินแลนด์" +msgstr "ฟินแลนด์" #: conf/global_settings.py:60 msgid "French" -msgstr "ภาษาฝรั่งเศส" +msgstr "ฝรั่งเศส" #: conf/global_settings.py:61 msgid "Irish" -msgstr "ภาษาไอร์แลนด์" +msgstr "ไอริช" #: conf/global_settings.py:62 msgid "Galician" -msgstr "ภาษากาลิเซีย" +msgstr "กาลิเซีย" #: conf/global_settings.py:63 msgid "Hungarian" -msgstr "ภาษาฮังการี" +msgstr "ฮังการี" #: conf/global_settings.py:64 msgid "Hebrew" -msgstr "ภาษาฮิบรู" +msgstr "ฮีบรู" #: conf/global_settings.py:65 msgid "Croatian" -msgstr "ภาษาโครเอเชีย" +msgstr "โครเอเชีย" #: conf/global_settings.py:66 msgid "Icelandic" -msgstr "ภาษาไอซ์แลนด์" +msgstr "ไอซ์แลนด์" #: conf/global_settings.py:67 msgid "Italian" -msgstr "ภาษาอิตาลี" +msgstr "อิตาลี" #: conf/global_settings.py:68 msgid "Japanese" -msgstr "ภาษาญี่ปุ่น" +msgstr "ญี่ปุ่น" #: conf/global_settings.py:69 msgid "Georgian" -msgstr "ภาษาจอร์เจีย" +msgstr "จอร์เจีย" #: conf/global_settings.py:70 msgid "Korean" -msgstr "ภาษาเกาหลี" +msgstr "เกาหลี" #: conf/global_settings.py:71 msgid "Khmer" -msgstr "ภาษาเขมร" +msgstr "เขมร" #: conf/global_settings.py:72 msgid "Kannada" -msgstr "ภาษาคานนาดา" +msgstr "กัณณาท" #: conf/global_settings.py:73 msgid "Latvian" -msgstr "ภาษาลัตเวีย" +msgstr "ลัตเวีย" #: conf/global_settings.py:74 msgid "Lithuanian" -msgstr "ภาษาลิทัวเนีย" +msgstr "ลิทัวเนีย" #: conf/global_settings.py:75 msgid "Macedonian" -msgstr "ภาษามาซีโดเนีย" +msgstr "มาซิโดเนีย" #: conf/global_settings.py:76 msgid "Dutch" -msgstr "ภาษาดัตช์" +msgstr "ดัตช์" #: conf/global_settings.py:77 msgid "Norwegian" -msgstr "ภาษานอร์เวย์" +msgstr "นอร์เวย์" #: conf/global_settings.py:78 msgid "Polish" -msgstr "ภาษาโปแลนด์" +msgstr "โปแลนด์" #: conf/global_settings.py:79 msgid "Portugese" -msgstr "ภาษาโปรตุเกส" +msgstr "โปรตุเกส" #: conf/global_settings.py:80 msgid "Brazilian Portuguese" -msgstr "ภาษาโปรตุเกส (บราซิล)" +msgstr "โปรตุเกส (บราซิล)" #: conf/global_settings.py:81 msgid "Romanian" -msgstr "ภาษาโรมาเนีย" +msgstr "โรมาเนีย" #: conf/global_settings.py:82 msgid "Russian" -msgstr "ภาษารัสเซีย" +msgstr "รัสเซีย" #: conf/global_settings.py:83 msgid "Slovak" -msgstr "ภาษาสโลวัค" +msgstr "สโลวัก" #: conf/global_settings.py:84 msgid "Slovenian" -msgstr "ภาษาสโลเวเนีย" +msgstr "สโลวีเนีย" #: conf/global_settings.py:85 msgid "Serbian" -msgstr "ภาษาเซอร์เบีย" +msgstr "เซอร์เบีย" #: conf/global_settings.py:86 msgid "Swedish" -msgstr "ภาษาสวีเดน" +msgstr "สวีเดน" #: conf/global_settings.py:87 msgid "Tamil" -msgstr "ภาษาทมิฬ" +msgstr "ทมิฬ" #: conf/global_settings.py:88 msgid "Telugu" -msgstr "ภาษาเตลูกู" +msgstr "เตลุคู" #: conf/global_settings.py:89 msgid "Turkish" -msgstr "ภาษาตุรกี" +msgstr "ตุรกี" #: conf/global_settings.py:90 msgid "Ukrainian" -msgstr "ภาษายูเครน" +msgstr "ยูเครน" #: conf/global_settings.py:91 msgid "Simplified Chinese" -msgstr "อักษรจีนดั้งเดิม" +msgstr "จีนตัวย่อ" #: conf/global_settings.py:92 msgid "Traditional Chinese" -msgstr "อักษรจีนสมัยใหม่" +msgstr "จีนตัวเต็ม" #: contrib/admin/filterspecs.py:44 #, python-format @@ -268,7 +269,7 @@ msgstr "เวลาลงมือ" #: contrib/admin/models.py:22 msgid "object id" -msgstr "object id" +msgstr "อ็อบเจ็กต์ไอดี" #: contrib/admin/models.py:23 msgid "object repr" @@ -309,12 +310,12 @@ msgstr "และ" #: contrib/admin/options.py:343 #, python-format msgid "Added %(name)s \"%(object)s\"." -msgstr "เพิ่ม %(name)s \"%(object)s\"." +msgstr "เพิ่ม %(name)s \"%(object)s\" แล้ว" #: contrib/admin/options.py:347 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." -msgstr "เปลี่ยน %(list)s เพื่อ %(name)s \"%(object)s\"" +msgstr "เปลี่ยน %(list)s สำหรับ %(name)s \"%(object)s\" แล้ว" #: contrib/admin/options.py:352 #, python-format @@ -329,39 +330,39 @@ msgstr "ไม่มีฟิลด์ใดถูกเปลี่ยน" #: contrib/auth/admin.py:51 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "%(name)s \"%(obj)s\" ได้ถูกเพิ่มเรียบร้อยแล้ว" +msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว" #: contrib/admin/options.py:421 #: contrib/admin/options.py:454 #: contrib/auth/admin.py:59 msgid "You may edit it again below." -msgstr "สามารถแก้ไขเพิ่มเติมได้ด้านล่าง" +msgstr "สามารถแก้ไขเพิ่มเติมได้ที่ด้านล่าง" #: contrib/admin/options.py:431 #: contrib/admin/options.py:464 #, python-format msgid "You may add another %s below." -msgstr "คุณอาจจะเพิ่ม %s ได้อีกด้านล่าง" +msgstr "คุณสามารถเพิ่ม %s ได้อีกที่ด้านล่าง" #: contrib/admin/options.py:452 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "%(name)s \"%(obj)s\" ได้ถูกเปลี่ยนแปลงเรียบร้อยแล้ว" +msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว" #: contrib/admin/options.py:460 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr " %(name)s \"%(obj)s\" ได้ถูกเพิ่มเรียบร้อยแล้ว, แก้ไขได้ด้านล่าง" +msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว แก้ไขได้อีกที่ด้านล่าง" #: contrib/admin/options.py:536 #, python-format msgid "Add %s" -msgstr "เพิ่ม%s" +msgstr "เพิ่ม %s" #: contrib/admin/options.py:614 #, python-format msgid "Change %s" -msgstr "เปลี่ยนแปลง %s" +msgstr "เปลี่ยน %s" #: contrib/admin/options.py:646 msgid "Database error" @@ -370,7 +371,7 @@ msgstr "เกิดความผิดพลาดที่ฐานข้อ #: contrib/admin/options.py:696 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" ได้ถูกลบเรียบร้อยแล้ว" +msgstr "ลบ %(name)s \"%(obj)s\" เรียบร้อยแล้ว" #: contrib/admin/options.py:703 msgid "Are you sure?" @@ -395,19 +396,19 @@ msgstr "กรุณาลงชื่อเข้าใช้อีกครั #: contrib/admin/sites.py:234 #: contrib/admin/views/decorators.py:47 msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again." -msgstr "ดูเหมือนบราวเซอร์ของคุณจะไม่เปิดระบบคุกกี้ กรุณาเปิดระบบคุกกี้และลองเรียกหน้านี้ใหม่อีกครั้ง" +msgstr "ดูเหมือนเบราว์เซอร์ของคุณจะไม่เปิดรับคุกกี้ กรุณาเปิดรับคุกกี้และลองเรียกหน้านี้ใหม่อีกครั้ง" #: contrib/admin/sites.py:250 #: contrib/admin/sites.py:256 #: contrib/admin/views/decorators.py:66 msgid "Usernames cannot contain the '@' character." -msgstr "ชื่อผู้ใช้ไม่สามารถใช้ '@' สัญลักษณ์นี้ได้" +msgstr "ชื่อผู้ใช้ไม่สามารถใช้อักขระ '@' ได้" #: contrib/admin/sites.py:253 #: contrib/admin/views/decorators.py:62 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "อีเมลล์นี้ไม่สามารถใช้ชื่อผู้ใช้นี้ได้ ลองใช้ '%s' " +msgstr "ที่อยู่อีเมลไม่ใช่ชื่อผู้ใช้ของคุณ ลองใช้ '%s' แทน" #: contrib/admin/sites.py:313 msgid "Site administration" @@ -445,7 +446,7 @@ msgstr "เวลา :" #: contrib/admin/widgets.py:94 msgid "Currently:" -msgstr "ปัจจุบัน :" +msgstr "ปัจจุบัน:" #: contrib/admin/widgets.py:94 msgid "Change:" @@ -502,7 +503,7 @@ msgstr "เซิร์ฟเวอร์ขัดข้อง (500)" #: contrib/admin/templates/admin/500.html:10 msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." -msgstr "เกิดเหตุขัดข้องขี้น ทางเราได้รายงานไปยังหน่วยงานที่ดูแลแล้ว และจะดำเนินการซ่อมแซมอย่างเร่งด่วน ขอบคุณ" +msgstr "เกิดเหตุขัดข้องขี้น ทางเราได้รายงานไปยังผู้ดูแลระบบแล้ว และจะดำเนินการแก้ไขอย่างเร่งด่วน ขอบคุณที่ราบงานความผิดพลาด" #: contrib/admin/templates/admin/app_index.html:10 #: contrib/admin/templates/admin/index.html:19 @@ -562,7 +563,8 @@ msgstr "ดูที่หน้าเว็บ" #: contrib/admin/templates/admin/change_form.html:38 #: contrib/admin/templates/admin/auth/user/change_password.html:22 msgid "Please correct the error below." -msgstr "โปรดแก้ไขข้อผิดพลาดด้านล่าง" +msgid_plural "Please correct the errors below." +msgstr[0] "โปรดแก้ไขข้อผิดพลาดด้านล่าง" #: contrib/admin/templates/admin/change_list.html:16 #, python-format @@ -582,7 +584,7 @@ msgstr "ลบ" #: contrib/admin/templates/admin/delete_confirmation.html:16 #, python-format msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" -msgstr "กำลังดำเนินการลบ %(object_name)s '%(escaped_object)s'และจะแสดงผลการลบ ชื่อผู้ใช้งานของคุณไม่สามารถทำการลบข้อมูลนี้ได้" +msgstr "กำลังดำเนินการลบ %(object_name)s '%(escaped_object)s'และจะแสดงผลการลบ แต่บัญชีของคุณไม่สามารถทำการลบข้อมูลชนิดนี้ได้" #: contrib/admin/templates/admin/delete_confirmation.html:23 #, python-format @@ -601,7 +603,7 @@ msgstr " โดย %(filter_title)s " #: contrib/admin/templates/admin/index.html:18 #, python-format msgid "Models available in the %(name)s application." -msgstr "Models available in the %(name)s application." +msgstr "โมเดลใช้ได้ในแอป %(name)s ." #: contrib/admin/templates/admin/index.html:35 msgid "Change" @@ -625,15 +627,15 @@ msgstr "ไม่ว่าง" #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user." -msgstr "มีสิ่งผิดปกติเกิดขึ้นกับการติดตั้งฐานข้อมูล กรุณาตรวจสอบอีกครั้ง ฐานข้อมูลได้ถูกติดตั้งแล้ว กรุณาตอบสอบให้แน่ใจว่าสามารถใช้งานได้โดยผู้ใช้ที่จัดสรรให้" +msgstr "มีสิ่งผิดปกติเกิดขึ้นกับการติดตั้งฐานข้อมูล กรุณาตรวจสอบอีกครั้งว่าฐานข้อมูลได้ถูกติดตั้งแล้ว หรือฐานข้อมูลสามารถอ่านและเขียนได้โคยผู้ใช้นี้" #: contrib/admin/templates/admin/login.html:19 msgid "Username:" -msgstr "ชื่อผู้ใช้" +msgstr "ชื่อผู้ใช้:" #: contrib/admin/templates/admin/login.html:22 msgid "Password:" -msgstr "รหัสผ่าน" +msgstr "รหัสผ่าน:" #: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" @@ -654,11 +656,11 @@ msgstr "N j, Y, P" #: contrib/admin/templates/admin/object_history.html:38 msgid "This object doesn't have a change history. It probably wasn't added via this admin site." -msgstr "อ็อบเจ็กนี้ไม่ได้แก้ไขประวัติ เป็นไปได้ว่าอาจจะไม่ได้ถูกเพิ่มเข้าไปในส่วนของผู้ดูแลระบบ" +msgstr "อ็อบเจ็กต์นี้ไม่ได้แก้ไขประวัติ เป็นไปได้ว่ามันอาจจะไม่ได้ถูกเพิ่มเข้าไปโดยระบบ" #: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" -msgstr "แสดงผลทั้งหมด" +msgstr "แสดงทั้งหมด" #: contrib/admin/templates/admin/search_form.html:8 msgid "Go" @@ -667,7 +669,8 @@ msgstr "ไป" #: contrib/admin/templates/admin/search_form.html:10 #, python-format msgid "1 result" -msgstr "1 ผลลัพท์" +msgid_plural "%(counter)s results" +msgstr[0] "%(counter)s ผลลัพท์" #: contrib/admin/templates/admin/search_form.html:10 #, python-format @@ -688,7 +691,7 @@ msgstr "บันทึกและเพิ่ม" #: contrib/admin/templates/admin/submit_line.html:7 msgid "Save and continue editing" -msgstr "บันทึกและเริ่มต้นการแก้ไข" +msgstr "บันทึกและกลับมาแก้ไข" #: contrib/admin/templates/admin/auth/user/add_form.html:6 msgid "First, enter a username and password. Then, you'll be able to edit more user options." @@ -718,7 +721,7 @@ msgstr "รหัสผ่าน (อีกครั้ง)" #: contrib/admin/templates/admin/auth/user/add_form.html:27 #: contrib/admin/templates/admin/auth/user/change_password.html:40 msgid "Enter the same password as above, for verification." -msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบ" +msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง" #: contrib/admin/templates/admin/auth/user/change_password.html:26 #, python-format @@ -755,7 +758,7 @@ msgstr "รหัสผ่านของคุณถูกเปลี่ยน #: contrib/admin/templates/registration/password_change_form.html:12 msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." -msgstr "กรุณาใส่รหัสผ่านเดิม ด้วยเหตุผลทางด้านการรักษาความปลอดภัย หลังจากนั้นให้ใส่รหัสผ่านตัวใหม่อีกสองครั้ง เพื่อตรวจสอบว่าคุณได้พิมพ์รหัสอย่างถูกต้อง" +msgstr "กรุณาใส่รหัสผ่านเดิม ด้วยเหตุผลทางด้านการรักษาความปลอดภัย หลังจากนั้นให้ใส่รหัสผ่านใหม่อีกสองครั้ง เพื่อตรวจสอบว่าคุณได้พิมพ์รหัสอย่างถูกต้อง" #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -821,7 +824,7 @@ msgstr "การตั้งค่ารหัสผ่านใหม่เร #: contrib/admin/templates/registration/password_reset_done.html:12 msgid "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." -msgstr "เราได้ส่งอีเมลการตั้งรหัสผ่านถึงคุณ ไปที่อีเมลที่คุณให้ไว้เรียบร้อยแล้ว และคุณจะได้รับเร็วๆ นี้" +msgstr "เราได้ส่งอีเมลวิธีการตั้งรหัสผ่าน ไปที่อีเมลที่คุณให้ไว้เรียบร้อยแล้ว และคุณจะได้รับเร็วๆ นี้" #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" @@ -838,7 +841,7 @@ msgstr "กรุณาไปที่หน้านี้และเลือ #: contrib/admin/templates/registration/password_reset_email.html:9 msgid "Your username, in case you've forgotten:" -msgstr "ชื่อผู้ใช้งานของคุณ ในกรณีที่คุณลืม:" +msgstr "ชื่อผู้ใช้ของคุณ ในกรณีที่คุณถูกลืม:" #: contrib/admin/templates/registration/password_reset_email.html:11 msgid "Thanks for using our site!" @@ -851,7 +854,7 @@ msgstr "%(site_name)s ทีม" #: contrib/admin/templates/registration/password_reset_form.html:12 msgid "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." -msgstr "ลืมรหัสผ่าน? กรุณาใส่อีเมลด้านล่าง ทางเราจะทำการส่งวิธีการในการสร้างรหัสผ่านใหม่ไปให้" +msgstr "ลืมรหัสผ่าน? กรุณาใส่อีเมลด้านล่าง ทางเราจะทำการส่งวิธีการในการตั้งรหัสผ่านใหม่ไปให้" #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" @@ -873,7 +876,7 @@ msgstr "เลือก %s" #: contrib/admin/views/main.py:69 #, python-format msgid "Select %s to change" -msgstr "เลือก %s เพื่อเปลี่ยน" +msgstr "เลือก %s เพื่อเปลี่ยนแปลง" #: contrib/admin/views/template.py:36 #: contrib/sites/models.py:38 @@ -888,7 +891,7 @@ msgstr "เทมเพลต" #: contrib/admindocs/views.py:59 #: contrib/admindocs/views.py:61 msgid "tag:" -msgstr "ป้าย:" +msgstr "ป้ายกำกับ:" #: contrib/admindocs/views.py:90 #: contrib/admindocs/views.py:92 @@ -905,17 +908,17 @@ msgstr "ดู:" #: contrib/admindocs/views.py:186 #, python-format msgid "App %r not found" -msgstr "ไม่พบโปรแกรม %r " +msgstr "ไม่พบแอป %r " #: contrib/admindocs/views.py:193 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" -msgstr "ไม่พบโมเดล %(model_name)r ในโปรแกรม %(app_label)r" +msgstr "ไม่พบโมเดล %(model_name)r ในแอป %(app_label)r" #: contrib/admindocs/views.py:205 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" -msgstr "ความสัมพันธ์`%(app_label)s.%(data_type)s` อ็อบเจ็ก" +msgstr "ความสัมพันธ์`%(app_label)s.%(data_type)s` อ็อบเจ็กต์" #: contrib/admindocs/views.py:205 #: contrib/admindocs/views.py:227 @@ -927,7 +930,7 @@ msgstr "โมเดล:" #: contrib/admindocs/views.py:236 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" -msgstr "ความสัมพันธ์`%(app_label)s.%(object_name)s` อ็อบเจ็ก" +msgstr "ความสัมพันธ์`%(app_label)s.%(object_name)s` อ็อบเจ็กต์" #: contrib/admindocs/views.py:241 #, python-format @@ -942,7 +945,7 @@ msgstr "จำนวนของ %s" #: contrib/admindocs/views.py:251 #, python-format msgid "Fields on %s objects" -msgstr "ฟิลด์บน %s อ็อบเจ็ก" +msgstr "ฟิลด์บน %s อ็อบเจ็กต์" #: contrib/admindocs/views.py:314 #: contrib/admindocs/views.py:325 @@ -965,7 +968,7 @@ msgstr "สตริง(ได้ถึง %(max_length)s)" #: contrib/admindocs/views.py:317 msgid "Comma-separated integers" -msgstr "จำนวนเต็มที่มีจุลภาคคั่น" +msgstr "จำนวนเต็มแบบมีจุลภาค" #: contrib/admindocs/views.py:318 msgid "Date (without time)" @@ -977,7 +980,7 @@ msgstr "วันที่ (พร้อมด้วยเวลา)" #: contrib/admindocs/views.py:320 msgid "Decimal number" -msgstr "เลขฐานสิบ" +msgstr "เลขฐานสิบหรือเลขทศนิยม" #: contrib/admindocs/views.py:321 msgid "E-mail address" @@ -987,16 +990,16 @@ msgstr "ที่อยู่อีเมล" #: contrib/admindocs/views.py:323 #: contrib/admindocs/views.py:326 msgid "File path" -msgstr "ไฟล์พาธ" +msgstr "ตำแหน่งไฟล์" #: contrib/admindocs/views.py:324 msgid "Floating point number" -msgstr "เลชทศนิยม" +msgstr "เลขทศนิยม" #: contrib/admindocs/views.py:328 #: contrib/comments/models.py:58 msgid "IP address" -msgstr "ไอพี แอดเดรส" +msgstr "หมายเลขไอพี" #: contrib/admindocs/views.py:330 msgid "Boolean (Either True, False or None)" @@ -1027,7 +1030,7 @@ msgstr "URL" #: contrib/admindocs/views.py:340 msgid "U.S. state (two uppercase letters)" -msgstr "รัฐในสหรัฐ(ตัวอักษรใหญ่ 2 ตัว)" +msgstr "รัฐในสหรัฐ (ตัวอักษรใหญ่ 2 ตัว)" #: contrib/admindocs/views.py:341 msgid "XML text" @@ -1036,7 +1039,7 @@ msgstr "ข้อความ XML" #: contrib/admindocs/views.py:367 #, python-format msgid "%s does not appear to be a urlpattern object" -msgstr "%s ดูเหมือนจะไม่ใช่ urlpattern อ็อบเจ็ก" +msgstr "%s ดูเหมือนจะไม่ใช่ urlpattern อ็อบเจ็กต์" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" @@ -1057,9 +1060,9 @@ msgid "" "your computer is \"internal\").

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

                                      To install bookmarklets, drag the link to your bookmarks\n" -"toolbar, or right-click the link and add it to your bookmarks. Now you can\n" -"select the bookmarklet from any page in the site. Note that some of these\n" +"

                                      เพื่อติดตั้ง bookmarklets, ลากลิ้งก์ไปที่แถบเครื่องมือบุ๊กมาร์ค\n" +", หรือคลิกขวาที่ลิ้งและเพิ่มเข้าบุ๊กมาร์คของคุณ. ตอนนี้คุณสามารถ\n" +"เลือก bookmarklet จากหน้าใดๆในเว็บไซต์. Note that some of these\n" "bookmarklets require you to be viewing the site from a computer designated\n" "as \"internal\" (talk to your system administrator if you aren't sure if\n" "your computer is \"internal\").

                                      \n" @@ -1074,19 +1077,19 @@ msgstr "ย้ายจากทุกหน้าไปที่วิวที #: contrib/admindocs/templates/admin_doc/bookmarklets.html:21 msgid "Show object ID" -msgstr "แสดงอ็อบเจ็กไอดี" +msgstr "แสดงอ็อบเจ็กต์ไอดี" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:22 msgid "Shows the content-type and unique ID for pages that represent a single object." -msgstr "แสดง content-type และ unique ID เพื่อแสดงอ็อบเจ็กเดี่ยว." +msgstr "แสดง content-type และ unique ID เพื่อแสดงอ็อบเจ็กต์เพียงอย่างเดียว." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:24 msgid "Edit this object (current window)" -msgstr "แก้ไขออปเจ็กนี้ (หน้าต่างปัจจุบัน)" +msgstr "แก้ไขออปเจ็กนี้ (ในหน้าต่างปัจจุบัน)" #: contrib/admindocs/templates/admin_doc/bookmarklets.html:25 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "ไปที่หน้าแอดมินเพื่อแสดงอ็อบเจ็กเดี่ยว." +msgstr "ไปที่หน้าแอดมินเพื่อแสดงอ็อบเจ็กต์เพียงอย่างเดียว." #: contrib/admindocs/templates/admin_doc/bookmarklets.html:27 msgid "Edit this object (new window)" @@ -1094,7 +1097,7 @@ msgstr "แก้ไขออปเจ็กนี้ (หน้าใหม่) #: contrib/admindocs/templates/admin_doc/bookmarklets.html:28 msgid "As above, but opens the admin page in a new window." -msgstr "เหมือนด้านบน แต่เปิดหน้าต่างผู้ดูแลระบบขึ้นมาใหม่" +msgstr "เหมือนด้านบน แต่เปิดหน้าต่างผู้ดูแลระบบในหน้าต่างใหม่" #: contrib/auth/admin.py:21 msgid "Personal info" @@ -1114,7 +1117,7 @@ msgstr "กลุ่ม" #: contrib/auth/admin.py:64 msgid "Add user" -msgstr "เพิ่มผู้ใช้งาน" +msgstr "เพิ่มผู้ใช้" #: contrib/auth/admin.py:90 msgid "Password changed successfully." @@ -1152,7 +1155,7 @@ msgstr "รหัสผ่านไม่ตรงกัน" #: contrib/auth/forms.py:82 msgid "This account is inactive." -msgstr "ชื่อผู้ใช้นี้ไม่สามารถใช้งานได้" +msgstr "บัญชีนี้ไม่ทำงาน" #: contrib/auth/forms.py:87 msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in." @@ -1164,7 +1167,7 @@ msgstr "อีเมล" #: contrib/auth/forms.py:109 msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?" -msgstr "อีเมลนั้นไม่สามารถเข้าสู่ระบบได้ คุณแน่ใจหรือว่าคุณได้ลงทะเบียนแล้ว" +msgstr "อีเมลนี้ไม่ตรงกับบัญชีใดๆในระบบ คุณแน่ใจหรือว่าคุณได้ลงทะเบียนแล้ว" #: contrib/auth/forms.py:134 #, python-format @@ -1228,7 +1231,7 @@ msgstr "นามสกุล" #: contrib/auth/models.py:139 msgid "e-mail address" -msgstr "ที่อยู่อีเมล" +msgstr "อีเมล" #: contrib/auth/models.py:140 msgid "password" @@ -1236,11 +1239,11 @@ msgstr "รหัสผ่าน" #: contrib/auth/models.py:140 msgid "Use '[algo]$[salt]$[hexdigest]' or use the change password form." -msgstr "ใช้ '[algo]$[salt]$[hexdigest]' หรือใช้ แบบฟอร์มเปลี่ยนรหัสผ่าน ." +msgstr "ใช้ '[algo]$[salt]$[hexdigest]'หรือใช้ แบบฟอร์มเปลี่ยนรหัสผ่าน ." #: contrib/auth/models.py:141 msgid "staff status" -msgstr "สถานะ" +msgstr "สถานะของพนักงาน" #: contrib/auth/models.py:141 msgid "Designates whether the user can log into this admin site." @@ -1252,7 +1255,7 @@ msgstr "ใช้งานได้" #: contrib/auth/models.py:142 msgid "Designates whether this user should be treated as active. Unselect this instead of deleting accounts." -msgstr "ผู้ที่ถูกเลือกนั้นต้องมีสถานะที่สามารถเข้ามาใช้งานได้ตลอดเวลา เลือกออกแทนที่จะลบชื่อผู้ใช้ทิ้งไป " +msgstr "กำหนดให้ผู้ใช้มีสถานะที่สามารถเข้ามาใช้งานได้ เลือกออกแทนที่จะลบชื่อผู้ใช้ทิ้งไป " #: contrib/auth/models.py:143 msgid "superuser status" @@ -1260,7 +1263,7 @@ msgstr "สถานะผู้ใช้พิเศษ" #: contrib/auth/models.py:143 msgid "Designates that this user has all permissions without explicitly assigning them." -msgstr "ชื่อผู้ใช้งานที่ถูกเลือกนั้นได้รับอนุญาตในทุกกรณีโดยไม่ต้องการมอบหมายอย่างเป็นทางการ" +msgstr "กำหนดสิทธิ์ทุกอย่างให้ผู้ใช้ โดยไม่ต้องการมอบหมายอย่างเป็นทางการ" #: contrib/auth/models.py:144 msgid "last login" @@ -1272,19 +1275,19 @@ msgstr "วันที่เข้าร่วม" #: contrib/auth/models.py:147 msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." -msgstr "ดังนั้นการอนุญาตที่ได้รับมอบหมาย ผู้ใช้งานนี้ยังได้รับสิทธิ์ให้ใช้อำนาจได้กับกลุ่มของตนเองอีกด้วย" +msgstr "ด้วยสิทธิ์ที่ได้รับ ผู้ใช้นี้ยังได้รับสิทธิ์ให้ใช้อำนาจได้กับกลุ่มของตนเองอีกด้วย" #: contrib/auth/models.py:148 msgid "user permissions" -msgstr "สิทธิ์ผู้ใช้งาน" +msgstr "สิทธิ์ของผู้ใช้" #: contrib/auth/models.py:152 msgid "user" -msgstr "ผู้ใช้งาน" +msgstr "ผู้ใช้" #: contrib/auth/models.py:153 msgid "users" -msgstr "ผู้ใช้งาน" +msgstr "ผู้ใช้" #: contrib/auth/models.py:308 msgid "message" @@ -1313,7 +1316,7 @@ msgstr "ชื่อ" #: contrib/comments/forms.py:21 msgid "Email address" -msgstr "ที่อยู่อีเมล" +msgstr "อีเมล" #: contrib/comments/forms.py:23 msgid "Comment" @@ -1324,13 +1327,13 @@ msgid "If you enter anything in this field your comment will be treated as spam" msgstr "ถ้าคุณใส่ข้อมูลใดๆ ก็ตามในส่วนนี้ มันจะกลายเป็นสแปม" #: contrib/comments/forms.py:126 -#, python-format msgid "Watch your mouth! The word %s is not allowed here." -msgstr "ระวังนะ! คำว่า %s ไม่ได้รับอนุญาตให้ใช้ที่นี่" +msgid_plural "Watch your mouth! The words %s are not allowed here." +msgstr[0] "ระวังนะ ไม่สามารถใช้คำว่า %s ที่นี่ได้" #: contrib/comments/models.py:23 msgid "object ID" -msgstr "อ็อบเจ็กไอดี" +msgstr "อ็อบเจ็กต์ไอดี" #: contrib/comments/models.py:50 msgid "user's name" @@ -1338,7 +1341,7 @@ msgstr "ชื่อของผู้ใช้" #: contrib/comments/models.py:51 msgid "user's email address" -msgstr "ที่อยู่อีเมลของผู้ใช้" +msgstr "อีเมลของผู้ใช้" #: contrib/comments/models.py:52 msgid "user's URL" @@ -1370,11 +1373,11 @@ msgstr "เลือกเมื่อเห็นว่าข้อคิดเ #: contrib/comments/models.py:115 msgid "This comment was posted by an authenticated user and thus the name is read-only." -msgstr "ข้อคิดเห็นนี้ได้ถูกเขียนไว้โดยผู้ใช้งานที่สามารถเชื่อถือได้ จะถูกอ่านได้เพียงอย่างเดียว" +msgstr "ข้อคิดเห็นนี้ได้ถูกเขียนไว้โดยผู้ใช้ที่สามารถเชื่อถือได้ จะถูกอ่านได้เพียงอย่างเดียว" #: contrib/comments/models.py:124 msgid "This comment was posted by an authenticated user and thus the email is read-only." -msgstr "ข้อคิดเห็นนี้ถูกเขียนไว้โดยผู้ใช้งานที่สามารถเชื่อถือได้ ดังนั้นอีเมลนั้นจะถูกอ่านเท่านั้น" +msgstr "ข้อคิดเห็นนี้ถูกเขียนไว้โดยผู้ใช้ที่สามารถเชื่อถือได้ ดังนั้นอีเมลนั้นจะถูกอ่านเท่านั้น" #: contrib/comments/models.py:149 #, python-format @@ -1405,11 +1408,11 @@ msgstr "content types" #: contrib/flatpages/admin.py:9 msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "ตัวอย่าง: '/about/contact/'. ต้องแน่ใจว่าขึ้นต้นและลงท้ายด้วยเครื่องหมายขีดทับ (/)" +msgstr "ตัวอย่าง: '/about/contact/'. ต้องแน่ใจว่าขึ้นต้นและลงท้ายด้วยเครื่องหมาย /" #: contrib/flatpages/admin.py:11 msgid "This value must contain only letters, numbers, underscores, dashes or slashes." -msgstr "ค่าที่ว่านี้จะต้องประกอบด้วยตัวหน้งสือ ตัวเลข เครื่องหมายขีดล่าง หรือขีดทับ(/)" +msgstr "ค่าที่ว่านี้จะต้องประกอบด้วยตัวหน้งสือ ตัวเลข เครื่องหมายขีดล่าง และขีดทับ" #: contrib/flatpages/admin.py:22 msgid "Advanced options" @@ -1433,15 +1436,15 @@ msgstr "ชื่อเทมเพลต" #: contrib/flatpages/models.py:12 msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'." -msgstr "ตัวอย่าง: 'flatpages/contact_page.html'ถ้าไม่ได้ถูกนำเสนอ ระบบจะใช้ 'flatpages/default.html' " +msgstr "ตัวอย่าง: 'flatpages/contact_page.html' ถ้าไม่ได้ถูกใช้ ระบบจะใช้ 'flatpages/default.html' " #: contrib/flatpages/models.py:13 msgid "registration required" -msgstr "ต้องการการลงทะเบียน" +msgstr "ต้องลงทะเบียนก่อน" #: contrib/flatpages/models.py:13 msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "ถ้าถูกเลือก ผู้ใช้งานที่ลงทะเบียนเข้าสู่ระบบเท่านั้นที่จะสามารถดูหน้านี้" +msgstr "ถ้าถูกเลือก ผู้ใช้ที่ลงทะเบียนเข้าสู่ระบบเท่านั้นที่จะสามารถดูหน้านี้" #: contrib/flatpages/models.py:18 msgid "flat page" @@ -1449,7 +1452,7 @@ msgstr "flat page" #: contrib/flatpages/models.py:19 msgid "flat pages" -msgstr "" +msgstr "flat page" #: contrib/formtools/wizard.py:130 msgid "We apologize, but your form has expired. Please continue filling out the form from this page." @@ -1484,19 +1487,19 @@ msgid "rd" msgstr "rd" #: contrib/humanize/templatetags/humanize.py:51 -#, python-format msgid "%(value).1f million" -msgstr "%(value).1f ล้าน" +msgid_plural "%(value).1f million" +msgstr[0] "%(value).1f หนึ่งล้าน" #: contrib/humanize/templatetags/humanize.py:54 -#, python-format msgid "%(value).1f billion" -msgstr "%(value).1f สิบล้าน" +msgid_plural "%(value).1f billion" +msgstr[0] "%(value).1f สิบล้าน" #: contrib/humanize/templatetags/humanize.py:57 -#, python-format msgid "%(value).1f trillion" -msgstr "%(value).1f ร้อยล้าน" +msgid_plural "%(value).1f trillion" +msgstr[0] "%(value).1f ร้อยล้าน" #: contrib/humanize/templatetags/humanize.py:73 msgid "one" @@ -1614,7 +1617,7 @@ msgstr "ใส่รหัสไปรษณีย์ในรูปแบบข #: contrib/localflavor/at/forms.py:48 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format." -msgstr "ใส่หมายเลขบัตรประกันสังคมออสเตรีย ในรูปแบบ XXXX XXXXXX " +msgstr "ใส่หมายเลขประกันสังคมออสเตรีย ในรูปแบบ XXXX XXXXXX " #: contrib/localflavor/au/forms.py:16 msgid "Enter a 4 digit post code." @@ -1638,7 +1641,7 @@ msgstr "ตัวเลข CPF ไม่สมบูรณ์" #: contrib/localflavor/br/forms.py:95 msgid "This field requires at most 11 digits or 14 characters." -msgstr "ในส่วนนี้ต้องการตัวเลขมากที่สุด 11 หรือ 14 ตัว" +msgstr "ฟิลด์นี้ต้องการตัวเลขมากที่สุด 11 หรือ 14 ตัว" #: contrib/localflavor/br/forms.py:134 msgid "Invalid CNPJ number." @@ -1646,7 +1649,7 @@ msgstr "ตัวเลข CNPJ ไม่สมบูรณ์" #: contrib/localflavor/br/forms.py:136 msgid "This field requires at least 14 digits" -msgstr "ส่วนนี้ต้องการตัวเลขอย่างน้อย 14 ตัวเลข" +msgstr "ฟิลด์นี้ต้องการตัวเลขอย่างน้อย 14 หลัก" #: contrib/localflavor/ca/forms.py:17 msgid "Enter a postal code in the format XXX XXX." @@ -1730,7 +1733,7 @@ msgstr "โซโลเธิร์น" #: contrib/localflavor/ch/ch_states.py:23 msgid "St. Gallen" -msgstr "เซนท์ กาลเลน" +msgstr "เซนท์ กัลเลน" #: contrib/localflavor/ch/ch_states.py:24 msgid "Thurgau" @@ -1762,7 +1765,7 @@ msgstr "ซูริค" #: contrib/localflavor/ch/forms.py:64 msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format." -msgstr "ใส่หมายเลขบัตรประชาชนสวิสต์หรือหมายเลขพาสปอร์ต ในรูปแบบ X1234567<0 หรือ 1234567890" +msgstr "ใส่หมายเลขประจำตัวประชาชนหรือหมายเลขพาสปอร์ต ในรูปแบบ X1234567<0 หรือ 1234567890" #: contrib/localflavor/cl/forms.py:29 msgid "Enter a valid Chilean RUT." @@ -1810,7 +1813,7 @@ msgstr "เม็กเลนเบิร์กตะวันตก-โพเ #: contrib/localflavor/de/de_states.py:13 msgid "Lower Saxony" -msgstr "แซกโซนี ต่ำ" +msgstr "แซกโซนีล่าง" #: contrib/localflavor/de/de_states.py:14 msgid "North Rhine-Westphalia" @@ -1848,7 +1851,7 @@ msgstr "ใส่รหัสไปรษณ๊ย์ ในรูปแบบ X #: contrib/localflavor/de/forms.py:41 msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format." -msgstr "ใส่หมายเลขบัตรประชาชนเยอรมันในรูปแบบ XXXXXXXXXXX-XXXXXXX-XXXXXXX-X" +msgstr "ใส่หมายเลขประจำตัวประชาชนเยอรมันในรูปแบบ XXXXXXXXXXX-XXXXXXX-XXXXXXX-X" #: contrib/localflavor/es/es_provinces.py:5 msgid "Arava" @@ -1916,7 +1919,7 @@ msgstr "เกวงกา" #: contrib/localflavor/es/es_provinces.py:21 msgid "Girona" -msgstr "ชีโรนา" +msgstr "จีโรนา" #: contrib/localflavor/es/es_provinces.py:22 msgid "Granada" @@ -1953,7 +1956,7 @@ msgstr "เยย์ดา" #: contrib/localflavor/es/es_provinces.py:30 #: contrib/localflavor/es/es_regions.py:17 msgid "La Rioja" -msgstr "ลา ริโอจา" +msgstr "ลา ริโอฮา" #: contrib/localflavor/es/es_provinces.py:31 msgid "Lugo" @@ -1966,7 +1969,7 @@ msgstr "มาดริด" #: contrib/localflavor/es/es_provinces.py:33 msgid "Malaga" -msgstr "มะยอกา" +msgstr "มายอกา" #: contrib/localflavor/es/es_provinces.py:34 msgid "Murcia" @@ -1974,7 +1977,7 @@ msgstr "มูร์เซีย" #: contrib/localflavor/es/es_provinces.py:35 msgid "Navarre" -msgstr "นาบาร์รา" +msgstr "นาวาร์" #: contrib/localflavor/es/es_provinces.py:36 msgid "Ourense" @@ -2007,7 +2010,7 @@ msgstr "ซานตาครูซ ดา เตริเนเฟ" #: contrib/localflavor/es/es_provinces.py:43 #: contrib/localflavor/es/es_regions.py:11 msgid "Cantabria" -msgstr "ปอนเตเบดรา" +msgstr "กันตาเบรีย" #: contrib/localflavor/es/es_provinces.py:44 msgid "Segovia" @@ -2155,7 +2158,7 @@ msgstr "ผลรวมตรวจสอบ สำหรับบัญชี #: contrib/localflavor/fi/forms.py:28 msgid "Enter a valid Finnish social security number." -msgstr "ใส่หมายเลขประกันสังคมของฟินแลนด์" +msgstr "ใส่หมายเลขประกันสังคมฟินแลนด์" #: contrib/localflavor/in_/forms.py:14 msgid "Enter a zip code in the format XXXXXXX." @@ -2163,11 +2166,11 @@ msgstr "กรุณาใส่รหัสไปรษณีย์ในรู #: contrib/localflavor/is_/forms.py:17 msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." -msgstr "ใส่หมายเลขประจำตัวประชาชนของไอซ์แลนด์ในรูปของ XXXXXX-XXXX" +msgstr "ใส่หมายเลขประจำตัวประชาชนไอซ์แลนด์ในรูปของ XXXXXX-XXXX" #: contrib/localflavor/is_/forms.py:18 msgid "The Icelandic identification number is not valid." -msgstr "หมายเลขบัตรประจำตัวประชาชนของไอซ์แลนด์ไม่ถูกต้อง" +msgstr "หมายเลขประจำตัวประชาชนไอซ์แลนด์ไม่ถูกต้อง" #: contrib/localflavor/it/forms.py:14 msgid "Enter a valid zip code." @@ -2175,7 +2178,7 @@ msgstr "ใส่รหัสไปรษณีย์" #: contrib/localflavor/it/forms.py:43 msgid "Enter a valid Social Security number." -msgstr "ใส่หมายเลขบัตรประกันสังคม" +msgstr "ใส่หมายเลขประกันสังคม" #: contrib/localflavor/it/forms.py:68 msgid "Enter a valid VAT number." @@ -2379,7 +2382,7 @@ msgstr "อากวัสกาเลียนเตส" #: contrib/localflavor/mx/mx_states.py:13 msgid "Baja California" -msgstr "บาฮา กาลิฟอร์เนีย" +msgstr "บาจา แคลิฟอร์เนีย" #: contrib/localflavor/mx/mx_states.py:14 msgid "Baja California Sur" @@ -2407,7 +2410,7 @@ msgstr "โคลิมา" #: contrib/localflavor/mx/mx_states.py:20 msgid "Distrito Federal" -msgstr "เมคีโก เด.เอเฟ. เฟเดอรัลดิสตริกต์" +msgstr "เม็กซิโก ซิตี้" #: contrib/localflavor/mx/mx_states.py:21 msgid "Durango" @@ -2443,7 +2446,7 @@ msgstr "มอเรโลส" #: contrib/localflavor/mx/mx_states.py:29 msgid "Nayarit" -msgstr "Nayarit" +msgstr "นายาริต" #: contrib/localflavor/mx/mx_states.py:30 msgid "Nuevo León" @@ -2511,7 +2514,7 @@ msgstr "ใส่หมายเลขโทรศัพท์" #: contrib/localflavor/nl/forms.py:78 msgid "Enter a valid SoFi number" -msgstr "กรอกหมายเลข SoFi ที่ถูต้อง" +msgstr "กรอกหมายเลขประจำตัวประชาชน" #: contrib/localflavor/nl/nl_provinces.py:4 msgid "Drenthe" @@ -2523,7 +2526,7 @@ msgstr "เฟลโวแลนด์" #: contrib/localflavor/nl/nl_provinces.py:6 msgid "Friesland" -msgstr "ฟรีส์แลนด์" +msgstr "ฟรายส์แลนด์" #: contrib/localflavor/nl/nl_provinces.py:7 msgid "Gelderland" @@ -2563,19 +2566,19 @@ msgstr "ซูด ฮอลแลนด์" #: contrib/localflavor/no/forms.py:33 msgid "Enter a valid Norwegian social security number." -msgstr "ใส่หมายเลขบัตรประกันสังคมของชาวนอร์เวย์" +msgstr "ใส่หมายเลขประกันสังคมนอร์เวย์" #: contrib/localflavor/pe/forms.py:24 msgid "This field requires 8 digits." -msgstr "ฟิลด์นี้ต้องการตัวเลข 8 ตัว" +msgstr "ข่องนี้ต้องการตัวเลข 8 ตัว" #: contrib/localflavor/pe/forms.py:52 msgid "This field requires 11 digits." -msgstr "ฟิลด์นี้ต้องการตัวเลข 11 ตัว" +msgstr "ช่องนี้ต้องการตัวเลข 11 ตัว" #: contrib/localflavor/pl/forms.py:38 msgid "National Identification Number consists of 11 digits." -msgstr "บัตรประจำตัวประชาประกอบด้วยตัวเลข 11 หน่วย" +msgstr "บัตรประจำตัวประชาประกอบด้วยตัวเลข 11 ตัว" #: contrib/localflavor/pl/forms.py:39 msgid "Wrong checksum for the National Identification Number." @@ -2583,7 +2586,7 @@ msgstr "ผลรวมตรวจสอบของหมายเลขปร #: contrib/localflavor/pl/forms.py:71 msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." -msgstr "ใส่หมายเลขประจำตัวของผู้เสียภาษีอากรในรูปของ XXX-XXX-XX-XX หรือ XX-XX-XXX-XXX " +msgstr "ใส่หมายเลขประจำตัวผู้เสียภาษี (NIP) ในรูปของ XXX-XXX-XX-XX หรือ XX-XX-XXX-XXX " #: contrib/localflavor/pl/forms.py:72 msgid "Wrong checksum for the Tax Number (NIP)." @@ -2639,7 +2642,7 @@ msgstr "ซับคาเพเทีย" #: contrib/localflavor/pl/pl_voivodeships.py:17 msgid "Podlasie" -msgstr "พอดล่ซีย์" +msgstr "พอดลาซีย์" #: contrib/localflavor/pl/pl_voivodeships.py:18 msgid "Pomerania" @@ -3203,27 +3206,27 @@ msgstr "วอร์เซสเตอร์เชียร์" #: contrib/localflavor/uk/uk_regions.py:55 msgid "County Antrim" -msgstr "เขตการปกครอง แอนทริม" +msgstr "แอนทริม" #: contrib/localflavor/uk/uk_regions.py:56 msgid "County Armagh" -msgstr "เขตการปกครอง อามาห์" +msgstr "อามาห์" #: contrib/localflavor/uk/uk_regions.py:57 msgid "County Down" -msgstr "เขตการปกครอง ดาวน์" +msgstr "ดาวน์" #: contrib/localflavor/uk/uk_regions.py:58 msgid "County Fermanagh" -msgstr "เขตการปกครอง เฟอร์มานาห์" +msgstr "เฟอร์มานาห์" #: contrib/localflavor/uk/uk_regions.py:59 msgid "County Londonderry" -msgstr "เขตการปกครอง ลอนดอนเดอร์รี่" +msgstr "ลอนดอนเดอร์รี่" #: contrib/localflavor/uk/uk_regions.py:60 msgid "County Tyrone" -msgstr "เขตการปกครอง ไทโรน" +msgstr "ไทโรน" #: contrib/localflavor/uk/uk_regions.py:64 msgid "Clwyd" @@ -3327,11 +3330,11 @@ msgstr "ใส่รหัสไปรษณีย์ในรูปของ XX #: contrib/localflavor/us/forms.py:54 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." -msgstr "ใส่หมายเลขบัตรประกันสังคมของอเมริกา" +msgstr "ใส่หมายเลขประกันสังคมอเมริกา" #: contrib/localflavor/za/forms.py:20 msgid "Enter a valid South African ID number" -msgstr "ใส่หมายเลขบัตรประจำตัวประชาชนของแอฟริกาใต้" +msgstr "ใส่หมายเลขประจำตัวประชาชนแอฟริกาใต้" #: contrib/localflavor/za/forms.py:54 msgid "Enter a valid South African postal code" @@ -3343,7 +3346,7 @@ msgstr "อิสเทิร์นแคป" #: contrib/localflavor/za/za_provinces.py:5 msgid "Free State" -msgstr "ฟรีเสตต" +msgstr "ฟรีเสตต์" #: contrib/localflavor/za/za_provinces.py:6 msgid "Gauteng" @@ -3379,7 +3382,7 @@ msgstr "เปลี่ยนทิศทางจาก" #: contrib/redirects/models.py:8 msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'." -msgstr "สิ่งนี้น่าจะเป็นแนวทางที่แน่นอนที่จะแยกออกมาจากชื่อโดเมน ตัวอย่าง : '/events/search/'" +msgstr "พาธไม่รวมโดเมน ตัวอย่าง : '/events/search/'" #: contrib/redirects/models.py:9 msgid "redirect to" @@ -3387,7 +3390,7 @@ msgstr "เปลี่ยนทิศทางไปที่" #: contrib/redirects/models.py:10 msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." -msgstr "มันอาจจะเป็นพาธที่แท้จริงหรือ URL แบบเต็มที่ขึ้นต้นด้วย 'http://'." +msgstr "มันอาจจะเป็นพาธหรือ URL แบบเต็มที่ขึ้นต้นด้วย 'http://'." #: contrib/redirects/models.py:13 msgid "redirect" @@ -3403,11 +3406,11 @@ msgstr "เซสชันคีย์" #: contrib/sessions/models.py:47 msgid "session data" -msgstr "เซสชันดาตา" +msgstr "ข้อมูลเซสชัน" #: contrib/sessions/models.py:48 msgid "expire date" -msgstr "expire date" +msgstr "วันหมดอายุ" #: contrib/sessions/models.py:53 msgid "session" @@ -3436,24 +3439,24 @@ msgstr "ค่านี้ต้องเป็นจำนวนเต็ม" #: db/models/fields/__init__.py:379 msgid "This value must be either True or False." -msgstr "ค่านี้ต้องเป็น True หรือ False" +msgstr "ค่านี้ต้องเป็นถูกหรือผิด" #: db/models/fields/__init__.py:412 msgid "This field cannot be null." -msgstr "ฟิลด์นี้จำเป็น" +msgstr "ฟิลด์นี้ไม่สารถปล่อยว่างได้" #: db/models/fields/__init__.py:428 msgid "Enter only digits separated by commas." -msgstr "ใส่ตัวเลขหรือลูกน้ำเท่านั้น" +msgstr "ใส่ตัวเลขที่คั่นด้วยจุลภาคเท่านั้น" #: db/models/fields/__init__.py:459 msgid "Enter a valid date in YYYY-MM-DD format." -msgstr "Enter a valid date in YYYY-MM-DD format." +msgstr "ใส่วันที่ในรูปแบบ YYYY-MM-DD" #: db/models/fields/__init__.py:468 #, python-format msgid "Invalid date: %s" -msgstr "Invalid date: %s" +msgstr "วันที่ไม่ถูกต้อง: %s" #: db/models/fields/__init__.py:532 #: db/models/fields/__init__.py:550 @@ -3462,7 +3465,7 @@ msgstr "ใส่วันเวลาที่ถูกต้องในรู #: db/models/fields/__init__.py:586 msgid "This value must be a decimal number." -msgstr "ช่องนี้ต้องเป็นเลขฐานสิบ" +msgstr "ค่านี้ต้องเป็นเลขฐานสิบหรือเลขทศนิยม" #: db/models/fields/__init__.py:719 msgid "This value must be either None, True or False." @@ -3481,8 +3484,7 @@ msgstr "กดปุ่ม \"Control\", หรือ \"Command\" บน Mac ค #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "โปรดใส่ %(self)s ไอดี. ค่า %(value)r ไม่ถูกต้อง" #: forms/fields.py:54 msgid "This field is required." @@ -3533,12 +3535,12 @@ msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s #: forms/fields.py:228 #, python-format msgid "Ensure that there are no more than %s decimal places." -msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s หลัก." +msgstr "แน่ใจว่ารวมแล้วเป็นทศนิยมไม่เกิน %s หลัก." #: forms/fields.py:229 #, 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." +msgstr "แน่ใจว่ารวมแล้วไม่เกิน %s หลัก ก่อนจุดทศนิยม." #: forms/fields.py:287 #: forms/fields.py:848 @@ -3568,7 +3570,7 @@ msgstr "ไฟล์ที่ส่งว่างเปล่า" #: forms/fields.py:477 msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." -msgstr "อัพโหลดไฟล์ที่ถูกต้อง. ไฟล์ที่อัพโหลดไปไม่ใช่รูป หรือรูปเสียหาย." +msgstr "อัพโหลดรูปที่ถูกต้อง. ไฟล์ที่อัพโหลดไปไม่ใช่รูป หรือรูปเสียหาย." #: forms/fields.py:538 msgid "Enter a valid URL." @@ -3582,7 +3584,7 @@ msgstr "URL อาจจะเป็นลิ้งค์ที่เสีย #: forms/fields.py:696 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "เลือกตัวเลือกที่ถูกต้อง. %(value)s ไม่ใช่ตัวเลือกที่ถูกต้อง." +msgstr "เลือกตัวเลือกที่ถูกต้อง. %(value)s ไม่ใช่ตัวเลือกที่ใช้ได้." #: forms/fields.py:697 #: forms/fields.py:758 @@ -3623,11 +3625,9 @@ msgid "yes,no,maybe" msgstr "ใช่,ไม่ใช่,อาจจะ" #: template/defaultfilters.py:737 -#, fuzzy, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(size)d ไบต์" #: template/defaultfilters.py:739 #, python-format @@ -3779,7 +3779,7 @@ msgstr "ธันวาคม" #: utils/dates.py:23 msgid "jan" -msgstr "มก." +msgstr "ม.ค." #: utils/dates.py:23 msgid "feb" @@ -3827,7 +3827,7 @@ msgstr "ธ.ค." #: utils/dates.py:31 msgid "Jan." -msgstr "มก." +msgstr "ม.ค." #: utils/dates.py:31 msgid "Feb." @@ -3858,57 +3858,54 @@ msgid "or" msgstr "หรือ" #: utils/timesince.py:21 +msgid "year" +msgid_plural "years" +msgstr[0] "ปี" + #: utils/timesince.py:22 msgid "month" msgid_plural "months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "เดือน" #: utils/timesince.py:23 msgid "week" msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "สัปดาห์" #: utils/timesince.py:24 msgid "day" msgid_plural "days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "วัน" #: utils/timesince.py:25 msgid "hour" msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ชั่วโมง" #: utils/timesince.py:26 msgid "minute" msgid_plural "minutes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "นาที" #: utils/timesince.py:43 msgid "minutes" msgstr "นาที" #: utils/timesince.py:48 -#, python-format msgid "%(number)d %(type)s" -msgstr "" +msgstr "%(number)d %(type)s" #: utils/timesince.py:54 -#, python-format msgid ", %(number)d %(type)s" -msgstr "" +msgstr ", %(number)d %(type)s" #: utils/translation/trans_real.py:403 msgid "DATE_FORMAT" -msgstr "N j, Y" +msgstr "j N Y" #: utils/translation/trans_real.py:405 msgid "TIME_FORMAT" -msgstr "P" +msgstr "G:i" #: utils/translation/trans_real.py:421 msgid "YEAR_MONTH_FORMAT" @@ -3916,7 +3913,7 @@ msgstr "F Y" #: utils/translation/trans_real.py:422 msgid "MONTH_DAY_FORMAT" -msgstr "F j" +msgstr "j F" #: views/generic/create_update.py:114 #, python-format diff --git a/django/conf/locale/th/LC_MESSAGES/djangojs.mo b/django/conf/locale/th/LC_MESSAGES/djangojs.mo index a5e0b4f379..f999fd0303 100644 Binary files a/django/conf/locale/th/LC_MESSAGES/djangojs.mo and b/django/conf/locale/th/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/th/LC_MESSAGES/djangojs.po b/django/conf/locale/th/LC_MESSAGES/djangojs.po index fcc346f8fe..461cdf264d 100644 --- a/django/conf/locale/th/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/th/LC_MESSAGES/djangojs.po @@ -2,23 +2,24 @@ # msgid "" msgstr "" -"Project-Id-Version: Django\n" -"Report-Msgid-Bugs-To: kowito@felspar.com\n" +"Project-Id-Version: Django-1.1-rc-1\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-09-02 22:36-0700\n" -"PO-Revision-Date: 2008-11-04 00:35+0700\n" +"PO-Revision-Date: 2009-07-27 21:47+0700\n" "Last-Translator: Kowit Charoenratchatabhan \n" "Language-Team: Kowit Charoenratchatabhan,Kadsarin Sanjek, Felspar \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Thai\n" -"X-Poedit-Country: Thailand\n" +"X-Poedit-Country: THAILAND\n" "X-Poedit-SourceCharset: utf-8\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: contrib/admin/media/js/SelectFilter2.js:33 #, perl-format msgid "Available %s" -msgstr "ที่มีอยู่ %s" +msgstr "%sที่มีอยู่" #: contrib/admin/media/js/SelectFilter2.js:41 msgid "Choose all" @@ -35,7 +36,7 @@ msgstr "ลบออก" #: contrib/admin/media/js/SelectFilter2.js:53 #, perl-format msgid "Chosen %s" -msgstr "ได้เลือก %s" +msgstr "%sที่ถูกเลือก" #: contrib/admin/media/js/SelectFilter2.js:54 msgid "Select your choice(s) and click " @@ -43,7 +44,7 @@ msgstr "เลือกและคลิก" #: contrib/admin/media/js/SelectFilter2.js:59 msgid "Clear all" -msgstr "ล้างทั้งหมด" +msgstr "ลบทั้งหมด" #: contrib/admin/media/js/calendar.js:24 #: contrib/admin/media/js/dateparse.js:32 @@ -52,11 +53,11 @@ msgstr "มกราคม กุมภาพันธ์ มีนาคม เ #: contrib/admin/media/js/calendar.js:25 msgid "S M T W T F S" -msgstr "อา จ. อ. พ. พฤ. ศ. ส." +msgstr "อา. จ. อ. พ. พฤ. ศ. ส." #: contrib/admin/media/js/dateparse.js:33 msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" -msgstr "อาทิตย์ จันทร์ อังคาร พุธ พฤหัส ศุกร์ เสาร์" +msgstr "อาทิตย์ จันทร์ อังคาร พุธ พฤหัสบดี ศุกร์ เสาร์" #: contrib/admin/media/js/admin/CollapsedFieldsets.js:34 #: contrib/admin/media/js/admin/CollapsedFieldsets.js:72 @@ -70,7 +71,7 @@ msgstr "ซ่อน" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:47 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:81 msgid "Now" -msgstr "เดี๋ยวนี้" +msgstr "ขณะนี้" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:51 msgid "Clock" @@ -86,11 +87,11 @@ msgstr "เที่ยงคืน" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 msgid "6 a.m." -msgstr "6 นาฬิกา" +msgstr "หกโมงเช้า" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:84 msgid "Noon" -msgstr "เที่ยง" +msgstr "เที่ยงวัน" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:88 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:183 @@ -108,7 +109,7 @@ msgstr "ปฏิทิน" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:175 msgid "Yesterday" -msgstr "เมื่อวานนี้" +msgstr "เมื่อวาน" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:179 msgid "Tomorrow" diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo index b7f8fe1b0c..2c58356311 100644 Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index 90c6d52a22..8bba862c5d 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -5,9 +5,9 @@ msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-12-02 22:52+0800\n" -"PO-Revision-Date: 2008-11-19 17:38+0800\n" -"Last-Translator: Liang Feng \n" -"Language-Team: Simplified Chinese \n" +"PO-Revision-Date: 2009-07-23 11:47+0800\n" +"Last-Translator: Qing Feng \n" +"Language-Team: Simplified Chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -220,6 +220,20 @@ msgstr "简体中文" msgid "Traditional Chinese" msgstr "繁体中文" +#: contrib/admin/actions.py:60 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "删除了%(count)d的%(items)s" + +#: contrib/admin/actions.py:67 contrib/admin/options.py:1027 +msgid "Are you sure?" +msgstr "你确认吗？" + +#: contrib/admin/actions.py:85 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "删除了选择的%(verbose_name_plural)s" + #: contrib/admin/filterspecs.py:44 #, python-format msgid "" @@ -377,10 +391,6 @@ msgstr "数据库错误" msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 删除成功。" -#: contrib/admin/options.py:695 -msgid "Are you sure?" -msgstr "你确认吗？" - #: contrib/admin/options.py:724 #, python-format msgid "Change history: %s" @@ -640,6 +650,10 @@ msgstr "我的动作" msgid "None available" msgstr "无可用的" +#: contrib/admin/templates/admin/index.html:72 +msgid "Unknown content" +msgstr "未知内容" + #: contrib/admin/templates/admin/invalid_setup.html:7 msgid "" "Something's wrong with your database installation. Make sure the appropriate " @@ -685,6 +699,15 @@ msgstr "该对象没有变更历史记录。可能从未通过这个管理站点 msgid "Show all" msgstr "显示全部" +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "保存" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Search" +msgstr "搜索" + #: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "执行" @@ -701,10 +724,6 @@ msgstr[1] "%(counter)s 条结果" msgid "%(full_result_count)s total" msgstr "总共 %(full_result_count)s" -#: contrib/admin/templates/admin/submit_line.html:3 -msgid "Save" -msgstr "保存" - #: contrib/admin/templates/admin/submit_line.html:5 msgid "Save as new" msgstr "保存为新的" @@ -1347,6 +1366,16 @@ msgstr "内容" msgid "Metadata" msgstr "元数据" +#: contrib/comments/feeds.py:13 +#, python-format +msgid "%(site_name)s comments" +msgstr "%(site_name)s的评论" + +#: contrib/comments/feeds.py:23 +#, python-format +msgid "Latest comments on %(site_name)s" +msgstr "%(site_name)s的最新评论" + #: contrib/comments/forms.py:19 #: contrib/comments/templates/comments/moderation_queue.html:34 msgid "Name" @@ -1423,6 +1452,12 @@ msgid "" "only." msgstr "此评论由一位验证用户发表，因此该用户名是只读的。" +#: contrib/comments/models.py:77 +msgid "comments" +msgstr "评论" + +#: contrib/comments/models.py:119 + #: contrib/comments/models.py:124 msgid "" "This comment was posted by an authenticated user and thus the email is read-" @@ -1444,6 +1479,22 @@ msgstr "" "\n" "http://%(domain)s%(url)s" +#: contrib/comments/models.py:170 +msgid "flag" +msgstr "标记" + +#: contrib/comments/models.py:171 +msgid "date" +msgstr "标记时间" + +#: contrib/comments/models.py:181 +msgid "comment flag" +msgstr "评论标记" + +#: contrib/comments/models.py:182 +msgid "comment flags" +msgstr "评论标记" + #: contrib/comments/templates/comments/approve.html:4 msgid "Approve a comment" msgstr "批准评论" @@ -1574,10 +1625,6 @@ msgstr "或进行修改" msgid "python model class name" msgstr "python 模型类名" -#: contrib/contenttypes/models.py:71 -msgid "content type" -msgstr "内容类型" - #: contrib/contenttypes/models.py:72 msgid "content types" msgstr "内容类型" @@ -1655,6 +1702,14 @@ msgstr "无效几何信息。" msgid "Invalid geometry type." msgstr "无效几何类型。" +#: contrib/gis/forms/fields.py:20 +msgid "" +"An error occurred when transforming the geometry to the SRID of the geometry " +"form field." +msgstr "" +"几何形状的SRID字段发生试图转换错误" +"ました。" + #: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "th" @@ -2789,8 +2844,8 @@ msgid "Wrong checksum for the Tax Number (NIP)." msgstr "税号（NIP）校验和错误。" #: contrib/localflavor/pl/forms.py:111 -msgid "National Business Register Number (REGON) consists of 7 or 9 digits." -msgstr "国家商业注册号码（REGON）由 7 位或 9 位数字组成。" +msgid "National Business Register Number (REGON) consists of 9 or 14 digits." +msgstr "国家商业注册号码（REGON）由 9 位或 14 位数字组成。" #: contrib/localflavor/pl/forms.py:112 msgid "Wrong checksum for the National Business Register Number (REGON)." @@ -3796,6 +3851,36 @@ msgstr "输入一个有效的 'slug'，由字母、数字、下划线或横线 msgid "Order" msgstr "排序" +#: forms/models.py:367 +#, python-format +msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." +msgstr "" +"在%(date_field)s %(lookup)s 需要唯一的 %(field_name)s" + +#: forms/models.py:594 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "请修改%(field)s的重复数据" + +#: forms/models.py:598 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "请修改%(field)s的重复数据.这个字段必须唯一" + +#: forms/models.py:604 +#, 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 必须保证唯一." + +#: forms/models.py:612 +msgid "Please correct the duplicate values below." +msgstr "请修正重复的数据." + +#: forms/models.py:381 forms/models.py:389 +#, python-format + #: forms/models.py:281 forms/models.py:290 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo b/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo index 6d1bcc18ee..5d91de8734 100644 Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po b/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po index 46b3ed4b9d..142acbb188 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po @@ -9,8 +9,8 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-03-21 18:43+0800\n" "PO-Revision-Date: 2006-09-25 08:35+0800\n" -"Last-Translator: limodou \n" -"Language-Team: limodou \n" +"Last-Translator: Qing Feng \n" +"Language-Team: Qing Feng \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/django/conf/urls/defaults.py b/django/conf/urls/defaults.py index 26cdd3e1ff..3ab8bab3ec 100644 --- a/django/conf/urls/defaults.py +++ b/django/conf/urls/defaults.py @@ -6,7 +6,16 @@ __all__ = ['handler404', 'handler500', 'include', 'patterns', 'url'] handler404 = 'django.views.defaults.page_not_found' handler500 = 'django.views.defaults.server_error' -include = lambda urlconf_module: [urlconf_module] +def include(arg, namespace=None, app_name=None): + if isinstance(arg, tuple): + # callable returning a namespace hint + if namespace: + raise ImproperlyConfigured('Cannot override the namespace for a dynamic module that provides a namespace') + urlconf_module, app_name, namespace = arg + else: + # No namespace hint - use manually provided namespace + urlconf_module = arg + return (urlconf_module, app_name, namespace) def patterns(prefix, *args): pattern_list = [] @@ -19,9 +28,10 @@ def patterns(prefix, *args): return pattern_list def url(regex, view, kwargs=None, name=None, prefix=''): - if type(view) == list: + if isinstance(view, (list,tuple)): # For include(...) processing. - return RegexURLResolver(regex, view[0], kwargs) + urlconf_module, app_name, namespace = view + return RegexURLResolver(regex, urlconf_module, kwargs, app_name=app_name, namespace=namespace) else: if isinstance(view, basestring): if not view: diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 9d8c862615..5732b34308 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -226,24 +226,24 @@ class ModelAdmin(BaseModelAdmin): return self.admin_site.admin_view(view)(*args, **kwargs) return update_wrapper(wrapper, view) - info = self.admin_site.name, self.model._meta.app_label, self.model._meta.module_name + info = self.model._meta.app_label, self.model._meta.module_name urlpatterns = patterns('', url(r'^$', wrap(self.changelist_view), - name='%sadmin_%s_%s_changelist' % info), + name='%s_%s_changelist' % info), url(r'^add/$', wrap(self.add_view), - name='%sadmin_%s_%s_add' % info), + name='%s_%s_add' % info), url(r'^(.+)/history/$', wrap(self.history_view), - name='%sadmin_%s_%s_history' % info), + name='%s_%s_history' % info), url(r'^(.+)/delete/$', wrap(self.delete_view), - name='%sadmin_%s_%s_delete' % info), + name='%s_%s_delete' % info), url(r'^(.+)/$', wrap(self.change_view), - name='%sadmin_%s_%s_change' % info), + name='%s_%s_change' % info), ) return urlpatterns @@ -582,11 +582,12 @@ class ModelAdmin(BaseModelAdmin): 'save_on_top': self.save_on_top, 'root_path': self.admin_site.root_path, }) + context_instance = template.RequestContext(request, current_app=self.admin_site.name) return render_to_response(self.change_form_template or [ "admin/%s/%s/change_form.html" % (app_label, opts.object_name.lower()), "admin/%s/change_form.html" % app_label, "admin/change_form.html" - ], context, context_instance=template.RequestContext(request)) + ], context, context_instance=context_instance) def response_add(self, request, obj, post_url_continue='../%s/'): """ @@ -977,11 +978,12 @@ class ModelAdmin(BaseModelAdmin): 'actions_on_bottom': self.actions_on_bottom, } context.update(extra_context or {}) + context_instance = template.RequestContext(request, current_app=self.admin_site.name) return render_to_response(self.change_list_template or [ 'admin/%s/%s/change_list.html' % (app_label, opts.object_name.lower()), 'admin/%s/change_list.html' % app_label, 'admin/change_list.html' - ], context, context_instance=template.RequestContext(request)) + ], context, context_instance=context_instance) def delete_view(self, request, object_id, extra_context=None): "The 'delete' admin view for this model." @@ -1032,11 +1034,12 @@ class ModelAdmin(BaseModelAdmin): "app_label": app_label, } context.update(extra_context or {}) + context_instance = template.RequestContext(request, current_app=self.admin_site.name) return render_to_response(self.delete_confirmation_template or [ "admin/%s/%s/delete_confirmation.html" % (app_label, opts.object_name.lower()), "admin/%s/delete_confirmation.html" % app_label, "admin/delete_confirmation.html" - ], context, context_instance=template.RequestContext(request)) + ], context, context_instance=context_instance) def history_view(self, request, object_id, extra_context=None): "The 'history' admin view for this model." @@ -1059,11 +1062,12 @@ class ModelAdmin(BaseModelAdmin): 'app_label': app_label, } context.update(extra_context or {}) + context_instance = template.RequestContext(request, current_app=self.admin_site.name) return render_to_response(self.object_history_template or [ "admin/%s/%s/object_history.html" % (app_label, opts.object_name.lower()), "admin/%s/object_history.html" % app_label, "admin/object_history.html" - ], context, context_instance=template.RequestContext(request)) + ], context, context_instance=context_instance) # # DEPRECATED methods. diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py index 6e9ef1161f..abcff14cd1 100644 --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -5,6 +5,7 @@ from django.contrib.admin import actions from django.contrib.auth import authenticate, login from django.db.models.base import ModelBase from django.core.exceptions import ImproperlyConfigured +from django.core.urlresolvers import reverse from django.shortcuts import render_to_response from django.utils.functional import update_wrapper from django.utils.safestring import mark_safe @@ -38,17 +39,14 @@ class AdminSite(object): login_template = None app_index_template = None - def __init__(self, name=None): + def __init__(self, name=None, app_name='admin'): self._registry = {} # model_class class -> admin_class instance - # TODO Root path is used to calculate urls under the old root() method - # in order to maintain backwards compatibility we are leaving that in - # so root_path isn't needed, not sure what to do about this. - self.root_path = 'admin/' + self.root_path = None if name is None: - name = '' + self.name = 'admin' else: - name += '_' - self.name = name + self.name = name + self.app_name = app_name self._actions = {'delete_selected': actions.delete_selected} self._global_actions = self._actions.copy() @@ -114,20 +112,20 @@ class AdminSite(object): name = name or action.__name__ self._actions[name] = action self._global_actions[name] = action - + def disable_action(self, name): """ Disable a globally-registered action. Raises KeyError for invalid names. """ del self._actions[name] - + def get_action(self, name): """ Explicitally get a registered global action wheather it's enabled or not. Raises KeyError for invalid names. """ return self._global_actions[name] - + def actions(self): """ Get all the enabled actions as an iterable of (name, func). @@ -159,9 +157,9 @@ class AdminSite(object): if 'django.core.context_processors.auth' not in settings.TEMPLATE_CONTEXT_PROCESSORS: raise ImproperlyConfigured("Put 'django.core.context_processors.auth' in your TEMPLATE_CONTEXT_PROCESSORS setting in order to use the admin application.") - def admin_view(self, view): + def admin_view(self, view, cacheable=False): """ - Decorator to create an "admin view attached to this ``AdminSite``. This + Decorator to create an admin view attached to this ``AdminSite``. This wraps the view and provides permission checking by calling ``self.has_permission``. @@ -177,43 +175,49 @@ class AdminSite(object): url(r'^my_view/$', self.admin_view(some_view)) ) return urls + + By default, admin_views are marked non-cacheable using the + ``never_cache`` decorator. If the view can be safely cached, set + cacheable=True. """ def inner(request, *args, **kwargs): if not self.has_permission(request): return self.login(request) return view(request, *args, **kwargs) + if not cacheable: + inner = never_cache(inner) return update_wrapper(inner, view) def get_urls(self): from django.conf.urls.defaults import patterns, url, include - def wrap(view): + def wrap(view, cacheable=False): def wrapper(*args, **kwargs): - return self.admin_view(view)(*args, **kwargs) + return self.admin_view(view, cacheable)(*args, **kwargs) return update_wrapper(wrapper, view) # Admin-site-wide views. urlpatterns = patterns('', url(r'^$', wrap(self.index), - name='%sadmin_index' % self.name), + name='index'), url(r'^logout/$', wrap(self.logout), - name='%sadmin_logout'), + name='logout'), url(r'^password_change/$', - wrap(self.password_change), - name='%sadmin_password_change' % self.name), + wrap(self.password_change, cacheable=True), + name='password_change'), url(r'^password_change/done/$', - wrap(self.password_change_done), - name='%sadmin_password_change_done' % self.name), + wrap(self.password_change_done, cacheable=True), + name='password_change_done'), url(r'^jsi18n/$', - wrap(self.i18n_javascript), - name='%sadmin_jsi18n' % self.name), + wrap(self.i18n_javascript, cacheable=True), + name='jsi18n'), url(r'^r/(?P\d+)/(?P.+)/$', 'django.views.defaults.shortcut'), url(r'^(?P\w+)/$', wrap(self.app_index), - name='%sadmin_app_list' % self.name), + name='app_list') ) # Add in each model's views. @@ -225,7 +229,7 @@ class AdminSite(object): return urlpatterns def urls(self): - return self.get_urls() + return self.get_urls(), self.app_name, self.name urls = property(urls) def password_change(self, request): @@ -233,8 +237,11 @@ class AdminSite(object): Handles the "change password" task -- both form display and validation. """ from django.contrib.auth.views import password_change - return password_change(request, - post_change_redirect='%spassword_change/done/' % self.root_path) + if self.root_path is not None: + url = '%spassword_change/done/' % self.root_path + else: + url = reverse('admin:password_change_done', current_app=self.name) + return password_change(request, post_change_redirect=url) def password_change_done(self, request): """ @@ -362,8 +369,9 @@ class AdminSite(object): 'root_path': self.root_path, } context.update(extra_context or {}) + context_instance = template.RequestContext(request, current_app=self.name) return render_to_response(self.index_template or 'admin/index.html', context, - context_instance=template.RequestContext(request) + context_instance=context_instance ) index = never_cache(index) @@ -376,8 +384,9 @@ class AdminSite(object): 'root_path': self.root_path, } context.update(extra_context or {}) + context_instance = template.RequestContext(request, current_app=self.name) return render_to_response(self.login_template or 'admin/login.html', context, - context_instance=template.RequestContext(request) + context_instance=context_instance ) def app_index(self, request, app_label, extra_context=None): @@ -419,9 +428,10 @@ class AdminSite(object): 'root_path': self.root_path, } context.update(extra_context or {}) + context_instance = template.RequestContext(request, current_app=self.name) return render_to_response(self.app_index_template or ('admin/%s/app_index.html' % app_label, 'admin/app_index.html'), context, - context_instance=template.RequestContext(request) + context_instance=context_instance ) def root(self, request, url): diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index 8cab43963a..95257285eb 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -23,7 +23,30 @@ {% block branding %}{% endblock %} {% if user.is_authenticated and user.is_staff %} -
                                      {% trans 'Welcome,' %} {% firstof user.first_name user.username %}. {% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %}
                                      +
                                      + {% trans 'Welcome,' %} + {% firstof user.first_name user.username %}. + {% block userlinks %} + {% url django-admindocs-docroot as docsroot %} + {% if docsroot %} + {% trans 'Documentation' %} / + {% endif %} + {% url admin:password_change as password_change_url %} + {% if password_change_url %} + + {% else %} + + {% endif %} + {% trans 'Change password' %} / + {% url admin:logout as logout_url %} + {% if logout_url %} + + {% else %} + + {% endif %} + {% trans 'Log out' %} + {% endblock %} +
                                      {% endif %} {% block nav-global %}{% endblock %} diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py index 7ae5e647db..eacea44a31 100644 --- a/django/contrib/admin/widgets.py +++ b/django/contrib/admin/widgets.py @@ -125,7 +125,7 @@ class ForeignKeyRawIdWidget(forms.TextInput): if value: output.append(self.label_for_value(value)) return mark_safe(u''.join(output)) - + def base_url_parameters(self): params = {} if self.rel.limit_choices_to: @@ -137,14 +137,14 @@ class ForeignKeyRawIdWidget(forms.TextInput): v = str(v) items.append((k, v)) params.update(dict(items)) - return params - + return params + def url_parameters(self): from django.contrib.admin.views.main import TO_FIELD_VAR params = self.base_url_parameters() params.update({TO_FIELD_VAR: self.rel.get_related_field().name}) return params - + def label_for_value(self, value): key = self.rel.get_related_field().name obj = self.rel.to._default_manager.get(**{key: value}) @@ -165,10 +165,10 @@ class ManyToManyRawIdWidget(ForeignKeyRawIdWidget): else: value = '' return super(ManyToManyRawIdWidget, self).render(name, value, attrs) - + def url_parameters(self): return self.base_url_parameters() - + def label_for_value(self, value): return '' @@ -222,10 +222,10 @@ class RelatedFieldWidgetWrapper(forms.Widget): rel_to = self.rel.to info = (rel_to._meta.app_label, rel_to._meta.object_name.lower()) try: - related_info = (self.admin_site.name,) + info - related_url = reverse('%sadmin_%s_%s_add' % related_info) + related_url = reverse('admin:%s_%s_add' % info, current_app=self.admin_site.name) except NoReverseMatch: - related_url = '../../../%s/%s/add/' % info + info = (self.admin_site.root_path, rel_to._meta.app_label, rel_to._meta.object_name.lower()) + related_url = '%s%s/%s/add/' % info self.widget.choices = self.choices output = [self.widget.render(name, value, *args, **kwargs)] if rel_to in self.admin_site._registry: # If the related object has an admin interface: diff --git a/django/contrib/admindocs/templates/admin_doc/index.html b/django/contrib/admindocs/templates/admin_doc/index.html index 242fc7339a..a8b21c330d 100644 --- a/django/contrib/admindocs/templates/admin_doc/index.html +++ b/django/contrib/admindocs/templates/admin_doc/index.html @@ -1,6 +1,6 @@ {% extends "admin/base_site.html" %} {% load i18n %} -{% block breadcrumbs %}
                                      Home › Documentation
                                      {% endblock %} +{% block breadcrumbs %}
                                      Home › Documentation
                                      {% endblock %} {% block title %}Documentation{% endblock %} {% block content %} diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py index 4f22fe0a0a..571f393ff8 100644 --- a/django/contrib/admindocs/views.py +++ b/django/contrib/admindocs/views.py @@ -22,11 +22,14 @@ class GenericSite(object): name = 'my site' def get_root_path(): - from django.contrib import admin try: - return urlresolvers.reverse(admin.site.root, args=['']) + return urlresolvers.reverse('admin:index') except urlresolvers.NoReverseMatch: - return getattr(settings, "ADMIN_SITE_ROOT_URL", "/admin/") + from django.contrib import admin + try: + return urlresolvers.reverse(admin.site.root, args=['']) + except urlresolvers.NoReverseMatch: + return getattr(settings, "ADMIN_SITE_ROOT_URL", "/admin/") def doc_index(request): if not utils.docutils_is_available: @@ -179,7 +182,7 @@ model_index = staff_member_required(model_index) def model_detail(request, app_label, model_name): if not utils.docutils_is_available: return missing_docutils_page(request) - + # Get the model class. try: app_mod = models.get_app(app_label) diff --git a/django/contrib/gis/db/models/manager.py b/django/contrib/gis/db/models/manager.py index 2bfda990ff..eac66f4a83 100644 --- a/django/contrib/gis/db/models/manager.py +++ b/django/contrib/gis/db/models/manager.py @@ -19,6 +19,9 @@ class GeoManager(Manager): def centroid(self, *args, **kwargs): return self.get_query_set().centroid(*args, **kwargs) + def collect(self, *args, **kwargs): + return self.get_query_set().collect(*args, **kwargs) + def difference(self, *args, **kwargs): return self.get_query_set().difference(*args, **kwargs) diff --git a/django/contrib/gis/db/models/query.py b/django/contrib/gis/db/models/query.py index 3d31f73c29..ad2cd8ceda 100644 --- a/django/contrib/gis/db/models/query.py +++ b/django/contrib/gis/db/models/query.py @@ -62,6 +62,14 @@ class GeoQuerySet(QuerySet): """ return self._geom_attribute('centroid', **kwargs) + def collect(self, **kwargs): + """ + Performs an aggregate collect operation on the given geometry field. + This is analagous to a union operation, but much faster because + boundaries are not dissolved. + """ + return self._spatial_aggregate(aggregates.Collect, **kwargs) + def difference(self, geom, **kwargs): """ Returns the spatial difference of the geographic field in a `difference` @@ -117,11 +125,19 @@ class GeoQuerySet(QuerySet): if not isinstance(precision, (int, long)): raise TypeError('Precision keyword must be set with an integer.') - # Setting the options flag - options = 0 - if crs and bbox: options = 3 - elif crs: options = 1 - elif bbox: options = 2 + # Setting the options flag -- which depends on which version of + # PostGIS we're using. + major, minor1, minor2 = SpatialBackend.version + if major >=1 and (minor1 >= 4): + options = 0 + if crs and bbox: options = 3 + elif bbox: options = 1 + elif crs: options = 2 + else: + options = 0 + if crs and bbox: options = 3 + elif crs: options = 1 + elif bbox: options = 2 s = {'desc' : 'GeoJSON', 'procedure_args' : {'precision' : precision, 'options' : options}, 'procedure_fmt' : '%(geo_col)s,%(precision)s,%(options)s', diff --git a/django/contrib/gis/db/models/sql/query.py b/django/contrib/gis/db/models/sql/query.py index 5df15a88b1..094fc5815f 100644 --- a/django/contrib/gis/db/models/sql/query.py +++ b/django/contrib/gis/db/models/sql/query.py @@ -13,7 +13,9 @@ from django.contrib.gis.measure import Area, Distance ALL_TERMS = sql.constants.QUERY_TERMS.copy() ALL_TERMS.update(SpatialBackend.gis_terms) +# Pulling out other needed constants/routines to avoid attribute lookups. TABLE_NAME = sql.constants.TABLE_NAME +get_proxied_model = sql.query.get_proxied_model class GeoQuery(sql.Query): """ @@ -153,7 +155,9 @@ class GeoQuery(sql.Query): opts = self.model._meta aliases = set() only_load = self.deferred_to_columns() - proxied_model = opts.proxy and opts.proxy_for_model or 0 + # Skip all proxy to the root proxied model + proxied_model = get_proxied_model(opts) + if start_alias: seen = {None: start_alias} for field, model in opts.get_fields_with_model(): @@ -205,6 +209,10 @@ class GeoQuery(sql.Query): """ values = [] aliases = self.extra_select.keys() + if self.aggregates: + # If we have an aggregate annotation, must extend the aliases + # so their corresponding row values are included. + aliases.extend([None for i in xrange(len(self.aggregates))]) # Have to set a starting row number offset that is used for # determining the correct starting row index -- needed for diff --git a/django/contrib/gis/gdal/prototypes/generation.py b/django/contrib/gis/gdal/prototypes/generation.py index bba715d67c..1303532372 100644 --- a/django/contrib/gis/gdal/prototypes/generation.py +++ b/django/contrib/gis/gdal/prototypes/generation.py @@ -8,6 +8,9 @@ from django.contrib.gis.gdal.prototypes.errcheck import \ check_arg_errcode, check_errcode, check_geom, check_geom_offset, \ check_pointer, check_srs, check_str_arg, check_string, check_const_string +class gdal_char_p(c_char_p): + pass + def double_output(func, argtypes, errcheck=False, strarg=False): "Generates a ctypes function that returns a double value." func.argtypes = argtypes @@ -77,9 +80,9 @@ def string_output(func, argtypes, offset=-1, str_result=False): """ func.argtypes = argtypes if str_result: - # String is the result, don't explicitly define - # the argument type so we can get the pointer. - pass + # Use subclass of c_char_p so the error checking routine + # can free the memory at the pointer's address. + func.restype = gdal_char_p else: # Error code is returned func.restype = c_int diff --git a/django/contrib/gis/geos/prototypes/topology.py b/django/contrib/gis/geos/prototypes/topology.py index 633340901b..65c26f9f37 100644 --- a/django/contrib/gis/geos/prototypes/topology.py +++ b/django/contrib/gis/geos/prototypes/topology.py @@ -10,6 +10,7 @@ __all__ = ['geos_boundary', 'geos_buffer', 'geos_centroid', 'geos_convexhull', from ctypes import c_char_p, c_double, c_int from django.contrib.gis.geos.libgeos import lgeos, GEOM_PTR, GEOS_PREPARE from django.contrib.gis.geos.prototypes.errcheck import check_geom, check_string +from django.contrib.gis.geos.prototypes.geom import geos_char_p def topology(func, *args): "For GEOS unary topology functions." @@ -38,6 +39,7 @@ geos_union = topology(lgeos.GEOSUnion, GEOM_PTR) # GEOSRelate returns a string, not a geometry. geos_relate = lgeos.GEOSRelate geos_relate.argtypes = [GEOM_PTR, GEOM_PTR] +geos_relate.restype = geos_char_p geos_relate.errcheck = check_string # Routines only in GEOS 3.1+ diff --git a/django/contrib/gis/tests/geoapp/tests.py b/django/contrib/gis/tests/geoapp/tests.py index 1eaed196b0..8bf4990fe9 100644 --- a/django/contrib/gis/tests/geoapp/tests.py +++ b/django/contrib/gis/tests/geoapp/tests.py @@ -148,15 +148,16 @@ class GeoModelTest(unittest.TestCase): ptown1 = City.objects.gml(field_name='point', precision=9).get(name='Pueblo') ptown2 = City.objects.gml(precision=9).get(name='Pueblo') + import re if SpatialBackend.oracle: # No precision parameter for Oracle :-/ - import re - gml_regex = re.compile(r'-104.60925\d+,38.25500\d+ ') + gml_regex = re.compile(r'^-104.60925\d+,38.25500\d+ ') for ptown in [ptown1, ptown2]: - self.assertEqual(True, bool(gml_regex.match(ptown.gml))) + self.failUnless(gml_regex.match(ptown.gml)) else: + gml_regex = re.compile(r'^-104\.60925\d+,38\.255001') for ptown in [ptown1, ptown2]: - self.assertEqual('-104.609252,38.255001', ptown.gml) + self.failUnless(gml_regex.match(ptown.gml)) @no_spatialite @no_oracle @@ -167,28 +168,38 @@ class GeoModelTest(unittest.TestCase): if not SpatialBackend.geojson: return + major, minor1, minor2 = SpatialBackend.version + if major >=1 and minor1 >= 4: + pueblo_json = '{"type":"Point","coordinates":[-104.609252,38.255001]}' + houston_json = '{"type":"Point","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"coordinates":[-95.363151,29.763374]}' + victoria_json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.305196,48.462611]}' + chicago_json = '{"type":"Point","crs":{"type":"name","properties":{"name":"EPSG:4326"}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}' + else: + pueblo_json = '{"type":"Point","coordinates":[-104.60925200,38.25500100]}' + houston_json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"coordinates":[-95.36315100,29.76337400]}' + victoria_json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.30519600,48.46261100]}' + chicago_json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}' + # Precision argument should only be an integer self.assertRaises(TypeError, City.objects.geojson, precision='foo') # Reference queries and values. # SELECT ST_AsGeoJson("geoapp_city"."point", 8, 0) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Pueblo'; - json = '{"type":"Point","coordinates":[-104.60925200,38.25500100]}' - self.assertEqual(City.objects.geojson().get(name='Pueblo').geojson, json) + self.assertEqual(pueblo_json, City.objects.geojson().get(name='Pueblo').geojson) - # SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston'; - json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"coordinates":[-95.36315100,29.76337400]}' + # 1.3.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston'; + # 1.4.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston'; # This time we want to include the CRS by using the `crs` keyword. - self.assertEqual(City.objects.geojson(crs=True, model_att='json').get(name='Houston').json, json) + self.assertEqual(houston_json, City.objects.geojson(crs=True, model_att='json').get(name='Houston').json) - # SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Victoria'; - json = '{"type":"Point","bbox":[-123.30519600,48.46261100,-123.30519600,48.46261100],"coordinates":[-123.30519600,48.46261100]}' + # 1.3.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 2) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Victoria'; + # 1.4.x: SELECT ST_AsGeoJson("geoapp_city"."point", 8, 1) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Houston'; # This time we include the bounding box by using the `bbox` keyword. - self.assertEqual(City.objects.geojson(bbox=True).get(name='Victoria').geojson, json) + self.assertEqual(victoria_json, City.objects.geojson(bbox=True).get(name='Victoria').geojson) - # SELECT ST_AsGeoJson("geoapp_city"."point", 5, 3) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Chicago'; - json = '{"type":"Point","crs":{"type":"EPSG","properties":{"EPSG":4326}},"bbox":[-87.65018,41.85039,-87.65018,41.85039],"coordinates":[-87.65018,41.85039]}' + # 1.(3|4).x: SELECT ST_AsGeoJson("geoapp_city"."point", 5, 3) FROM "geoapp_city" WHERE "geoapp_city"."name" = 'Chicago'; # Finally, we set every available keyword. - self.assertEqual(City.objects.geojson(bbox=True, crs=True, precision=5).get(name='Chicago').geojson, json) + self.assertEqual(chicago_json, City.objects.geojson(bbox=True, crs=True, precision=5).get(name='Chicago').geojson) @no_oracle def test03d_svg(self): diff --git a/django/contrib/gis/tests/relatedapp/tests.py b/django/contrib/gis/tests/relatedapp/tests.py index 502a3c0be9..ac53c03923 100644 --- a/django/contrib/gis/tests/relatedapp/tests.py +++ b/django/contrib/gis/tests/relatedapp/tests.py @@ -1,7 +1,7 @@ import os, unittest from django.contrib.gis.geos import * from django.contrib.gis.db.backend import SpatialBackend -from django.contrib.gis.db.models import Count, Extent, F, Union +from django.contrib.gis.db.models import Collect, Count, Extent, F, Union from django.contrib.gis.tests.utils import no_mysql, no_oracle, no_spatialite from django.conf import settings from models import City, Location, DirectoryEntry, Parcel, Book, Author @@ -39,10 +39,7 @@ class RelatedGeoModelTest(unittest.TestCase): "Testing the `transform` GeoQuerySet method on related geographic models." # All the transformations are to state plane coordinate systems using # US Survey Feet (thus a tolerance of 0 implies error w/in 1 survey foot). - if SpatialBackend.postgis: - tol = 3 - else: - tol = 0 + tol = 0 def check_pnt(ref, pnt): self.assertAlmostEqual(ref.x, pnt.x, tol) @@ -231,8 +228,12 @@ class RelatedGeoModelTest(unittest.TestCase): q = pickle.loads(q_str) self.assertEqual(GeoQuery, q.__class__) - def test12_count(self): - "Testing `Count` aggregate use with the `GeoManager`. See #11087." + # TODO: fix on Oracle -- get the following error because the SQL is ordered + # by a geometry object, which Oracle apparently doesn't like: + # ORA-22901: cannot compare nested table or VARRAY or LOB attributes of an object type + @no_oracle + def test12a_count(self): + "Testing `Count` aggregate use with the `GeoManager` on geo-fields." # Creating a new City, 'Fort Worth', that uses the same location # as Dallas. dallas = City.objects.get(name='Dallas') @@ -242,6 +243,8 @@ class RelatedGeoModelTest(unittest.TestCase): loc = Location.objects.annotate(num_cities=Count('city')).get(id=dallas.location.id) self.assertEqual(2, loc.num_cities) + def test12b_count(self): + "Testing `Count` aggregate use with the `GeoManager` on non geo-fields. See #11087." # Creating some data for the Book/Author non-geo models that # use GeoManager. See #11087. tp = Author.objects.create(name='Trevor Paglen') @@ -250,13 +253,19 @@ class RelatedGeoModelTest(unittest.TestCase): Book.objects.create(title='Blank Spots on the Map', author=tp) wp = Author.objects.create(name='William Patry') Book.objects.create(title='Patry on Copyright', author=wp) - + # Should only be one author (Trevor Paglen) returned by this query, and - # the annotation should have 3 for the number of books. + # the annotation should have 3 for the number of books. Also testing + # with a `GeoValuesQuerySet` (see #11489). qs = Author.objects.annotate(num_books=Count('books')).filter(num_books__gt=1) + vqs = Author.objects.values('name').annotate(num_books=Count('books')).filter(num_books__gt=1) self.assertEqual(1, len(qs)) self.assertEqual(3, qs[0].num_books) + self.assertEqual(1, len(vqs)) + self.assertEqual(3, vqs[0]['num_books']) + # TODO: The phantom model does appear on Oracle. + @no_oracle def test13_select_related_null_fk(self): "Testing `select_related` on a nullable ForeignKey via `GeoManager`. See #11381." no_author = Book.objects.create(title='Without Author') @@ -264,6 +273,26 @@ class RelatedGeoModelTest(unittest.TestCase): # Should be `None`, and not a 'dummy' model. self.assertEqual(None, b.author) + @no_mysql + @no_oracle + @no_spatialite + def test14_collect(self): + "Testing the `collect` GeoQuerySet method and `Collect` aggregate." + # Reference query: + # SELECT AsText(ST_Collect("relatedapp_location"."point")) FROM "relatedapp_city" LEFT OUTER JOIN + # "relatedapp_location" ON ("relatedapp_city"."location_id" = "relatedapp_location"."id") + # WHERE "relatedapp_city"."state" = 'TX'; + ref_geom = fromstr('MULTIPOINT(-97.516111 33.058333,-96.801611 32.782057,-95.363151 29.763374,-96.801611 32.782057)') + + c1 = City.objects.filter(state='TX').collect(field_name='location__point') + c2 = City.objects.filter(state='TX').aggregate(Collect('location__point'))['location__point__collect'] + + for coll in (c1, c2): + # Even though Dallas and Ft. Worth share same point, Collect doesn't + # consolidate -- that's why 4 points in MultiPoint. + self.assertEqual(4, len(coll)) + self.assertEqual(ref_geom, coll) + # TODO: Related tests for KML, GML, and distance lookups. def suite(): diff --git a/django/contrib/gis/tests/test_spatialrefsys.py b/django/contrib/gis/tests/test_spatialrefsys.py index 4b1cc093eb..dd2c10f7e8 100644 --- a/django/contrib/gis/tests/test_spatialrefsys.py +++ b/django/contrib/gis/tests/test_spatialrefsys.py @@ -1,4 +1,5 @@ import unittest +from django.contrib.gis.db.backend import SpatialBackend from django.contrib.gis.tests.utils import mysql, no_mysql, oracle, postgis, spatialite if not mysql: from django.contrib.gis.models import SpatialRefSys @@ -7,6 +8,7 @@ test_srs = ({'srid' : 4326, 'auth_name' : ('EPSG', True), 'auth_srid' : 4326, 'srtext' : 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],TOWGS84[0,0,0,0,0,0,0],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]', + 'srtext14' : 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]', 'proj4' : '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs ', 'spheroid' : 'WGS 84', 'name' : 'WGS 84', 'geographic' : True, 'projected' : False, 'spatialite' : True, @@ -17,6 +19,7 @@ test_srs = ({'srid' : 4326, 'auth_name' : ('EPSG', False), 'auth_srid' : 32140, 'srtext' : 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",30.28333333333333],PARAMETER["standard_parallel_2",28.38333333333333],PARAMETER["latitude_of_origin",27.83333333333333],PARAMETER["central_meridian",-99],PARAMETER["false_easting",600000],PARAMETER["false_northing",4000000],UNIT["metre",1,AUTHORITY["EPSG","9001"]],AUTHORITY["EPSG","32140"]]', + 'srtext14': 'PROJCS["NAD83 / Texas South Central",GEOGCS["NAD83",DATUM["North_American_Datum_1983",SPHEROID["GRS 1980",6378137,298.257222101,AUTHORITY["EPSG","7019"]],AUTHORITY["EPSG","6269"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4269"]],UNIT["metre",1,AUTHORITY["EPSG","9001"]],PROJECTION["Lambert_Conformal_Conic_2SP"],PARAMETER["standard_parallel_1",30.28333333333333],PARAMETER["standard_parallel_2",28.38333333333333],PARAMETER["latitude_of_origin",27.83333333333333],PARAMETER["central_meridian",-99],PARAMETER["false_easting",600000],PARAMETER["false_northing",4000000],AUTHORITY["EPSG","32140"],AXIS["X",EAST],AXIS["Y",NORTH]]', 'proj4' : '+proj=lcc +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lat_0=27.83333333333333 +lon_0=-99 +x_0=600000 +y_0=4000000 +ellps=GRS80 +datum=NAD83 +units=m +no_defs ', 'spheroid' : 'GRS 1980', 'name' : 'NAD83 / Texas South Central', 'geographic' : False, 'projected' : True, 'spatialite' : False, @@ -25,6 +28,10 @@ test_srs = ({'srid' : 4326, }, ) +if SpatialBackend.postgis: + major, minor1, minor2 = SpatialBackend.version + POSTGIS_14 = major >=1 and minor1 >= 4 + class SpatialRefSysTest(unittest.TestCase): @no_mysql @@ -45,7 +52,11 @@ class SpatialRefSysTest(unittest.TestCase): # No proj.4 and different srtext on oracle backends :( if postgis: - self.assertEqual(sd['srtext'], srs.wkt) + if POSTGIS_14: + srtext = sd['srtext14'] + else: + srtext = sd['srtext'] + self.assertEqual(srtext, srs.wkt) self.assertEqual(sd['proj4'], srs.proj4text) @no_mysql @@ -68,7 +79,11 @@ class SpatialRefSysTest(unittest.TestCase): self.assertEqual(sd['proj4'], srs.proj4) # No `srtext` field in the `spatial_ref_sys` table in SpatiaLite if not spatialite: - self.assertEqual(sd['srtext'], srs.wkt) + if POSTGIS_14: + srtext = sd['srtext14'] + else: + srtext = sd['srtext'] + self.assertEqual(srtext, srs.wkt) @no_mysql def test03_ellipsoid(self): diff --git a/django/core/management/commands/dumpdata.py b/django/core/management/commands/dumpdata.py index 9172d938d2..7e05b89160 100644 --- a/django/core/management/commands/dumpdata.py +++ b/django/core/management/commands/dumpdata.py @@ -73,7 +73,8 @@ class Command(BaseCommand): model_list = get_models(app) for model in model_list: - objects.extend(model._default_manager.all()) + if not model._meta.proxy: + objects.extend(model._default_manager.all()) try: return serializers.serialize(format, objects, indent=indent) diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py index 16d75fd88b..fc2c694ab6 100644 --- a/django/core/management/commands/runserver.py +++ b/django/core/management/commands/runserver.py @@ -56,8 +56,7 @@ class Command(BaseCommand): translation.activate(settings.LANGUAGE_CODE) try: - path = admin_media_path or django.__path__[0] + '/contrib/admin/media' - handler = AdminMediaHandler(WSGIHandler(), path) + handler = AdminMediaHandler(WSGIHandler(), admin_media_path) run(addr, int(port), handler) except WSGIServerException, e: # Use helpful error messages instead of ugly tracebacks. diff --git a/django/core/servers/basehttp.py b/django/core/servers/basehttp.py index 6fed0acc59..f7c0a77f7c 100644 --- a/django/core/servers/basehttp.py +++ b/django/core/servers/basehttp.py @@ -16,6 +16,7 @@ import sys import urllib from django.utils.http import http_date +from django.utils._os import safe_join __version__ = "0.1" __all__ = ['WSGIServer','WSGIRequestHandler'] @@ -621,11 +622,25 @@ class AdminMediaHandler(object): self.application = application if not media_dir: import django - self.media_dir = django.__path__[0] + '/contrib/admin/media' + self.media_dir = \ + os.path.join(django.__path__[0], 'contrib', 'admin', 'media') else: self.media_dir = media_dir self.media_url = settings.ADMIN_MEDIA_PREFIX + def file_path(self, url): + """ + Returns the path to the media file on disk for the given URL. + + The passed URL is assumed to begin with ADMIN_MEDIA_PREFIX. If the + resultant file path is outside the media directory, then a ValueError + is raised. + """ + # Remove ADMIN_MEDIA_PREFIX. + relative_url = url[len(self.media_url):] + relative_path = urllib.url2pathname(relative_url) + return safe_join(self.media_dir, relative_path) + def __call__(self, environ, start_response): import os.path @@ -636,19 +651,25 @@ class AdminMediaHandler(object): return self.application(environ, start_response) # Find the admin file and serve it up, if it exists and is readable. - relative_url = environ['PATH_INFO'][len(self.media_url):] - file_path = os.path.join(self.media_dir, relative_url) + try: + file_path = self.file_path(environ['PATH_INFO']) + except ValueError: # Resulting file path was not valid. + status = '404 NOT FOUND' + headers = {'Content-type': 'text/plain'} + output = ['Page not found: %s' % environ['PATH_INFO']] + start_response(status, headers.items()) + return output if not os.path.exists(file_path): status = '404 NOT FOUND' headers = {'Content-type': 'text/plain'} - output = ['Page not found: %s' % file_path] + output = ['Page not found: %s' % environ['PATH_INFO']] else: try: fp = open(file_path, 'rb') except IOError: status = '401 UNAUTHORIZED' headers = {'Content-type': 'text/plain'} - output = ['Permission denied: %s' % file_path] + output = ['Permission denied: %s' % environ['PATH_INFO']] else: # This is a very simple implementation of conditional GET with # the Last-Modified header. It makes media files a bit speedier diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py index b3dcfdb8c1..4f9eb982e2 100644 --- a/django/core/urlresolvers.py +++ b/django/core/urlresolvers.py @@ -139,7 +139,7 @@ class RegexURLPattern(object): callback = property(_get_callback) class RegexURLResolver(object): - def __init__(self, regex, urlconf_name, default_kwargs=None): + def __init__(self, regex, urlconf_name, default_kwargs=None, app_name=None, namespace=None): # regex is a string representing a regular expression. # urlconf_name is a string representing the module containing URLconfs. self.regex = re.compile(regex, re.UNICODE) @@ -148,19 +148,29 @@ class RegexURLResolver(object): self._urlconf_module = self.urlconf_name self.callback = None self.default_kwargs = default_kwargs or {} - self._reverse_dict = MultiValueDict() + self.namespace = namespace + self.app_name = app_name + self._reverse_dict = None + self._namespace_dict = None + self._app_dict = None def __repr__(self): - return '<%s %s %s>' % (self.__class__.__name__, self.urlconf_name, self.regex.pattern) + return '<%s %s (%s:%s) %s>' % (self.__class__.__name__, self.urlconf_name, self.app_name, self.namespace, self.regex.pattern) - def _get_reverse_dict(self): - if not self._reverse_dict: - lookups = MultiValueDict() - for pattern in reversed(self.url_patterns): - p_pattern = pattern.regex.pattern - if p_pattern.startswith('^'): - p_pattern = p_pattern[1:] - if isinstance(pattern, RegexURLResolver): + def _populate(self): + lookups = MultiValueDict() + namespaces = {} + apps = {} + for pattern in reversed(self.url_patterns): + p_pattern = pattern.regex.pattern + if p_pattern.startswith('^'): + p_pattern = p_pattern[1:] + if isinstance(pattern, RegexURLResolver): + if pattern.namespace: + namespaces[pattern.namespace] = (p_pattern, pattern) + if pattern.app_name: + apps.setdefault(pattern.app_name, []).append(pattern.namespace) + else: parent = normalize(pattern.regex.pattern) for name in pattern.reverse_dict: for matches, pat in pattern.reverse_dict.getlist(name): @@ -168,14 +178,36 @@ class RegexURLResolver(object): for piece, p_args in parent: new_matches.extend([(piece + suffix, p_args + args) for (suffix, args) in matches]) lookups.appendlist(name, (new_matches, p_pattern + pat)) - else: - bits = normalize(p_pattern) - lookups.appendlist(pattern.callback, (bits, p_pattern)) - lookups.appendlist(pattern.name, (bits, p_pattern)) - self._reverse_dict = lookups + for namespace, (prefix, sub_pattern) in pattern.namespace_dict.items(): + namespaces[namespace] = (p_pattern + prefix, sub_pattern) + for app_name, namespace_list in pattern.app_dict.items(): + apps.setdefault(app_name, []).extend(namespace_list) + else: + bits = normalize(p_pattern) + lookups.appendlist(pattern.callback, (bits, p_pattern)) + lookups.appendlist(pattern.name, (bits, p_pattern)) + self._reverse_dict = lookups + self._namespace_dict = namespaces + self._app_dict = apps + + def _get_reverse_dict(self): + if self._reverse_dict is None: + self._populate() return self._reverse_dict reverse_dict = property(_get_reverse_dict) + def _get_namespace_dict(self): + if self._namespace_dict is None: + self._populate() + return self._namespace_dict + namespace_dict = property(_get_namespace_dict) + + def _get_app_dict(self): + if self._app_dict is None: + self._populate() + return self._app_dict + app_dict = property(_get_app_dict) + def resolve(self, path): tried = [] match = self.regex.search(path) @@ -185,7 +217,11 @@ class RegexURLResolver(object): try: sub_match = pattern.resolve(new_path) except Resolver404, e: - tried.extend([(pattern.regex.pattern + ' ' + t) for t in e.args[0]['tried']]) + sub_tried = e.args[0].get('tried') + if sub_tried is not None: + tried.extend([(pattern.regex.pattern + ' ' + t) for t in sub_tried]) + else: + tried.append(pattern.regex.pattern) else: if sub_match: sub_match_dict = dict([(smart_str(k), v) for k, v in match.groupdict().items()]) @@ -195,7 +231,7 @@ class RegexURLResolver(object): return sub_match[0], sub_match[1], sub_match_dict tried.append(pattern.regex.pattern) raise Resolver404, {'tried': tried, 'path': new_path} - raise Resolver404, {'tried': [], 'path' : path} + raise Resolver404, {'path' : path} def _get_urlconf_module(self): try: @@ -257,12 +293,51 @@ class RegexURLResolver(object): def resolve(path, urlconf=None): return get_resolver(urlconf).resolve(path) -def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None): +def reverse(viewname, urlconf=None, args=None, kwargs=None, prefix=None, current_app=None): + resolver = get_resolver(urlconf) args = args or [] kwargs = kwargs or {} + if prefix is None: prefix = get_script_prefix() - return iri_to_uri(u'%s%s' % (prefix, get_resolver(urlconf).reverse(viewname, + + if not isinstance(viewname, basestring): + view = viewname + else: + parts = viewname.split(':') + parts.reverse() + view = parts[0] + path = parts[1:] + + resolved_path = [] + while path: + ns = path.pop() + + # Lookup the name to see if it could be an app identifier + try: + app_list = resolver.app_dict[ns] + # Yes! Path part matches an app in the current Resolver + if current_app and current_app in app_list: + # If we are reversing for a particular app, use that namespace + ns = current_app + elif ns not in app_list: + # The name isn't shared by one of the instances (i.e., the default) + # so just pick the first instance as the default. + ns = app_list[0] + except KeyError: + pass + + try: + extra, resolver = resolver.namespace_dict[ns] + resolved_path.append(ns) + prefix = prefix + extra + except KeyError, key: + if resolved_path: + raise NoReverseMatch("%s is not a registered namespace inside '%s'" % (key, ':'.join(resolved_path))) + else: + raise NoReverseMatch("%s is not a registered namespace" % key) + + return iri_to_uri(u'%s%s' % (prefix, resolver.reverse(view, *args, **kwargs))) def clear_url_caches(): diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py index 1ac75426c1..43f47048e0 100644 --- a/django/db/backends/creation.py +++ b/django/db/backends/creation.py @@ -40,7 +40,7 @@ class BaseDatabaseCreation(object): from django.db import models opts = model._meta - if not opts.managed: + if not opts.managed or opts.proxy: return [], {} final_output = [] table_output = [] @@ -121,7 +121,7 @@ class BaseDatabaseCreation(object): "Returns any ALTER TABLE statements to add constraints after the fact." from django.db.backends.util import truncate_name - if not model._meta.managed: + if not model._meta.managed or model._meta.proxy: return [] qn = self.connection.ops.quote_name final_output = [] @@ -236,7 +236,7 @@ class BaseDatabaseCreation(object): def sql_indexes_for_model(self, model, style): "Returns the CREATE INDEX SQL statements for a single model" - if not model._meta.managed: + if not model._meta.managed or model._meta.proxy: return [] output = [] for f in model._meta.local_fields: @@ -268,7 +268,7 @@ class BaseDatabaseCreation(object): def sql_destroy_model(self, model, references_to_delete, style): "Return the DROP TABLE and restraint dropping statements for a single model" - if not model._meta.managed: + if not model._meta.managed or model._meta.proxy: return [] # Drop the table now qn = self.connection.ops.quote_name @@ -286,7 +286,7 @@ class BaseDatabaseCreation(object): def sql_remove_table_constraints(self, model, references_to_delete, style): from django.db.backends.util import truncate_name - if not model._meta.managed: + if not model._meta.managed or model._meta.proxy: return [] output = [] qn = self.connection.ops.quote_name diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py index 8f96049cc4..80558a0a68 100644 --- a/django/db/backends/oracle/base.py +++ b/django/db/backends/oracle/base.py @@ -217,12 +217,13 @@ WHEN (new.%(col_name)s IS NULL) # continue to loop break for f in model._meta.many_to_many: - table_name = self.quote_name(f.m2m_db_table()) - sequence_name = get_sequence_name(f.m2m_db_table()) - column_name = self.quote_name('id') - output.append(query % {'sequence': sequence_name, - 'table': table_name, - 'column': column_name}) + if not f.rel.through: + table_name = self.quote_name(f.m2m_db_table()) + sequence_name = get_sequence_name(f.m2m_db_table()) + column_name = self.quote_name('id') + output.append(query % {'sequence': sequence_name, + 'table': table_name, + 'column': column_name}) return output def start_transaction_sql(self): @@ -344,7 +345,7 @@ class OracleParam(object): """ Wrapper object for formatting parameters for Oracle. If the string representation of the value is large enough (greater than 4000 characters) - the input size needs to be set as NCLOB. Alternatively, if the parameter + the input size needs to be set as CLOB. Alternatively, if the parameter has an `input_size` attribute, then the value of the `input_size` attribute will be used instead. Otherwise, no input size will be set for the parameter when executing the query. @@ -359,8 +360,8 @@ class OracleParam(object): # If parameter has `input_size` attribute, use that. self.input_size = param.input_size elif isinstance(param, basestring) and len(param) > 4000: - # Mark any string param greater than 4000 characters as an NCLOB. - self.input_size = Database.NCLOB + # Mark any string param greater than 4000 characters as a CLOB. + self.input_size = Database.CLOB else: self.input_size = None diff --git a/django/db/backends/postgresql/operations.py b/django/db/backends/postgresql/operations.py index ee74be1624..331156ee11 100644 --- a/django/db/backends/postgresql/operations.py +++ b/django/db/backends/postgresql/operations.py @@ -121,14 +121,15 @@ class DatabaseOperations(BaseDatabaseOperations): style.SQL_TABLE(qn(model._meta.db_table)))) break # Only one AutoField is allowed per model, so don't bother continuing. for f in model._meta.many_to_many: - output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \ - (style.SQL_KEYWORD('SELECT'), - style.SQL_FIELD(qn('%s_id_seq' % f.m2m_db_table())), - style.SQL_FIELD(qn('id')), - style.SQL_FIELD(qn('id')), - style.SQL_KEYWORD('IS NOT'), - style.SQL_KEYWORD('FROM'), - style.SQL_TABLE(qn(f.m2m_db_table())))) + if not f.rel.through: + output.append("%s setval('%s', coalesce(max(%s), 1), max(%s) %s null) %s %s;" % \ + (style.SQL_KEYWORD('SELECT'), + style.SQL_FIELD(qn('%s_id_seq' % f.m2m_db_table())), + style.SQL_FIELD(qn('id')), + style.SQL_FIELD(qn('id')), + style.SQL_KEYWORD('IS NOT'), + style.SQL_KEYWORD('FROM'), + style.SQL_TABLE(qn(f.m2m_db_table())))) return output def savepoint_create_sql(self, sid): diff --git a/django/forms/models.py b/django/forms/models.py index afd3e61ea9..af3d7023c8 100644 --- a/django/forms/models.py +++ b/django/forms/models.py @@ -464,8 +464,21 @@ class BaseModelFormSet(BaseFormSet): return len(self.get_queryset()) return super(BaseModelFormSet, self).initial_form_count() + def _existing_object(self, pk): + if not hasattr(self, '_object_dict'): + self._object_dict = dict([(o.pk, o) for o in self.get_queryset()]) + return self._object_dict.get(pk) + def _construct_form(self, i, **kwargs): - if i < self.initial_form_count(): + if self.is_bound and i < self.initial_form_count(): + pk_key = "%s-%s" % (self.add_prefix(i), self.model._meta.pk.name) + pk = self.data[pk_key] + pk_field = self.model._meta.pk + pk = pk_field.get_db_prep_lookup('exact', pk) + if isinstance(pk, list): + pk = pk[0] + kwargs['instance'] = self._existing_object(pk) + if i < self.initial_form_count() and not kwargs.get('instance'): kwargs['instance'] = self.get_queryset()[i] return super(BaseModelFormSet, self)._construct_form(i, **kwargs) @@ -604,10 +617,6 @@ class BaseModelFormSet(BaseFormSet): if not self.get_queryset(): return [] - # Put the objects from self.get_queryset into a dict so they are easy to lookup by pk - existing_objects = {} - for obj in self.get_queryset(): - existing_objects[obj.pk] = obj saved_instances = [] for form in self.initial_forms: pk_name = self._pk_field.name @@ -618,7 +627,7 @@ class BaseModelFormSet(BaseFormSet): pk_value = form.fields[pk_name].clean(raw_pk_value) pk_value = getattr(pk_value, 'pk', pk_value) - obj = existing_objects[pk_value] + obj = self._existing_object(pk_value) if self.can_delete: raw_delete_value = form._raw_value(DELETION_FIELD_NAME) should_delete = form.fields[DELETION_FIELD_NAME].clean(raw_delete_value) @@ -663,13 +672,16 @@ class BaseModelFormSet(BaseFormSet): return ((not pk.editable) or (pk.auto_created or isinstance(pk, AutoField)) or (pk.rel and pk.rel.parent_link and pk_is_not_editable(pk.rel.to._meta.pk))) if pk_is_not_editable(pk) or pk.name not in form.fields: - try: - if index: - pk_value = self.get_queryset()[index].pk - else: + if form.is_bound: + pk_value = form.instance.pk + else: + try: + if index: + pk_value = self.get_queryset()[index].pk + else: + pk_value = None + except IndexError: pk_value = None - except IndexError: - pk_value = None if isinstance(pk, OneToOneField) or isinstance(pk, ForeignKey): qs = pk.rel.to._default_manager.get_query_set() else: diff --git a/django/middleware/http.py b/django/middleware/http.py index 53b65c1034..75af664447 100644 --- a/django/middleware/http.py +++ b/django/middleware/http.py @@ -1,3 +1,4 @@ +from django.core.exceptions import MiddlewareNotUsed from django.utils.http import http_date class ConditionalGetMiddleware(object): @@ -32,24 +33,19 @@ class ConditionalGetMiddleware(object): class SetRemoteAddrFromForwardedFor(object): """ - Middleware that sets REMOTE_ADDR based on HTTP_X_FORWARDED_FOR, if the - latter is set. This is useful if you're sitting behind a reverse proxy that - causes each request's REMOTE_ADDR to be set to 127.0.0.1. - - Note that this does NOT validate HTTP_X_FORWARDED_FOR. If you're not behind - a reverse proxy that sets HTTP_X_FORWARDED_FOR automatically, do not use - this middleware. Anybody can spoof the value of HTTP_X_FORWARDED_FOR, and - because this sets REMOTE_ADDR based on HTTP_X_FORWARDED_FOR, that means - anybody can "fake" their IP address. Only use this when you can absolutely - trust the value of HTTP_X_FORWARDED_FOR. + This middleware has been removed; see the Django 1.1 release notes for + details. + + It previously set REMOTE_ADDR based on HTTP_X_FORWARDED_FOR. However, after + investiagtion, it turns out this is impossible to do in a general manner: + different proxies treat the X-Forwarded-For header differently. Thus, a + built-in middleware can lead to application-level security problems, and so + this was removed in Django 1.1 + """ - def process_request(self, request): - try: - real_ip = request.META['HTTP_X_FORWARDED_FOR'] - except KeyError: - return None - else: - # HTTP_X_FORWARDED_FOR can be a comma-separated list of IPs. The - # client's IP will be the first one. - real_ip = real_ip.split(",")[0].strip() - request.META['REMOTE_ADDR'] = real_ip + def __init__(self): + import warnings + warnings.warn("SetRemoteAddrFromForwardedFor has been removed. " + "See the Django 1.1 release notes for details.", + category=DeprecationWarning) + raise MiddlewareNotUsed() \ No newline at end of file diff --git a/django/template/context.py b/django/template/context.py index 0ccb5faecf..1c43387468 100644 --- a/django/template/context.py +++ b/django/template/context.py @@ -9,10 +9,11 @@ class ContextPopException(Exception): class Context(object): "A stack container for variable context" - def __init__(self, dict_=None, autoescape=True): + def __init__(self, dict_=None, autoescape=True, current_app=None): dict_ = dict_ or {} self.dicts = [dict_] self.autoescape = autoescape + self.current_app = current_app def __repr__(self): return repr(self.dicts) @@ -96,8 +97,8 @@ class RequestContext(Context): Additional processors can be specified as a list of callables using the "processors" keyword argument. """ - def __init__(self, request, dict=None, processors=None): - Context.__init__(self, dict) + def __init__(self, request, dict=None, processors=None, current_app=None): + Context.__init__(self, dict, current_app=current_app) if processors is None: processors = () else: diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index a61dd8b36c..de746997ab 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -367,17 +367,17 @@ class URLNode(Node): # {% url ... as var %} construct in which cause return nothing. url = '' try: - url = reverse(self.view_name, args=args, kwargs=kwargs) + url = reverse(self.view_name, args=args, kwargs=kwargs, current_app=context.current_app) except NoReverseMatch, e: if settings.SETTINGS_MODULE: project_name = settings.SETTINGS_MODULE.split('.')[0] try: url = reverse(project_name + '.' + self.view_name, - args=args, kwargs=kwargs) + args=args, kwargs=kwargs, current_app=context.current_app) except NoReverseMatch: if self.asvar is None: # Re-raise the original exception, not the one with - # the path relative to the project. This makes a + # the path relative to the project. This makes a # better error message. raise e else: @@ -564,7 +564,7 @@ do_filter = register.tag("filter", do_filter) #@register.tag def firstof(parser, token): """ - Outputs the first variable passed that is not False. + Outputs the first variable passed that is not False, without escaping. Outputs nothing if all the passed variables are False. @@ -575,11 +575,11 @@ def firstof(parser, token): This is equivalent to:: {% if var1 %} - {{ var1 }} + {{ var1|safe }} {% else %}{% if var2 %} - {{ var2 }} + {{ var2|safe }} {% else %}{% if var3 %} - {{ var3 }} + {{ var3|safe }} {% endif %}{% endif %}{% endif %} but obviously much cleaner! @@ -589,6 +589,12 @@ def firstof(parser, token): {% firstof var1 var2 var3 "fallback value" %} + If you want to escape the output, use a filter tag:: + + {% filter force_escape %} + {% firstof var1 var2 var3 "fallback value" %} + {% endfilter %} + """ bits = token.split_contents()[1:] if len(bits) < 1: diff --git a/django/views/debug.py b/django/views/debug.py index 4e9dcb1d7c..6da89ffcf5 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -405,7 +405,7 @@ TECHNICAL_500_TEMPLATE = """ Exception Value: - 
                                      {{ exception_value|escape }}
                                      
+      
                                      {{ exception_value|escape }}
                                      
     
     
       Exception Location:
@@ -630,7 +630,7 @@ Exception Value: {{ exception_value|escape }}
   {% else %}
     
                                      No FILES data
                                      
   {% endif %}
-  
+
 
   
   {% if request.COOKIES %}
diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py
index 65a823e10b..af07a84f32 100644
--- a/docs/_ext/djangodocs.py
+++ b/docs/_ext/djangodocs.py
@@ -6,10 +6,16 @@ import docutils.nodes
 import docutils.transforms
 import sphinx
 import sphinx.addnodes
-import sphinx.builder
+try:
+    from sphinx import builders
+except ImportError:
+    import sphinx.builder as builders
 import sphinx.directives
 import sphinx.environment
-import sphinx.htmlwriter
+try:
+    import sphinx.writers.html as sphinx_htmlwriter
+except ImportError:
+    import sphinx.htmlwriter as sphinx_htmlwriter
 import sphinx.roles
 from docutils import nodes
 
@@ -44,7 +50,7 @@ def setup(app):
         directivename = "django-admin-option",
         rolename      = "djadminopt",
         indextemplate = "pair: %s; django-admin command-line option",
-        parse_node    = lambda env, sig, signode: sphinx.directives.parse_option_desc(signode, sig),
+        parse_node    = parse_django_adminopt_node,
     )
     app.add_config_value('django_next_version', '0.0', True)
     app.add_directive('versionadded', parse_version_directive, 1, (1, 1, 1))
@@ -102,7 +108,7 @@ class SuppressBlockquotes(docutils.transforms.Transform):
             if len(node.children) == 1 and isinstance(node.children[0], self.suppress_blockquote_child_nodes):
                 node.replace_self(node.children[0])
 
-class DjangoHTMLTranslator(sphinx.htmlwriter.SmartyPantsHTMLTranslator):
+class DjangoHTMLTranslator(sphinx_htmlwriter.SmartyPantsHTMLTranslator):
     """
     Django-specific reST to HTML tweaks.
     """
@@ -125,10 +131,10 @@ class DjangoHTMLTranslator(sphinx.htmlwriter.SmartyPantsHTMLTranslator):
     #
     def visit_literal_block(self, node):
         self.no_smarty += 1
-        sphinx.htmlwriter.SmartyPantsHTMLTranslator.visit_literal_block(self, node)
-        
+        sphinx_htmlwriter.SmartyPantsHTMLTranslator.visit_literal_block(self, node)
+
     def depart_literal_block(self, node):
-        sphinx.htmlwriter.SmartyPantsHTMLTranslator.depart_literal_block(self, node) 
+        sphinx_htmlwriter.SmartyPantsHTMLTranslator.depart_literal_block(self, node)
         self.no_smarty -= 1
         
     #
@@ -162,7 +168,7 @@ class DjangoHTMLTranslator(sphinx.htmlwriter.SmartyPantsHTMLTranslator):
     # Give each section a unique ID -- nice for custom CSS hooks
     # This is different on docutils 0.5 vs. 0.4...
 
-    if hasattr(sphinx.htmlwriter.SmartyPantsHTMLTranslator, 'start_tag_with_title') and sphinx.__version__ == '0.4.2':
+    if hasattr(sphinx_htmlwriter.SmartyPantsHTMLTranslator, 'start_tag_with_title') and sphinx.__version__ == '0.4.2':
         def start_tag_with_title(self, node, tagname, **atts):
             node = {
                 'classes': node.get('classes', []), 
@@ -176,7 +182,7 @@ class DjangoHTMLTranslator(sphinx.htmlwriter.SmartyPantsHTMLTranslator):
             node['ids'] = ['s-' + i for i in old_ids]
             if sphinx.__version__ != '0.4.2':
                 node['ids'].extend(old_ids)
-            sphinx.htmlwriter.SmartyPantsHTMLTranslator.visit_section(self, node)
+            sphinx_htmlwriter.SmartyPantsHTMLTranslator.visit_section(self, node)
             node['ids'] = old_ids
 
 def parse_django_admin_node(env, sig, signode):
@@ -186,6 +192,25 @@ def parse_django_admin_node(env, sig, signode):
     signode += sphinx.addnodes.desc_name(title, title)
     return sig
 
+def parse_django_adminopt_node(env, sig, signode):
+    """A copy of sphinx.directives.CmdoptionDesc.parse_signature()"""
+    from sphinx import addnodes
+    from sphinx.directives.desc import option_desc_re
+    count = 0
+    firstname = ''
+    for m in option_desc_re.finditer(sig):
+        optname, args = m.groups()
+        if count:
+            signode += addnodes.desc_addname(', ', ', ')
+        signode += addnodes.desc_name(optname, optname)
+        signode += addnodes.desc_addname(args, args)
+        if not count:
+            firstname = optname
+        count += 1
+    if not firstname:
+        raise ValueError
+    return firstname
+
 def monkeypatch_pickle_builder():
     import shutil
     from os import path
@@ -214,12 +239,12 @@ def monkeypatch_pickle_builder():
 
         # copy the environment file from the doctree dir to the output dir
         # as needed by the web app
-        shutil.copyfile(path.join(self.doctreedir, sphinx.builder.ENV_PICKLE_FILENAME),
-                        path.join(self.outdir, sphinx.builder.ENV_PICKLE_FILENAME))
+        shutil.copyfile(path.join(self.doctreedir, builders.ENV_PICKLE_FILENAME),
+                        path.join(self.outdir, builders.ENV_PICKLE_FILENAME))
 
         # touch 'last build' file, used by the web application to determine
         # when to reload its environment and clear the cache
-        open(path.join(self.outdir, sphinx.builder.LAST_BUILD_FILENAME), 'w').close()
+        open(path.join(self.outdir, builders.LAST_BUILD_FILENAME), 'w').close()
+
+    builders.PickleHTMLBuilder.handle_finish = handle_finish
 
-    sphinx.builder.PickleHTMLBuilder.handle_finish = handle_finish
-    
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
index eb42298ab3..5bf1da6a37 100644
--- a/docs/_templates/layout.html
+++ b/docs/_templates/layout.html
@@ -1,6 +1,6 @@
 {% extends "!layout.html" %}
 
-{%- macro secondnav %}
+{%- macro secondnav() %}
   {%- if prev %}
     « previous 
     {{ reldelim2 }}
diff --git a/docs/faq/admin.txt b/docs/faq/admin.txt
index c23bdd1fe9..4c7b570f00 100644
--- a/docs/faq/admin.txt
+++ b/docs/faq/admin.txt
@@ -37,20 +37,19 @@ Set the :setting:`CACHE_MIDDLEWARE_ANONYMOUS_ONLY` setting to ``True``. See the
 How do I automatically set a field's value to the user who last edited the object in the admin?
 -----------------------------------------------------------------------------------------------
 
-At this point, Django doesn't have an official way to do this. But it's an oft-requested
-feature, so we're discussing how it can be implemented. The problem is we don't want to couple
-the model layer with the admin layer with the request layer (to get the current user). It's a
-tricky problem.
-
-One person hacked up a `solution that doesn't require patching Django`_, but note that it's an
-unofficial solution, and there's no guarantee it won't break at some point.
-
-.. _solution that doesn't require patching Django: http://lukeplant.me.uk/blog.php?id=1107301634
+The :class:`ModelAdmin` class provides customization hooks that allow you to transform
+an object as it saved, using details from the request. By extracting the current user
+from the request, and customizing the :meth:`ModelAdmin.save_model` hook, you can update
+an object to reflect the user that edited it. See :ref:`the documentation on ModelAdmin
+methods ` for an example.
 
 How do I limit admin access so that objects can only be edited by the users who created them?
 ---------------------------------------------------------------------------------------------
 
-See the answer to the previous question.
+The :class:`ModelAdmin` class also provides customization hooks that allow you to control the
+visibility and editability of objects in the admin. Using the same trick of extracting the
+user from the request, the :meth:`ModelAdmin.queryset` and :meth:`ModelAdmin.has_change_permission`
+can be used to control the visibility and editability of objects in the admin.
 
 My admin-site CSS and images showed up fine using the development server, but they're not displaying when using mod_python.
 ---------------------------------------------------------------------------------------------------------------------------
diff --git a/docs/howto/custom-model-fields.txt b/docs/howto/custom-model-fields.txt
index 709ea49b87..9f798f14d5 100644
--- a/docs/howto/custom-model-fields.txt
+++ b/docs/howto/custom-model-fields.txt
@@ -464,7 +464,7 @@ should raise either a ``ValueError`` if the ``value`` is of the wrong sort (a
 list when you were expecting an object, for example) or a ``TypeError`` if
 your field does not support that type of lookup. For many fields, you can get
 by with handling the lookup types that need special handling for your field
-and pass the rest of the :meth:`get_db_prep_lookup` method of the parent class.
+and pass the rest to the :meth:`get_db_prep_lookup` method of the parent class.
 
 If you needed to implement ``get_db_prep_save()``, you will usually need to
 implement ``get_db_prep_lookup()``. If you don't, ``get_db_prep_value`` will be
diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt
index 9ba1c2f9fb..8b9a4d3696 100644
--- a/docs/howto/deployment/modpython.txt
+++ b/docs/howto/deployment/modpython.txt
@@ -6,8 +6,8 @@ How to use Django with Apache and mod_python
 
 .. highlight:: apache
 
-The `mod_python`_ module for Apache_ can be used to deploy Django to a 
-production server, although it has been mostly superseded by the simpler 
+The `mod_python`_ module for Apache_ can be used to deploy Django to a
+production server, although it has been mostly superseded by the simpler
 :ref:`mod_wsgi deployment option `.
 
 mod_python is similar to (and inspired by) `mod_perl`_ : It embeds Python within
@@ -378,3 +378,24 @@ as necessary.
 .. _Expat Causing Apache Crash: http://www.dscpl.com.au/articles/modpython-006.html
 .. _mod_python FAQ entry: http://modpython.org/FAQ/faqw.py?req=show&file=faq02.013.htp
 .. _Getting mod_python Working: http://www.dscpl.com.au/articles/modpython-001.html
+
+If you get a UnicodeEncodeError
+===============================
+
+If you're taking advantage of the internationalization features of Django (see
+:ref:`topics-i18n`) and you intend to allow users to upload files, you must
+ensure that the environment used to start Apache is configured to accept
+non-ASCII file names. If your environment is not correctly configured, you
+will trigger ``UnicodeEncodeError`` exceptions when calling functions like
+``os.path()`` on filenames that contain non-ASCII characters.
+
+To avoid these problems, the environment used to start Apache should contain
+settings analogous to the following::
+
+    export LANG='en_US.UTF-8'
+    export LC_ALL='en_US.UTF-8'
+
+Consult the documentation for your operating system for the appropriate syntax
+and location to put these configuration items; ``/etc/apache2/envvars`` is a
+common location on Unix platforms. Once you have added these statements
+to your environment, restart Apache.
diff --git a/docs/howto/deployment/modwsgi.txt b/docs/howto/deployment/modwsgi.txt
index 902e312551..8bfbfa74f4 100644
--- a/docs/howto/deployment/modwsgi.txt
+++ b/docs/howto/deployment/modwsgi.txt
@@ -1,69 +1,118 @@
-.. _howto-deployment-modwsgi:
-
-==========================================
-How to use Django with Apache and mod_wsgi
-==========================================
-
-Deploying Django with Apache_ and `mod_wsgi`_ is the recommended way to get
-Django into production.
-
-.. _Apache: http://httpd.apache.org/
-.. _mod_wsgi: http://code.google.com/p/modwsgi/
-
-mod_wsgi is an Apache module which can be used to host any Python application
-which supports the `Python WSGI interface`_, including Django. Django will work
-with any version of Apache which supports mod_wsgi.
-
-.. _python wsgi interface: http://www.python.org/dev/peps/pep-0333/
-
-The `official mod_wsgi documentation`_ is fantastic; it's your source for all
-the details about how to use mod_wsgi. You'll probably want to start with the
-`installation and configuration documentation`_.
-
-.. _official mod_wsgi documentation: http://code.google.com/p/modwsgi/
-.. _installation and configuration documentation: http://code.google.com/p/modwsgi/wiki/InstallationInstructions
-
-Basic Configuration
-===================
-
-Once you've got mod_wsgi installed and activated, edit your ``httpd.conf`` file
-and add::
-
-    WSGIScriptAlias / /path/to/mysite/apache/django.wsgi
-
-The first bit above is the url you want to be serving your application at (``/``
-indicates the root url), and the second is the location of a "WSGI file" -- see
-below -- on your system, usually inside of your project. This tells Apache
-to serve any request below the given URL using the WSGI application defined by that file.
-
-Next we'll need to actually create this WSGI application, so create the file
-mentioned in the second part of ``WSGIScriptAlias`` and add::
-
-    import os
-    import sys
-
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'mysite.settings'
-
-    import django.core.handlers.wsgi
-    application = django.core.handlers.wsgi.WSGIHandler()
-
-If your project is not on your ``PYTHONPATH`` by default you can add::
-
-    sys.path.append('/usr/local/django')
-
-just above the final ``import`` line to place your project on the path. Remember to
-replace 'mysite.settings' with your correct settings file, and '/usr/local/django'
-with your own project's location.
-
-See the :ref:`Apache/mod_python documentation` for 
-directions on serving static media, and the `mod_wsgi documentation`_ for an 
-explanation of other directives and configuration options you can use.
-
-Details
-=======
-
-For more details, see the `mod_wsgi documentation`_, which explains the above in
-more detail, and walks through all the various options you've got when deploying
-under mod_wsgi.
-
-.. _mod_wsgi documentation: http://code.google.com/p/modwsgi/wiki/IntegrationWithDjango
+.. _howto-deployment-modwsgi:
+
+==========================================
+How to use Django with Apache and mod_wsgi
+==========================================
+
+Deploying Django with Apache_ and `mod_wsgi`_ is the recommended way to get
+Django into production.
+
+.. _Apache: http://httpd.apache.org/
+.. _mod_wsgi: http://code.google.com/p/modwsgi/
+
+mod_wsgi is an Apache module which can be used to host any Python application
+which supports the `Python WSGI interface`_, including Django. Django will work
+with any version of Apache which supports mod_wsgi.
+
+.. _python wsgi interface: http://www.python.org/dev/peps/pep-0333/
+
+The `official mod_wsgi documentation`_ is fantastic; it's your source for all
+the details about how to use mod_wsgi. You'll probably want to start with the
+`installation and configuration documentation`_.
+
+.. _official mod_wsgi documentation: http://code.google.com/p/modwsgi/
+.. _installation and configuration documentation: http://code.google.com/p/modwsgi/wiki/InstallationInstructions
+
+Basic Configuration
+===================
+
+Once you've got mod_wsgi installed and activated, edit your ``httpd.conf`` file
+and add::
+
+    WSGIScriptAlias / /path/to/mysite/apache/django.wsgi
+
+The first bit above is the url you want to be serving your application at (``/``
+indicates the root url), and the second is the location of a "WSGI file" -- see
+below -- on your system, usually inside of your project. This tells Apache
+to serve any request below the given URL using the WSGI application defined by that file.
+
+Next we'll need to actually create this WSGI application, so create the file
+mentioned in the second part of ``WSGIScriptAlias`` and add::
+
+    import os
+    import sys
+
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'mysite.settings'
+
+    import django.core.handlers.wsgi
+    application = django.core.handlers.wsgi.WSGIHandler()
+
+If your project is not on your ``PYTHONPATH`` by default you can add::
+
+    sys.path.append('/usr/local/django')
+
+just above the final ``import`` line to place your project on the path. Remember to
+replace 'mysite.settings' with your correct settings file, and '/usr/local/django'
+with your own project's location.
+
+Serving media files
+===================
+
+Django doesn't serve media files itself; it leaves that job to whichever Web
+server you choose.
+
+We recommend using a separate Web server -- i.e., one that's not also running
+Django -- for serving media. Here are some good choices:
+
+    * lighttpd_
+    * Nginx_
+    * TUX_
+    * A stripped-down version of Apache_
+    * Cherokee_
+
+If, however, you have no option but to serve media files on the same Apache
+``VirtualHost`` as Django, you can set up Apache to serve some URLs as
+static media, and others using the mod_wsgi interface to Django.
+
+This example sets up Django at the site root, but explicitly serves ``robots.txt``,
+``favicon.ico``, any CSS file, and anything in the ``/media/`` URL space as a static
+file. All other URLs will be served using mod_wsgi::
+
+    Alias /robots.txt /usr/local/wsgi/static/robots.txt
+    Alias /favicon.ico /usr/local/wsgi/static/favicon.ico
+
+    AliasMatch /([^/]*\.css) /usr/local/wsgi/static/styles/$1
+
+    Alias /media/ /usr/local/wsgi/static/media/
+
+    
+    Order deny,allow
+    Allow from all
+    
+
+    WSGIScriptAlias / /usr/local/wsgi/scripts/django.wsgi
+
+    
+    Order allow,deny
+    Allow from all
+    
+
+.. _lighttpd: http://www.lighttpd.net/
+.. _Nginx: http://wiki.codemongers.com/Main
+.. _TUX: http://en.wikipedia.org/wiki/TUX_web_server
+.. _Apache: http://httpd.apache.org/
+.. _Cherokee: http://www.cherokee-project.com/
+
+More details on configuring a mod_wsgi site to serve static files can be found
+in the mod_wsgi documentation on `hosting static files`_.
+
+.. _hosting static files: http://code.google.com/p/modwsgi/wiki/ConfigurationGuidelines#Hosting_Of_Static_Files
+
+Details
+=======
+
+For more details, see the `mod_wsgi documentation on Django integration`_,
+which explains the above in more detail, and walks through all the various
+options you've got when deploying under mod_wsgi.
+
+.. _mod_wsgi documentation on Django integration: http://code.google.com/p/modwsgi/wiki/IntegrationWithDjango
diff --git a/docs/howto/error-reporting.txt b/docs/howto/error-reporting.txt
index e0750ce327..246e7445d0 100644
--- a/docs/howto/error-reporting.txt
+++ b/docs/howto/error-reporting.txt
@@ -23,6 +23,10 @@ administrators immediate notification of any errors. The :setting:`ADMINS` will
 get a description of the error, a complete Python traceback, and details about
 the HTTP request that caused the error.
 
+By default, Django will send email from root@localhost. However, some mail
+providers reject all email from this address. To use a different sender
+address, modify the :setting:`SERVER_EMAIL` setting.
+
 To disable this behavior, just remove all entries from the :setting:`ADMINS`
 setting.
 
@@ -33,12 +37,12 @@ Django can also be configured to email errors about broken links (404 "page
 not found" errors). Django sends emails about 404 errors when:
 
     * :setting:`DEBUG` is ``False``
-    
+
     * :setting:`SEND_BROKEN_LINK_EMAILS` is ``True``
-    
+
     * Your :setting:`MIDDLEWARE_CLASSES` setting includes ``CommonMiddleware``
       (which it does by default).
-    
+
 If those conditions are met, Django will e-mail the users listed in the
 :setting:`MANAGERS` setting whenever your code raises a 404 and the request has
 a referer. (It doesn't bother to e-mail for 404s that don't have a referer --
diff --git a/docs/index.txt b/docs/index.txt
index 89ee463dfa..86105372c4 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -200,6 +200,7 @@ The Django open-source project
 
     * **Django over time:**
       :ref:`API stability ` |
-      :ref:`Archive of release notes ` | `Backwards-incompatible changes`_
+      :ref:`Archive of release notes ` | `Backwards-incompatible changes`_ |
+      :ref:`Deprecation Timeline `
 
 .. _Backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 002c7f5ab8..7326532ec9 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -135,24 +135,49 @@ Joseph Kocherhans
 .. _michael meeks: http://en.wikipedia.org/wiki/Michael_Meeks_(software)
 
 `Brian Rosner`_
-    Brian is currently a web developer working on an e-commerce system in
-    Django. He spends his free time contributing to Django and enjoys to learn
-    more about programming languages and system architectures. Brian is the
-    co-host of the weekly podcast, `This Week in Django`_.
-
+    Brian is currently the tech lead at Eldarion_ managing and developing
+    Django / Pinax_ based websites. He enjoys learning more about programming
+    languages and system architectures and contributing to open source
+    projects. Brian is the host of the `Django Dose`_ podcasts.
+    
     Brian helped immensely in getting Django's "newforms-admin" branch finished
     in time for Django 1.0; he's now a full committer, continuing to improve on
     the admin and forms system.
 
-    Brian lives in Denver, USA.
+    Brian lives in Denver, Colorado, USA.
 
 .. _brian rosner: http://oebfare.com/
-.. _this week in django: http://thisweekindjango.com/
+.. _eldarion: http://eldarion.com/
+.. _pinax: http://pinaxproject.com/
+.. _django dose: http://djangodose.com/
 
-Gary Wilson
-    In early 2007, Gary started contributing a lot of cleanup fixes and fixing
-    broken windows. He's continued to do that necessary tidying up work
-    throughout the code base since then.
+`Gary Wilson`_
+    Gary starting contributing patches to Django in 2006 while developing Web
+    applications for `The University of Texas`_ (UT).  Since, he has made
+    contributions to the e-mail and forms systems, as well as many other
+    improvements and code cleanups throughout the code base.
+
+    Gary is currently a developer and software engineering graduate student at
+    UT, where his dedication to spreading the ways of Python and Django never
+    ceases.
+
+    Gary lives in Austin, Texas, USA.
+
+.. _Gary Wilson: http://gdub.wordpress.com/
+.. _The University of Texas: http://www.utexas.edu/
+
+Justin Bronn
+    Justin Bronn is a computer scientist and attorney specializing
+    in legal topics related to intellectual property and spatial law.
+
+    In 2007, Justin began developing ``django.contrib.gis`` in a branch,
+    a.k.a. GeoDjango_, which was merged in time for Django 1.0.  While
+    implementing GeoDjango, Justin obtained a deep knowledge of Django's
+    internals including the ORM, the admin, and Oracle support.
+
+    Justin lives in Houston, Texas.
+
+.. _GeoDjango: http://geodjango.org/
 
 Karen Tracey
     Karen has a background in distributed operating systems (graduate school),
@@ -187,16 +212,6 @@ Ian Kelly
 Matt Boersma
     Matt is also responsible for Django's Oracle support.
 
-Justin Bronn
-    Justin Bronn is a computer scientist and third-year law student at the
-    University of Houston who enjoys studying legal topics related to
-    intellectual property and spatial law.
-
-    Justin is the primary developer of ``django.contrib.gis``, a.k.a.
-    GeoDjango_.
-
-.. _GeoDjango: http://geodjango.org/
-
 Jeremy Dunck
     Jeremy the lead developer of Pegasus News, a personalized local site based
     in Dallas, Texas. An early contributor to Greasemonkey and Django, he sees
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
new file mode 100644
index 0000000000..7e7f4c6338
--- /dev/null
+++ b/docs/internals/deprecation.txt
@@ -0,0 +1,21 @@
+.. _internals-deprecation:
+
+===========================
+Django Deprecation Timeline
+===========================
+
+This document outlines when various pieces of Django will be removed, following
+their deprecation, as per the :ref:`Django deprecation policy
+`
+
+    * 1.3
+        * ``AdminSite.root()``.  This release will remove the old method for
+          hooking up admin URLs.  This has been deprecated since the 1.1
+          release.
+
+    * 2.0
+        * ``django.views.defaults.shortcut()``. This function has been moved
+          to ``django.contrib.contenttypes.views.shortcut()`` as part of the
+          goal of removing all ``django.contrib`` references from the core
+          Django codebase. The old shortcut will be removed in the 2.0
+          release.
diff --git a/docs/internals/index.txt b/docs/internals/index.txt
index 0d54948bf5..1cbbb87f06 100644
--- a/docs/internals/index.txt
+++ b/docs/internals/index.txt
@@ -17,8 +17,9 @@ the hood".
 
 .. toctree::
    :maxdepth: 1
-   
+
    contributing
    documentation
    committers
    release-process
+   deprecation
diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt
index 911b67e441..6d4ad9e8c9 100644
--- a/docs/internals/release-process.txt
+++ b/docs/internals/release-process.txt
@@ -48,14 +48,16 @@ Minor releases
 --------------
 
 Minor release (1.1, 1.2, etc.) will happen roughly every six months -- see
-`release process`_, below for details. 
+`release process`_, below for details.
+
+.. _internal-release-deprecation-policy:
 
 These releases will contain new features, improvements to existing features, and
 such. A minor release may deprecate certain features from previous releases. If a
 feature in version ``A.B`` is deprecated, it will continue to work in version
 ``A.B+1``. In version ``A.B+2``, use of the feature will raise a
 ``PendingDeprecationWarning`` but will continue to work. Version ``A.B+3`` will
-remove the feature entirely. 
+remove the feature entirely.
 
 So, for example, if we decided to remove a function that existed in Django 1.0:
 
@@ -66,9 +68,9 @@ So, for example, if we decided to remove a function that existed in Django 1.0:
     * Django 1.2 will contain the backwards-compatible replica, but the warning
       will be promoted to a full-fledged ``DeprecationWarning``. This warning is
       *loud* by default, and will likely be quite annoying.
-      
+
     * Django 1.3 will remove the feature outright.
-    
+
 Micro releases
 --------------
 
@@ -92,21 +94,21 @@ varying levels:
 
     * The current development trunk will get new features and bug fixes
       requiring major refactoring.
-    
+
     * All bug fixes applied to the trunk will also be applied to the last
       minor release, to be released as the next micro release.
-      
+
     * Security fixes will be applied to the current trunk and the previous two
       minor releases.
-      
+
 As a concrete example, consider a moment in time halfway between the release of
 Django 1.3 and 1.4. At this point in time:
 
     * Features will be added to development trunk, to be released as Django 1.4.
-    
+
     * Bug fixes will be applied to a ``1.3.X`` branch, and released as 1.3.1,
       1.3.2, etc.
-      
+
     * Security releases will be applied to trunk, a ``1.3.X`` branch and a
       ``1.2.X`` branch. Security fixes will trigger the release of ``1.3.1``,
       ``1.2.1``, etc.
@@ -117,7 +119,7 @@ Release process
 ===============
 
 Django uses a time-based release schedule, with minor (i.e. 1.1, 1.2, etc.)
-releases every six months, or more, depending on features. 
+releases every six months, or more, depending on features.
 
 After each previous release (and after a suitable cooling-off period of a week
 or two), the core development team will examine the landscape and announce a
@@ -174,12 +176,12 @@ and an rc complete with string freeze two weeks before the end of the schedule.
 Bug-fix releases
 ----------------
 
-After a minor release (i.e 1.1), the previous release will go into bug-fix mode. 
+After a minor release (i.e 1.1), the previous release will go into bug-fix mode.
 
 A branch will be created of the form ``branches/releases/1.0.X`` to track
 bug-fixes to the previous release. When possible, bugs fixed on trunk must
 *also* be fixed on the bug-fix branch; this means that commits need to cleanly
-separate bug fixes from feature additions. The developer who commits a fix to 
+separate bug fixes from feature additions. The developer who commits a fix to
 trunk will be responsible for also applying the fix to the current bug-fix
 branch.  Each bug-fix branch will have a maintainer who will work with the
 committers to keep them honest on backporting bug fixes.
@@ -193,14 +195,13 @@ development will be happening in a bunch of places:
 
     * On trunk, development towards 1.2 proceeds with small additions, bugs
       fixes, etc. being checked in daily.
-      
+
     * On the branch "branches/releases/1.1.X", bug fixes found in the 1.1
       release are checked in as needed. At some point, this branch will be
       released as "1.1.1", "1.1.2", etc.
 
     * On the branch "branches/releases/1.0.X", security fixes are made if
       needed and released as "1.0.2", "1.0.3", etc.
-    
+
     * On feature branches, development of major features is done. These
       branches will be merged into trunk before the end of phase two.
-
diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt
index f4ef5f76fe..238dc63f71 100644
--- a/docs/intro/tutorial03.txt
+++ b/docs/intro/tutorial03.txt
@@ -326,8 +326,8 @@ shortcut. Here's the ``detail()`` view, rewritten::
         return render_to_response('polls/detail.html', {'poll': p})
 
 The :func:`~django.shortcuts.get_object_or_404` function takes a Django model
-module as its first argument and an arbitrary number of keyword arguments, which
-it passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
+as its first argument and an arbitrary number of keyword arguments, which it
+passes to the module's :meth:`~django.db.models.QuerySet.get` function. It
 raises :exc:`~django.http.Http404` if the object doesn't exist.
 
 .. admonition:: Philosophy
@@ -365,7 +365,7 @@ That takes care of setting ``handler404`` in the current module. As you can see
 in ``django/conf/urls/defaults.py``, ``handler404`` is set to
 :func:`django.views.defaults.page_not_found` by default.
 
-Three more things to note about 404 views:
+Four more things to note about 404 views:
 
     * If :setting:`DEBUG` is set to ``True`` (in your settings module) then your
       404 view will never be used (and thus the ``404.html`` template will never
diff --git a/docs/ref/contrib/admin/_images/article_actions.png b/docs/ref/contrib/admin/_images/article_actions.png
index 254a8ad557..df4ab8f1ec 100644
Binary files a/docs/ref/contrib/admin/_images/article_actions.png and b/docs/ref/contrib/admin/_images/article_actions.png differ
diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 64d9c52492..584672e4f0 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -704,6 +704,8 @@ objects. Templates can override or extend base admin templates as described in
 If you don't specify this attribute, a default template shipped with Django
 that provides the standard appearance is used.
 
+.. _model-admin-methods:
+
 ``ModelAdmin`` methods
 ----------------------
 
@@ -760,12 +762,19 @@ documented in :ref:`topics-http-urls`::
     anything, so you'll usually want to prepend your custom URLs to the built-in
     ones.
 
-Note, however, that the ``self.my_view`` function registered above will *not*
-have any permission check done; it'll be accessible to the general public. Since
-this is usually not what you want, Django provides a convience wrapper to check
-permissions. This wrapper is :meth:`AdminSite.admin_view` (i.e.
-``self.admin_site.admin_view`` inside a ``ModelAdmin`` instance); use it like
-so::
+However, the ``self.my_view`` function registered above suffers from two
+problems:
+
+  * It will *not* perform and permission checks, so it will be accessible to
+    the general public.
+  * It will *not* provide any header details to prevent caching. This means if
+    the page retrieves data from the database, and caching middleware is
+    active, the page could show outdated information.
+
+Since this is usually not what you want, Django provides a convenience wrapper
+to check permissions and mark the view as non-cacheable. This wrapper is
+:meth:`AdminSite.admin_view` (i.e.  ``self.admin_site.admin_view`` inside a
+``ModelAdmin`` instance); use it like so::
 
     class MyModelAdmin(admin.ModelAdmin):
         def get_urls(self):
@@ -779,7 +788,14 @@ Notice the wrapped view in the fifth line above::
 
     (r'^my_view/$', self.admin_site.admin_view(self.my_view))
 
-This wrapping will protect ``self.my_view`` from unauthorized access.
+This wrapping will protect ``self.my_view`` from unauthorized access and will
+apply the ``django.views.decorators.cache.never_cache`` decorator to make sure
+it is not cached if the cache middleware is active.
+
+If the page is cacheable, but you still want the permission check to be performed,
+you can pass a ``cacheable=True`` argument to :meth:`AdminSite.admin_view`::
+
+    (r'^my_view/$', self.admin_site.admin_view(self.my_view, cacheable=True))
 
 .. method:: ModelAdmin.formfield_for_foreignkey(self, db_field, request, **kwargs)
 
@@ -792,7 +808,7 @@ return a subset of objects for this foreign key field based on the user::
     class MyModelAdmin(admin.ModelAdmin):
         def formfield_for_foreignkey(self, db_field, request, **kwargs):
             if db_field.name == "car":
-                kwargs["queryset"] = Car.object.filter(owner=request.user)
+                kwargs["queryset"] = Car.objects.filter(owner=request.user)
                 return db_field.formfield(**kwargs)
             return super(MyModelAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
 
@@ -847,7 +863,7 @@ provided some extra mapping data that would not otherwise be available::
                 'osm_data': self.get_osm_info(),
             }
             return super(MyModelAdmin, self).change_view(request, object_id,
-                extra_context=my_context))
+                extra_context=my_context)
 
 ``ModelAdmin`` media definitions
 --------------------------------
@@ -1226,7 +1242,7 @@ or :attr:`AdminSite.login_template` properties.
 ``AdminSite`` objects
 =====================
 
-.. class:: AdminSite
+.. class:: AdminSite(name=None)
 
 A Django administrative site is represented by an instance of
 ``django.contrib.admin.sites.AdminSite``; by default, an instance of
@@ -1240,6 +1256,14 @@ or add anything you like. Then, simply create an instance of your
 Python class), and register your models and ``ModelAdmin`` subclasses
 with it instead of using the default.
 
+.. versionadded:: 1.1
+
+When constructing an instance of an ``AdminSite``, you are able to provide
+a unique instance name using the ``name`` argument to the constructor. This
+instance name is used to identify the instance, especially when
+:ref:`reversing admin URLs `. If no instance name is
+provided, a default instance name of ``admin`` will be used.
+
 ``AdminSite`` attributes
 ------------------------
 
@@ -1337,10 +1361,10 @@ a pattern for your new view.
 
 .. note::
     Any view you render that uses the admin templates, or extends the base
-    admin template, should include in it's context a variable named
-    ``admin_site`` that contains the name of the :class:`AdminSite` instance. For
-    :class:`AdminSite` instances, this means ``self.name``; for :class:`ModelAdmin`
-    instances, this means ``self.admin_site.name``.
+    admin template, should provide the ``current_app`` argument to
+    ``RequestContext`` or ``Context`` when rendering the template.  It should
+    be set to either ``self.name`` if your view is on an ``AdminSite`` or
+    ``self.admin_site.name`` if your view is on a ``ModelAdmin``.
 
 .. _admin-reverse-urls:
 
@@ -1354,37 +1378,31 @@ accessible using Django's :ref:`URL reversing system `.
 
 The :class:`AdminSite` provides the following named URL patterns:
 
-    ======================  =============================== =============
-    Page                    URL name                        Parameters
-    ======================  =============================== =============
-    Index                   ``admin_index``
-    Logout                  ``admin_logout``
-    Password change         ``admin_password_change``
-    Password change done    ``admin_password_change_done``
-    i18n javascript         ``admin_jsi18n``
-    Application index page  ``admin_app_list``              ``app_label``
-    ======================  =============================== =============
-
-These names will be prefixed with the name of the :class:`AdminSite` instance,
-plus an underscore. For example, if your :class:`AdminSite` was named
-``custom``, then the Logout view would be served using a URL with the name
-``custom_admin_logout``. The default :class:`AdminSite` doesn't use a prefix
-in it's URL names.
+    ======================  ========================  =============
+    Page                    URL name                  Parameters
+    ======================  ========================  =============
+    Index                   ``index``
+    Logout                  ``logout``
+    Password change         ``password_change``
+    Password change done    ``password_change_done``
+    i18n javascript         ``jsi18n``
+    Application index page  ``app_list``              ``app_label``
+    ======================  ========================  =============
 
 Each :class:`ModelAdmin` instance provides an additional set of named URLs:
 
-    ======================  =====================================================   =============
-    Page                    URL name                                                Parameters
-    ======================  =====================================================   =============
-    Changelist              ``admin_{{ app_label }}_{{ model_name }}_changelist``
-    Add                     ``admin_{{ app_label }}_{{ model_name }}_add``
-    History                 ``admin_{{ app_label }}_{{ model_name }}_history``      ``object_id``
-    Delete                  ``admin_{{ app_label }}_{{ model_name }}_delete``       ``object_id``
-    Change                  ``admin_{{ app_label }}_{{ model_name }}_change``       ``object_id``
-    ======================  =====================================================   =============
+    ======================  ===============================================   =============
+    Page                    URL name                                          Parameters
+    ======================  ===============================================   =============
+    Changelist              ``{{ app_label }}_{{ model_name }}_changelist``
+    Add                     ``{{ app_label }}_{{ model_name }}_add``
+    History                 ``{{ app_label }}_{{ model_name }}_history``      ``object_id``
+    Delete                  ``{{ app_label }}_{{ model_name }}_delete``       ``object_id``
+    Change                  ``{{ app_label }}_{{ model_name }}_change``       ``object_id``
+    ======================  ===============================================   =============
 
-Again, these names will be prefixed by the name of the :class:`AdminSite` in
-which they are deployed.
+These named URLs are registered with the application namespace ``admin``, and
+with an instance namespace corresponding to the name of the Site instance.
 
 So - if you wanted to get a reference to the Change view for a particular
 ``Choice`` object (from the polls application) in the default admin, you would
@@ -1392,8 +1410,16 @@ call::
 
     >>> from django.core import urlresolvers
     >>> c = Choice.objects.get(...)
-    >>> change_url = urlresolvers.reverse('admin_polls_choice_change', args=(c.id,))
+    >>> change_url = urlresolvers.reverse('admin:polls_choice_change', args=(c.id,))
 
-However, if the admin instance was named ``custom``, you would need to call::
+This will find the first registered instance of the admin application (whatever the instance
+name), and resolve to the view for changing ``poll.Choice`` instances in that instance.
 
-    >>> change_url = urlresolvers.reverse('custom_admin_polls_choice_change', args=(c.id,))
+If you want to find a URL in a specific admin instance, provide the name of that instance
+as a ``current_app`` hint to the reverse call. For example, if you specifically wanted
+the admin view from the admin instance named ``custom``, you would need to call::
+
+    >>> change_url = urlresolvers.reverse('custom:polls_choice_change', args=(c.id,))
+
+For more details, see the documentation on :ref:`reversing namespaced URLs
+`.
diff --git a/docs/ref/contrib/contenttypes.txt b/docs/ref/contrib/contenttypes.txt
index 94900b3892..8a926afc97 100644
--- a/docs/ref/contrib/contenttypes.txt
+++ b/docs/ref/contrib/contenttypes.txt
@@ -177,9 +177,9 @@ The ``ContentTypeManager``
     .. method:: models.ContentTypeManager.clear_cache()
 
         Clears an internal cache used by
-        :class:`~django.contrib.contenttypes.models.ContentType>` to keep track
+        :class:`~django.contrib.contenttypes.models.ContentType` to keep track
         of which models for which it has created
-        :class:`django.contrib.contenttypes.models.ContentType>` instances. You
+        :class:`django.contrib.contenttypes.models.ContentType` instances. You
         probably won't ever need to call this method yourself; Django will call
         it automatically when it's needed.
 
diff --git a/docs/ref/databases.txt b/docs/ref/databases.txt
index 9a35b6cb8f..007a7079b7 100644
--- a/docs/ref/databases.txt
+++ b/docs/ref/databases.txt
@@ -220,7 +220,7 @@ bytestrings (which shouldn't be too difficult) is the recommended solution.
 Should you decide to use ``utf8_bin`` collation for some of your tables with
 MySQLdb 1.2.1p2, you should still use ``utf8_collation_ci_swedish`` (the
 default) collation for the :class:`django.contrib.sessions.models.Session`
-table (usually called ``django_session`` and the table
+table (usually called ``django_session``) and the
 :class:`django.contrib.admin.models.LogEntry` table (usually called
 ``django_admin_log``). Those are the two standard tables that use
 :class:`~django.db.model.TextField` internally.
diff --git a/docs/ref/forms/fields.txt b/docs/ref/forms/fields.txt
index e532971179..4bb6a7c444 100644
--- a/docs/ref/forms/fields.txt
+++ b/docs/ref/forms/fields.txt
@@ -275,7 +275,7 @@ For each field, we describe the default widget used if you don't specify
     * Default widget: ``CheckboxInput``
     * Empty value: ``False``
     * Normalizes to: A Python ``True`` or ``False`` value.
-    * Validates that the check box is checked (i.e. the value is ``True``) if
+    * Validates that the value is ``True`` (e.g. the check box is checked) if
       the field has ``required=True``.
     * Error message keys: ``required``
 
@@ -287,9 +287,10 @@ For each field, we describe the default widget used if you don't specify
 .. note::
 
     Since all ``Field`` subclasses have ``required=True`` by default, the
-    validation condition here is important. If you want to include a checkbox
-    in your form that can be either checked or unchecked, you must remember to
-    pass in ``required=False`` when creating the ``BooleanField``.
+    validation condition here is important. If you want to include a boolean
+    in your form that can be either ``True`` or ``False`` (e.g. a checked or
+    unchecked checkbox), you must remember to pass in ``required=False`` when
+    creating the ``BooleanField``.
 
 ``CharField``
 ~~~~~~~~~~~~~
@@ -328,7 +329,7 @@ Takes one extra required argument:
 
     An iterable (e.g., a list or tuple) of 2-tuples to use as choices for this
     field.
-    
+
 ``TypedChoiceField``
 ~~~~~~~~~~~~~~~~~~~~
 
@@ -437,7 +438,7 @@ If no ``input_formats`` argument is provided, the default input formats are::
       ``min_value``, ``max_digits``, ``max_decimal_places``,
       ``max_whole_digits``
 
-Takes four optional arguments: 
+Takes four optional arguments:
 
 .. attribute:: DecimalField.max_value
 .. attribute:: DecimalField.min_value
@@ -449,7 +450,7 @@ Takes four optional arguments:
     The maximum number of digits (those before the decimal point plus those
     after the decimal point, with leading zeros stripped) permitted in the
     value.
-    
+
 .. attribute:: DecimalField.decimal_places
 
     The maximum number of decimal places permitted.
@@ -522,18 +523,18 @@ extra arguments; only ``path`` is required:
     A regular expression pattern; only files with names matching this expression
     will be allowed as choices.
 
-``FloatField`` 
-~~~~~~~~~~~~~~ 
+``FloatField``
+~~~~~~~~~~~~~~
 
-    * Default widget: ``TextInput`` 
-    * Empty value: ``None`` 
-    * Normalizes to: A Python float. 
-    * Validates that the given value is an float. Leading and trailing 
-      whitespace is allowed, as in Python's ``float()`` function. 
-    * Error message keys: ``required``, ``invalid``, ``max_value``, 
-      ``min_value`` 
-	 
-Takes two optional arguments for validation, ``max_value`` and ``min_value``. 
+    * Default widget: ``TextInput``
+    * Empty value: ``None``
+    * Normalizes to: A Python float.
+    * Validates that the given value is an float. Leading and trailing
+      whitespace is allowed, as in Python's ``float()`` function.
+    * Error message keys: ``required``, ``invalid``, ``max_value``,
+      ``min_value``
+
+Takes two optional arguments for validation, ``max_value`` and ``min_value``.
 These control the range of values permitted in the field.
 
 ``ImageField``
@@ -779,10 +780,10 @@ example::
    (which is ``"---------"`` by default) with the ``empty_label`` attribute, or
    you can disable the empty label entirely by setting ``empty_label`` to
    ``None``::
-   
+
         # A custom empty label
         field1 = forms.ModelChoiceField(queryset=..., empty_label="(Nothing)")
-        
+
         # No empty label
         field2 = forms.ModelChoiceField(queryset=..., empty_label=None)
 
diff --git a/docs/ref/middleware.txt b/docs/ref/middleware.txt
index 5125f6e064..ff51df9e8f 100644
--- a/docs/ref/middleware.txt
+++ b/docs/ref/middleware.txt
@@ -122,17 +122,10 @@ Reverse proxy middleware
 
 .. class:: django.middleware.http.SetRemoteAddrFromForwardedFor
 
-Sets ``request.META['REMOTE_ADDR']`` based on
-``request.META['HTTP_X_FORWARDED_FOR']``, if the latter is set. This is useful
-if you're sitting behind a reverse proxy that causes each request's
-``REMOTE_ADDR`` to be set to ``127.0.0.1``.
+.. versionchanged: 1.1
 
-**Important note:** This does NOT validate ``HTTP_X_FORWARDED_FOR``. If you're
-not behind a reverse proxy that sets ``HTTP_X_FORWARDED_FOR`` automatically, do
-not use this middleware. Anybody can spoof the value of
-``HTTP_X_FORWARDED_FOR``, and because this sets ``REMOTE_ADDR`` based on
-``HTTP_X_FORWARDED_FOR``, that means anybody can "fake" their IP address. Only
-use this when you can absolutely trust the value of ``HTTP_X_FORWARDED_FOR``.
+This middleware was removed in Django 1.1. See :ref:`the release notes
+` for details.
 
 Locale middleware
 -----------------
diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt
index c6509ece3d..7a0606dafe 100644
--- a/docs/ref/models/instances.txt
+++ b/docs/ref/models/instances.txt
@@ -188,6 +188,46 @@ almost always do the right thing and trying to override that will lead to
 errors that are difficult to track down. This feature is for advanced use
 only.
 
+Updating attributes based on existing fields
+--------------------------------------------
+
+Sometimes you'll need to perform a simple arithmetic task on a field, such
+as incrementing or decrementing the current value. The obvious way to
+achieve this is to do something like::
+
+    >>> product = Product.objects.get(name='Venezuelan Beaver Cheese')
+    >>> product.number_sold += 1
+    >>> product.save()
+
+If the old ``number_sold`` value retrieved from the database was 10, then
+the value of 11 will be written back to the database.
+
+This can be optimized slightly by expressing the update relative to the
+original field value, rather than as an explicit assignment of a new value.
+Django provides :ref:`F() expressions ` as a way of
+performing this kind of relative update. Using ``F()`` expressions, the
+previous example would be expressed as::
+
+    >>> from django.db.models import F
+    >>> product = Product.objects.get(name='Venezuelan Beaver Cheese')
+    >>> product.number_sold = F('number_sold') + 1
+    >>> product.save()
+
+This approach doesn't use the initial value from the database. Instead, it
+makes the database do the update based on whatever value is current at the
+time that the save() is executed.
+
+Once the object has been saved, you must reload the object in order to access
+the actual value that was applied to the updated field::
+
+    >>> product = Products.objects.get(pk=product.pk)
+    >>> print product.number_sold
+    42
+
+For more details, see the documentation on :ref:`F() expressions
+` and their :ref:`use in update queries
+`.
+
 Deleting objects
 ================
 
@@ -196,7 +236,7 @@ Deleting objects
    Issues a SQL ``DELETE`` for the object. This only deletes the object in the
    database; the Python instance will still be around, and will still have data
    in its fields.
-   
+
    For more details, including how to delete objects in bulk, see
    :ref:`topics-db-queries-delete`.
 
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index 348486b341..f78ebc506a 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -668,7 +668,7 @@ of the arguments is required, but you should use at least one of them.
 
     The resulting SQL of the above example would be::
 
-        SELECT blog_blog.*, (SELECT COUNT(*) FROM blog_entry WHERE blog_entry.blog_id = blog_blog.id)
+        SELECT blog_blog.*, (SELECT COUNT(*) FROM blog_entry WHERE blog_entry.blog_id = blog_blog.id) AS entry_count
         FROM blog_blog;
 
     Note that the parenthesis required by most database engines around
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 05097b7e59..e3260a96f8 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -86,9 +86,16 @@ Rendering a context
 
 Once you have a compiled ``Template`` object, you can render a context -- or
 multiple contexts -- with it. The ``Context`` class lives at
-``django.template.Context``, and the constructor takes one (optional)
-argument: a dictionary mapping variable names to variable values. Call the
-``Template`` object's ``render()`` method with the context to "fill" the
+``django.template.Context``, and the constructor takes two (optional)
+arguments:
+
+    * A dictionary mapping variable names to variable values.
+
+    * The name of the current application. This application name is used
+      to help :ref:`resolve namespaced URLs`.
+      If you're not using namespaced URLs, you can ignore this argument.
+
+Call the ``Template`` object's ``render()`` method with the context to "fill" the
 template::
 
     >>> from django.template import Context, Template
@@ -549,13 +556,13 @@ Here are the template loaders that come with Django:
     Note that the loader performs an optimization when it is first imported: It
     caches a list of which :setting:`INSTALLED_APPS` packages have a
     ``templates`` subdirectory.
-    
+
     This loader is enabled by default.
 
 ``django.template.loaders.eggs.load_template_source``
     Just like ``app_directories`` above, but it loads templates from Python
     eggs rather than from the filesystem.
-    
+
     This loader is disabled by default.
 
 Django uses the template loaders in order according to the
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 32b5984767..a2f8b9f8b3 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -101,6 +101,14 @@ You can use any number of values in a ``{% cycle %}`` tag, separated by spaces.
 Values enclosed in single (``'``) or double quotes (``"``) are treated as
 string literals, while values without quotes are treated as template variables.
 
+Note that the variables included in the cycle will not be escaped. This is
+because template tags do not escape their content. If you want to escape the
+variables in the cycle, you must do so explicitly::
+
+    {% filter force_escape %}
+        {% cycle var1 var2 var3 %}
+    {% endfilter %}
+
 For backwards compatibility, the ``{% cycle %}`` tag supports the much inferior
 old syntax from previous Django versions. You shouldn't use this in any new
 projects, but for the sake of the people who are still using it, here's what it
@@ -160,8 +168,9 @@ Sample usage::
 firstof
 ~~~~~~~
 
-Outputs the first variable passed that is not False.  Outputs nothing if all the
-passed variables are False.
+Outputs the first variable passed that is not False, without escaping.
+
+Outputs nothing if all the passed variables are False.
 
 Sample usage::
 
@@ -170,11 +179,11 @@ Sample usage::
 This is equivalent to::
 
     {% if var1 %}
-        {{ var1 }}
+        {{ var1|safe }}
     {% else %}{% if var2 %}
-        {{ var2 }}
+        {{ var2|safe }}
     {% else %}{% if var3 %}
-        {{ var3 }}
+        {{ var3|safe }}
     {% endif %}{% endif %}{% endif %}
 
 You can also use a literal string as a fallback value in case all
@@ -182,6 +191,14 @@ passed variables are False::
 
     {% firstof var1 var2 var3 "fallback value" %}
 
+Note that the variables included in the firstof tag will not be escaped. This
+is because template tags do not escape their content. If you want to escape
+the variables in the firstof tag, you must do so explicitly::
+
+    {% filter force_escape %}
+        {% firstof var1 var2 var3 "fallback value" %}
+    {% endfilter %}
+
 .. templatetag:: for
 
 for
@@ -778,6 +795,16 @@ missing. In practice you'll use this to link to views that are optional::
       Link to optional stuff
     {% endif %}
 
+.. versionadded:: 1.1
+
+If you'd like to retrieve a namespaced URL, specify the fully qualified name::
+
+    {% url myapp:view-name %}
+
+This will follow the normal :ref:`namespaced URL resolution strategy
+`, including using any hints provided
+by the context as to the current application.
+
 .. templatetag:: widthratio
 
 widthratio
diff --git a/docs/releases/1.1-rc-1.txt b/docs/releases/1.1-rc-1.txt
new file mode 100644
index 0000000000..bda424800e
--- /dev/null
+++ b/docs/releases/1.1-rc-1.txt
@@ -0,0 +1,111 @@
+.. _releases-1.1-rc-1:
+
+=============================
+Django 1.1 RC 1 release notes
+=============================
+
+
+July 21, 2009
+
+Welcome to the first Django 1.1 release candidate!
+
+This is the third -- and likely last -- in a series of
+preview/development releases leading up to the eventual release of
+Django 1.1, currently scheduled to take place approximately one week
+after this release candidate. This release is targeted primarily at
+developers who are interested in trying out new features and testing
+the Django codebase to help identify and resolve any critical bugs
+prior to the final 1.1 release.
+
+As such, this release is not yet intended for production use, and any
+such use is discouraged.
+
+
+What's new in Django 1.1 RC 1
+=============================
+
+The Django codebase has -- with one exception -- been in feature
+freeze since the first 1.1 beta release, and so this release candidate
+contains only one new feature (see below); work leading up to this
+release candidate has instead been focused on bugfixing, particularly
+on the new features introduced prior to the 1.1 beta.
+
+For an overview of those features, consult :ref:`the Django 1.1 beta
+release notes `.
+
+
+URL namespaces
+--------------
+
+The 1.1 beta release introduced the ability to use reverse URL
+resolution with Django's admin application, which exposed a set of
+:ref:`named URLs `. Unfortunately, achieving
+consistent and correct reverse resolution for admin URLs proved
+extremely difficult, and so one additional feature was added to Django
+to resolve this issue: URL namespaces.
+
+In short, this feature allows the same group of URLs, from the same
+application, to be included in a Django URLConf multiple times, with
+varying (and potentially nested) named prefixes which will be used
+when performing reverse resolution. For full details, see :ref:`the
+documentation on defining URL namespaces
+`.
+
+Due to the changes needed to support this feature, the URL pattern
+names used when reversing admin URLs have changed since the 1.1 beta
+release; if you were developing applications which took advantage of
+this new feature, you will need to update your code to reflect the new
+names (for most purposes, changing ``admin_`` to ``admin:`` in names
+to be reversed will suffice). For a full list of URL pattern names
+used by the admin and information on how namespaces are applied to
+them, consult the documentation on :ref:`reversing admin URLs
+`.
+
+
+The Django 1.1 roadmap
+======================
+
+As of this release candidate, Django 1.1 is in both feature freeze and
+"string freeze" -- all strings marked for translation in the Django
+codebase will retain their current form in the final Django 1.1
+release. Only critical release-blocking bugs will receive attention
+between now and the final 1.1 release.
+
+If no such bugs are discovered, Django 1.1 will be released
+approximately one week after this release candidate, on or about July
+28, 2009.
+
+
+What you can do to help
+=======================
+
+In order to provide a high-quality 1.1 release, we need your
+help. Although this release candidate is, again, *not* intended for
+production use, you can help the Django team by trying out this
+release candidate in a safe testing environment and reporting any bugs
+or issues you encounter. The Django ticket tracker is the central
+place to search for open issues:
+
+    * http://code.djangoproject.com/timeline
+
+Please open a new ticket only if no existing ticket corresponds to a
+problem you're running into.
+
+Additionally, discussion of Django development, including progress
+toward the 1.1 release, takes place daily on the django-developers
+mailing list:
+
+    * http://groups.google.com/group/django-developers
+
+... and in the ``#django-dev`` IRC channel on ``irc.freenode.net``. If you're
+interested in helping out with Django's development, feel free to join the
+discussions there.
+
+Django's online documentation also includes pointers on how to contribute to
+Django: 
+
+    * :ref:`How to contribute to Django `
+
+Contributions on any level -- developing code, writing documentation or simply
+triaging tickets and helping to test proposed bugfixes -- are always welcome and
+appreciated.
diff --git a/docs/releases/1.1.txt b/docs/releases/1.1.txt
new file mode 100644
index 0000000000..5af2e17449
--- /dev/null
+++ b/docs/releases/1.1.txt
@@ -0,0 +1,459 @@
+.. _releases-1.1:
+
+========================
+Django 1.1 release notes
+========================
+
+
+July 29, 2009
+
+Welcome to Django 1.1!
+
+Django 1.1 includes a number of nifty `new features`_, lots of bug
+fixes, and an easy upgrade path from Django 1.0.
+
+.. _new features: `What's new in Django 1.1`_
+
+Backwards-incompatible changes
+==============================
+
+Django has a policy of :ref:`API stability `. This means
+that, in general, code you develop against Django 1.0 should continue to work
+against 1.1 unchanged. However, we do sometimes make backwards-incompatible
+changes if they're necessary to resolve bugs, and there are a handful of such
+(minor) changes between Django 1.0 and Django 1.1. 
+
+Before upgrading to Django 1.1 you should double-check that the following
+changes don't impact you, and upgrade your code if they do.
+
+Changes to constraint names
+---------------------------
+
+Django 1.1 modifies the method used to generate database constraint names so
+that names are consistent regardless of machine word size. This change is
+backwards incompatible for some users.
+
+If you are using a 32-bit platform, you're off the hook; you'll observe no
+differences as a result of this change.
+
+However, **users on 64-bit platforms may experience some problems** using the
+:djadmin:`reset` management command. Prior to this change, 64-bit platforms
+would generate a 64-bit, 16 character digest in the constraint name; for
+example::
+
+    ALTER TABLE myapp_sometable ADD CONSTRAINT object_id_refs_id_5e8f10c132091d1e FOREIGN KEY ... 
+    
+Following this change, all platforms, regardless of word size, will generate a
+32-bit, 8 character digest in the constraint name; for example::
+
+    ALTER TABLE myapp_sometable ADD CONSTRAINT object_id_refs_id_32091d1e FOREIGN KEY ... 
+
+As a result of this change, you will not be able to use the :djadmin:`reset`
+management command on any table made by a 64-bit machine. This is because the
+the new generated name will not match the historically generated name; as a
+result, the SQL constructed by the reset command will be invalid.
+
+If you need to reset an application that was created with 64-bit constraints,
+you will need to manually drop the old constraint prior to invoking
+:djadmin:`reset`.
+
+Test cases are now run in a transaction
+---------------------------------------
+
+Django 1.1 runs tests inside a transaction, allowing better test performance
+(see `test performance improvements`_ for details).
+
+This change is slightly backwards incompatible if existing tests need to test
+transactional behavior, if they rely on invalid assumptions about the test
+environment, or if they require a specific test case ordering.
+
+For these cases, :class:`~django.test.TransactionTestCase` can be used instead.
+This is a just a quick fix to get around test case errors revealed by the new
+rollback approach; in the long-term tests should be rewritten to correct the
+test case.
+
+.. _removed-setremoteaddrfromforwardedfor-middleware:
+
+Removed ``SetRemoteAddrFromForwardedFor`` middleware
+----------------------------------------------------
+
+For convenience, Django 1.0 included an optional middleware class --
+``django.middleware.http.SetRemoteAddrFromForwardedFor`` -- which updated the
+value of ``REMOTE_ADDR`` based on the HTTP ``X-Forwarded-For`` header commonly
+set by some proxy configurations.
+
+It has been demonstrated that this mechanism cannot be made reliable enough for
+general-purpose use, and that (despite documentation to the contrary) its
+inclusion in Django may lead application developers to assume that the value of
+``REMOTE_ADDR`` is "safe" or in some way reliable as a source of authentication.
+
+While not directly a security issue, we've decided to remove this middleware
+with the Django 1.1 release. It has been replaced with a class that does nothing
+other than raise a ``DeprecationWarning``.
+
+If you've been relying on this middleware, the easiest upgrade path is:
+
+    * Examine `the code as it existed before it was removed`__.
+    
+    * Verify that it works correctly with your upstream proxy, modifying
+      it to support your particular proxy (if necessary).
+      
+    * Introduce your modified version of ``SetRemoteAddrFromForwardedFor`` as a
+      piece of middleware in your own project.
+    
+__ http://code.djangoproject.com/browser/django/trunk/django/middleware/http.py?rev=11000#L33
+
+Names of uploaded files are available later
+-------------------------------------------
+
+.. currentmodule:: django.db.models
+
+In Django 1.0, files uploaded and stored in a model's :class:`FileField` were
+saved to disk before the model was saved to the database. This meant that the
+actual file name assigned to the file was available before saving. For example,
+it was available in a model's pre-save signal handler.
+
+In Django 1.1 the file is saved as part of saving the model in the database, so
+the actual file name used on disk cannot be relied on until *after* the model
+has been saved saved.
+
+Changes to how model formsets are saved
+---------------------------------------
+
+.. currentmodule:: django.forms.models
+
+In Django 1.1, :class:`BaseModelFormSet` now calls :meth:`ModelForm.save()`.
+
+This is backwards-incompatible if you were modifying ``self.initial`` in a model
+formset's ``__init__``, or if you relied on the internal ``_total_form_count``
+or ``_initial_form_count`` attributes of BaseFormSet. Those attributes are now
+public methods.
+
+Fixed the ``join`` filter's escaping behavior
+---------------------------------------------
+
+The :ttag:`join` filter no longer escapes the literal value that is 
+passed in for the connector. 
+
+This is backwards incompatible for the special situation of the literal string
+containing one of the five special HTML characters. Thus, if you were writing
+``{{ foo|join:"&" }}``, you now have to write ``{{ foo|join:"&" }}``.
+
+The previous behavior was a bug and contrary to what was documented
+and expected.
+
+Permanent redirects and the ``redirect_to()`` generic view
+----------------------------------------------------------
+
+Django 1.1 adds a ``permanent`` argument to the
+:func:`django.views.generic.simple.redirect_to()` view. This is technically
+backwards-incompatible if you were using the ``redirect_to`` view with a
+format-string key called 'permanent', which is highly unlikely.
+
+Features deprecated in 1.1
+==========================
+
+One feature has been marked as deprecated in Django 1.1:
+
+    * You should no longer use ``AdminSite.root()`` to register that admin
+      views. That is, if your URLconf contains the line::
+      
+            (r'^admin/(.*)', admin.site.root),
+            
+      You should change it to read::
+        
+            (r'^admin/', include(admin.site.urls)),
+            
+You should begin to remove use of this features from your code immediately.
+
+``AdminSite.root`` will will raise a ``PendingDeprecationWarning`` if used in
+Django 1.1. This warning is hidden by default. In Django 1.2, this warning will
+be upgraded to a ``DeprecationWarning``, which will be displayed loudly. Django
+1.3 will remove ``AdminSite.root()`` entirely.
+
+For more details on our deprecation policies and strategy, see
+:ref:`internals-release-process`.
+
+What's new in Django 1.1
+========================
+
+Quite a bit: since Django 1.0, we've made 1,290 code commits, fixed 1,206 bugs,
+and added roughly 10,000 lines of documentation.
+
+The major new features in Django 1.1 are:
+
+ORM improvements
+----------------
+
+.. currentmodule:: django.db.models
+
+Two major enhancements have been added to Django's object-relational mapper
+(ORM): aggregate support, and query expressions.
+
+Aggregate support
+~~~~~~~~~~~~~~~~~
+
+It's now possible to run SQL aggregate queries (i.e. ``COUNT()``, ``MAX()``,
+``MIN()``, etc.) from within Django's ORM. You can choose to either return the
+results of the aggregate directly, or else annotate the objects in a
+:class:`QuerySet` with the results of the aggregate query.
+
+This feature is available as new :meth:`QuerySet.aggregate()`` and
+:meth:`QuerySet.annotate()`` methods, and is covered in detail in :ref:`the ORM
+aggregation documentation `.
+
+Query expressions
+~~~~~~~~~~~~~~~~~
+
+Queries can now refer to a another field on the query and can traverse
+relationships to refer to fields on related models. This is implemented in the
+new :class:`F` object; for full details, including examples, consult the
+:ref:`documentation for F expressions `.
+
+Model improvements
+------------------
+
+A number of features have been added to Django's model layer:
+
+"Unmanaged" models
+~~~~~~~~~~~~~~~~~~
+
+You can now control whether or not Django manages the life-cycle of the database
+tables for a model using the :attr:`~Options.managed` model option. This
+defaults to ``True``, meaning that Django will create the appropriate database
+tables in :djadmin:`syncdb` and remove them as part of the :djadmin:`reset`
+command. That is, Django *manages* the database table's lifecycle.
+
+If you set this to ``False``, however, no database table creating or deletion
+will be automatically performed for this model. This is useful if the model
+represents an existing table or a database view that has been created by some
+other means.
+
+For more details, see the documentation for the :attr:`~Options.managed`
+option.
+
+Proxy models
+~~~~~~~~~~~~
+
+You can now create :ref:`proxy models `: subclasses of existing
+models that only add Python-level (rather than database-level) behavior and
+aren't represented by a new table. That is, the new model is a *proxy* for some
+underlying model, which stores all the real data.
+
+All the details can be found in the :ref:`proxy models documentation
+`. This feature is similar on the surface to unmanaged models,
+so the documentation has an explanation of :ref:`how proxy models differ from
+unmanaged models `.
+
+Deferred fields
+~~~~~~~~~~~~~~~
+
+In some complex situations, your models might contain fields which could
+contain a lot of data (for example, large text fields), or require expensive
+processing to convert them to Python objects. If you know you don't need those
+particular fields, you can now tell Django not to retrieve them from the
+database.
+
+You'll do this with the :ref:`new queryset methods `
+``defer()`` and ``only()``.
+
+Testing improvements
+--------------------
+
+A few notable improvements have been made to the :ref:`testing framework
+`.
+
+Test performance improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. currentmodule:: django.test
+
+Tests written using Django's :ref:`testing framework ` now run
+dramatically faster (as much as 10 times faster in many cases).
+
+This was accomplished through the introduction of transaction-based tests: when
+using :class:`django.test.TestCase`, your tests will now be run in a transaction
+which is rolled back when finished, instead of by flushing and re-populating the
+database. This results in an immense speedup for most types of unit tests. See
+the documentation for :class:`TestCase` and :class:`TransactionTestCase` for a
+full description, and some important notes on database support.
+
+Test client improvements
+------------------------
+
+.. currentmodule:: django.test.client
+
+A couple of small -- but highly useful -- improvements have been made to the
+test client:
+
+    * The test :class:`Client` now can automatically follow redirects with the
+      ``follow`` argument to :meth:`Client.get` and :meth:`Client.post`. This
+      makes testing views that issue redirects simpler.
+      
+    * It's now easier to get at the template context in the response returned
+      the test client: you'll simply access the context as
+      ``request.context[key]``. The old way, which treats ``request.context`` as
+      a list of contexts, one for each rendered template in the inheritance
+      chain, is still available if you need it.
+
+New admin features
+------------------
+
+Django 1.1 adds a couple of nifty new features to Django's admin interface:
+
+Editable fields on the change list
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can now make fields editable on the admin list views via the new
+:ref:`list_editable ` admin option. These fields will show
+up as form widgets on the list pages, and can be edited and saved in bulk.
+
+Admin "actions"
+~~~~~~~~~~~~~~~
+
+You can now define :ref:`admin actions ` that can
+perform some action to a group of models in bulk. Users will be able to select
+objects on the change list page and then apply these bulk actions to all
+selected objects.
+
+Django ships with one pre-defined admin action to delete a group of objects in
+one fell swoop.
+
+Conditional view processing
+---------------------------
+
+Django now has much better support for :ref:`conditional view processing
+` using the standard ``ETag`` and
+``Last-Modified`` HTTP headers. This means you can now easily short-circuit
+view processing by testing less-expensive conditions. For many views this can
+lead to a serious improvement in speed and reduction in bandwidth.
+
+URL namespaces
+--------------
+
+Django 1.1 improves :ref:`named URL patterns ` with the
+introduction of URL "namespaces."
+
+In short, this feature allows the same group of URLs, from the same application,
+to be included in a Django URLConf multiple times, with varying (and potentially
+nested) named prefixes which will be used when performing reverse resolution. In
+other words, reusable applications like Django's admin interface may be
+registered multiple times without URL conflicts.
+
+For full details, see :ref:`the documentation on defining URL namespaces
+`.
+
+GeoDjango
+---------
+
+In Django 1.1, GeoDjango_ (i.e. ``django.contrib.gis``) has several new
+features:
+
+    * Support for SpatiaLite_ -- a spatial database for SQLite -- as a spatial
+      backend.
+      
+    * Geographic aggregates (``Collect``, ``Extent``, ``MakeLine``, ``Union``)
+      and ``F`` expressions.
+    
+    * New ``GeoQuerySet`` methods: ``collect``, ``geojson``, and
+      ``snap_to_grid``.
+      
+    * A new list interface methods for ``GEOSGeometry`` objects.
+
+For more details, see the `GeoDjango documentation`_.
+
+.. _geodjango: http://geodjango.org/
+.. _spatialite: http://www.gaia-gis.it/spatialite/
+.. _geodjango documentation: http://geodjango.org/docs/
+
+Other improvements
+------------------
+
+Other new features and changes introduced since Django 1.0 include:
+
+* The :ref:`CSRF protection middleware ` has been split into
+  two classes -- ``CsrfViewMiddleware`` checks incoming requests, and
+  ``CsrfResponseMiddleware`` processes outgoing responses. The combined
+  ``CsrfMiddleware`` class (which does both) remains for
+  backwards-compatibility, but using the split classes is now recommended in
+  order to allow fine-grained control of when and where the CSRF processing
+  takes place.
+
+* :func:`~django.core.urlresolvers.reverse` and code which uses it (e.g., the
+  ``{% url %}`` template tag) now works with URLs in Django's administrative
+  site, provided that the admin URLs are set up via ``include(admin.site.urls)``
+  (sending admin requests to the ``admin.site.root`` view still works, but URLs
+  in the admin will not be "reversible" when configured this way).
+
+* The ``include()`` function in Django URLconf modules can now accept sequences
+  of URL patterns (generated by ``patterns()``) in addition to module names.
+
+* Instances of Django forms (see `the forms overview `_ now
+  have two additional methods, ``hidden_fields()`` and ``visible_fields()``,
+  which return the list of hidden -- i.e., ```` -- and
+  visible fields on the form, respectively.
+
+* The ``redirect_to`` generic view (see `the generic views documentation
+  `_) now accepts an additional keyword argument
+  ``permanent``. If ``permanent`` is ``True``, the view will emit an HTTP
+  permanent redirect (status code 301). If ``False``, the view will emit an HTTP
+  temporary redirect (status code 302).
+
+* A new database lookup type -- ``week_day`` -- has been added for ``DateField``
+  and ``DateTimeField``. This type of lookup accepts a number between 1 (Sunday)
+  and 7 (Saturday), and returns objects where the field value matches that day
+  of the week. See `the full list of lookup types `_ for details.
+
+* The ``{% for %}`` tag in Django's template language now accepts an optional
+  ``{% empty %}`` clause, to be displayed when ``{% for %}`` is asked to loop
+  over an empty sequence. See :ref:`the list of built-in template tags
+  ` for examples of this.
+
+* The :djadmin:`dumpdata` management command now accepts individual
+  model names as arguments, allowing you to export the data just from
+  particular models.
+  
+* There's a new :tfilter:`safeseq` template filter which works just like
+  :tfilter:`safe` for lists, marking each item in the list as safe.
+  
+* :ref:`Cache backends ` now support ``incr()`` and
+  ``decr()`` commands to increment and decrement the value of a cache key.
+  On cache backends that support atomic increment/decrement -- most
+  notably, the memcached backend -- these operations will be atomic, and
+  quite fast.
+  
+* Django now can :ref:`easily delegate authentication to the web server
+  ` via a new authentication backend that supports
+  the standard ``REMOTE_USER`` environment variable used for this purpose.
+  
+* There's a new :func:`django.shortcuts.redirect` function that makes it
+  easier to issue redirects given an object, a view name, or a URL.
+  
+* The ``postgresql_psycopg2`` backend now supports :ref:`native PostgreSQL
+  autocommit `. This is an advanced, PostgreSQL-specific
+  feature, that can make certain read-heavy applications a good deal
+  faster.
+
+What's next?
+============
+
+We'll take a short break, and then work on Django 1.2 will begin -- no rest for
+the weary! If you'd like to help, discussion of Django development, including
+progress toward the 1.2 release, takes place daily on the django-developers
+mailing list:
+
+    * http://groups.google.com/group/django-developers
+
+... and in the ``#django-dev`` IRC channel on ``irc.freenode.net``. Feel free to
+join the discussions!
+
+Django's online documentation also includes pointers on how to contribute to
+Django: 
+
+    * :ref:`How to contribute to Django `
+
+Contributions on any level -- developing code, writing documentation or simply
+triaging tickets and helping to test proposed bugfixes -- are always welcome and
+appreciated.
+
+And that's the way it is.
diff --git a/docs/releases/index.txt b/docs/releases/index.txt
index bdbd22910c..e5c4fde537 100644
--- a/docs/releases/index.txt
+++ b/docs/releases/index.txt
@@ -3,7 +3,7 @@
 Release notes
 =============
 
-Releases notes for the official Django releases. Each release note will tell you
+Release notes for the official Django releases. Each release note will tell you
 what's new in each version, and will also describe any backwards-incompatible
 changes made in that version.
 
@@ -21,6 +21,8 @@ changes made in that version.
    1.0.2
    1.1-alpha-1
    1.1-beta-1
+   1.1-rc-1
+   1.1
 
 .. seealso::
 
diff --git a/docs/topics/forms/formsets.txt b/docs/topics/forms/formsets.txt
index 8e90b54ced..e6146aeaba 100644
--- a/docs/topics/forms/formsets.txt
+++ b/docs/topics/forms/formsets.txt
@@ -86,9 +86,9 @@ displayed.
 Formset validation
 ------------------
 
-Validation with a formset is about identical to a regular ``Form``. There is
+Validation with a formset is almost identical to a regular ``Form``. There is
 an ``is_valid`` method on the formset to provide a convenient way to validate
-each form in the formset::
+all forms in the formset::
 
     >>> ArticleFormSet = formset_factory(ArticleForm)
     >>> formset = ArticleFormSet({})
@@ -97,22 +97,25 @@ each form in the formset::
 
 We passed in no data to the formset which is resulting in a valid form. The
 formset is smart enough to ignore extra forms that were not changed. If we
-attempt to provide an article, but fail to do so::
+provide an invalid article::
 
     >>> data = {
-    ...     'form-TOTAL_FORMS': u'1',
-    ...     'form-INITIAL_FORMS': u'1',
+    ...     'form-TOTAL_FORMS': u'2',
+    ...     'form-INITIAL_FORMS': u'0',
     ...     'form-0-title': u'Test',
-    ...     'form-0-pub_date': u'',
+    ...     'form-0-pub_date': u'16 June 1904',
+    ...     'form-1-title': u'Test',
+    ...     'form-1-pub_date': u'', # <-- this date is missing but required
     ... }
     >>> formset = ArticleFormSet(data)
     >>> formset.is_valid()
     False
     >>> formset.errors
-    [{'pub_date': [u'This field is required.']}]
+    [{}, {'pub_date': [u'This field is required.']}]
 
-As we can see the formset properly performed validation and gave us the
-expected errors.
+As we can see, ``formset.errors`` is a list whose entries correspond to the
+forms in the formset. Validation was performed for each of the two forms, and
+the expected error message appears for the second item.
 
 .. _understanding-the-managementform:
 
@@ -155,20 +158,40 @@ Custom formset validation
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 A formset has a ``clean`` method similar to the one on a ``Form`` class. This
-is where you define your own validation that deals at the formset level::
+is where you define your own validation that works at the formset level::
 
     >>> from django.forms.formsets import BaseFormSet
 
     >>> class BaseArticleFormSet(BaseFormSet):
     ...     def clean(self):
-    ...         raise forms.ValidationError, u'An error occured.'
+    ...         """Checks that no two articles have the same title."""
+    ...         if any(self.errors):
+    ...             # Don't bother validating the formset unless each form is valid on its own
+    ...             return
+    ...         titles = []
+    ...         for i in range(0, self.total_form_count()):
+    ...             form = self.forms[i]
+    ...             title = form.cleaned_data['title']
+    ...             if title in titles:
+    ...                 raise forms.ValidationError, "Articles in a set must have distinct titles."
+    ...             titles.append(title)
 
     >>> ArticleFormSet = formset_factory(ArticleForm, formset=BaseArticleFormSet)
-    >>> formset = ArticleFormSet({})
+    >>> data = {
+    ...     'form-TOTAL_FORMS': u'2',
+    ...     'form-INITIAL_FORMS': u'0',
+    ...     'form-0-title': u'Test',
+    ...     'form-0-pub_date': u'16 June 1904',
+    ...     'form-1-title': u'Test',
+    ...     'form-1-pub_date': u'23 June 1912',
+    ... }
+    >>> formset = ArticleFormSet(data)
     >>> formset.is_valid()
     False
+    >>> formset.errors
+    [{}, {}]
     >>> formset.non_form_errors()
-    [u'An error occured.']
+    [u'Articles in a set must have distinct titles.']
 
 The formset ``clean`` method is called after all the ``Form.clean`` methods
 have been called. The errors will be found using the ``non_form_errors()``
diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt
index 4248d4f02e..0b2257cefe 100644
--- a/docs/topics/http/urls.txt
+++ b/docs/topics/http/urls.txt
@@ -4,6 +4,8 @@
 URL dispatcher
 ==============
 
+.. module:: django.core.urlresolvers
+
 A clean, elegant URL scheme is an important detail in a high-quality Web
 application. Django lets you design URLs however you want, with no framework
 limitations.
@@ -40,14 +42,14 @@ algorithm the system follows to determine which Python code to execute:
        this is the value of the ``ROOT_URLCONF`` setting, but if the incoming
        ``HttpRequest`` object has an attribute called ``urlconf``, its value
        will be used in place of the ``ROOT_URLCONF`` setting.
-    
+
     2. Django loads that Python module and looks for the variable
        ``urlpatterns``. This should be a Python list, in the format returned by
        the function ``django.conf.urls.defaults.patterns()``.
-    
+
     3. Django runs through each URL pattern, in order, and stops at the first
        one that matches the requested URL.
-    
+
     4. Once one of the regexes matches, Django imports and calls the given
        view, which is a simple Python function. The view gets passed an
        :class:`~django.http.HttpRequest` as its first argument and any values
@@ -182,11 +184,13 @@ your URLconf. This gives your module access to these objects:
 patterns
 --------
 
+.. function:: patterns(prefix, pattern_description, ...)
+
 A function that takes a prefix, and an arbitrary number of URL patterns, and
 returns a list of URL patterns in the format Django needs.
 
 The first argument to ``patterns()`` is a string ``prefix``. See
-"The view prefix" below.
+`The view prefix`_ below.
 
 The remaining arguments should be tuples in this format::
 
@@ -222,6 +226,8 @@ url
 
 .. versionadded:: 1.0
 
+.. function:: url(regex, view, kwargs=None, name=None, prefix='')
+
 You can use the ``url()`` function, instead of a tuple, as an argument to
 ``patterns()``. This is convenient if you want to specify a name without the
 optional extra arguments dictionary. For example::
@@ -244,6 +250,8 @@ The ``prefix`` parameter has the same meaning as the first argument to
 handler404
 ----------
 
+.. data:: handler404
+
 A string representing the full Python import path to the view that should be
 called if none of the URL patterns match.
 
@@ -253,6 +261,8 @@ value should suffice.
 handler500
 ----------
 
+.. data:: handler500
+
 A string representing the full Python import path to the view that should be
 called in case of server errors. Server errors happen when you have runtime
 errors in view code.
@@ -263,8 +273,17 @@ value should suffice.
 include
 -------
 
-A function that takes a full Python import path to another URLconf that should
-be "included" in this place. See `Including other URLconfs`_ below.
+.. function:: include()
+
+A function that takes a full Python import path to another URLconf module that
+should be "included" in this place.
+
+.. versionadded:: 1.1
+
+:func:`include` also accepts as an argument an iterable that returns URL
+patterns.
+
+See `Including other URLconfs`_ below.
 
 Notes on capturing text in URLs
 ===============================
@@ -391,6 +410,32 @@ Django encounters ``include()``, it chops off whatever part of the URL matched
 up to that point and sends the remaining string to the included URLconf for
 further processing.
 
+.. versionadded:: 1.1
+
+Another possibility is to include additional URL patterns not by specifying the
+URLconf Python module defining them as the `include`_ argument but by using
+directly the pattern list as returned by `patterns`_ instead. For example::
+
+    from django.conf.urls.defaults import *
+
+    extra_patterns = patterns('',
+        url(r'reports/(?P\d+)/$', 'credit.views.report', name='credit-reports'),
+        url(r'charge/$', 'credit.views.charge', name='credit-charge'),
+    )
+
+    urlpatterns = patterns('',
+        url(r'^$',    'apps.main.views.homepage', name='site-homepage'),
+        (r'^help/',   include('apps.help.urls')),
+        (r'^credit/', include(extra_patterns)),
+    )
+
+This approach can be seen in use when you deploy an instance of the Django
+Admin application. The Django Admin is deployed as instances of a
+:class:`AdminSite`; each :class:`AdminSite` instance has an attribute
+``urls`` that returns the url patterns available to that instance. It is this
+attribute that you ``include()`` into your projects ``urlpatterns`` when you
+deploy the admin instance.
+
 .. _`Django Web site`: http://www.djangoproject.com/
 
 Captured parameters
@@ -413,6 +458,58 @@ the following example is valid::
 In the above example, the captured ``"username"`` variable is passed to the
 included URLconf, as expected.
 
+.. _topics-http-defining-url-namespaces:
+
+Defining URL Namespaces
+-----------------------
+
+When you need to deploy multiple instances of a single application, it can be
+helpful to be able to differentiate between instances. This is especially
+important when using :ref:`named URL patterns `, since
+multiple instances of a single application will share named URLs. Namespaces
+provide a way to tell these named URLs apart.
+
+A URL namespace comes in two parts, both of which are strings:
+
+    * An **application namespace**. This describes the name of the application
+      that is being deployed. Every instance of a single application will have
+      the same application namespace. For example, Django's admin application
+      has the somewhat predictable application namespace of ``admin``.
+
+    * An **instance namespace**. This identifies a specific instance of an
+      application. Instance namespaces should be unique across your entire
+      project. However, an instance namespace can be the same as the
+      application namespace. This is used to specify a default instance of an
+      application. For example, the default Django Admin instance has an
+      instance namespace of ``admin``.
+
+URL Namespaces can be specified in two ways.
+
+Firstly, you can provide the application and instance namespace as arguments
+to ``include()`` when you construct your URL patterns. For example,::
+
+    (r'^help/', include('apps.help.urls', namespace='foo', app_name='bar')),
+
+This will include the URLs defined in ``apps.help.urls`` into the application
+namespace ``bar``, with the instance namespace ``foo``.
+
+Secondly, you can include an object that contains embedded namespace data. If
+you ``include()`` a ``patterns`` object, that object will be added to the
+global namespace. However, you can also ``include()`` an object that contains
+a 3-tuple containing::
+
+    (, , )
+
+This will include the nominated URL patterns into the given application and
+instance namespace. For example, the ``urls`` attribute of Django's
+:class:`AdminSite` object returns a 3-tuple that contains all the patterns in
+an admin site, plus the name of the admin instance, and the application
+namespace ``admin``.
+
+Once you have defined namespaced URLs, you can reverse them. For details on
+reversing namespaced urls, see the documentation on :ref:`reversing namespaced
+URLs `.
+
 Passing extra options to view functions
 =======================================
 
@@ -545,7 +642,7 @@ view::
 
 This is completely valid, but it leads to problems when you try to do reverse
 URL matching (through the ``permalink()`` decorator or the :ttag:`url` template
-tag. Continuing this example, if you wanted to retrieve the URL for the
+tag). Continuing this example, if you wanted to retrieve the URL for the
 ``archive`` view, Django's reverse URL matcher would get confused, because *two*
 URLpatterns point at that view.
 
@@ -587,6 +684,86 @@ not restricted to valid Python names.
     name, will decrease the chances of collision. We recommend something like
     ``myapp-comment`` instead of ``comment``.
 
+.. _topics-http-reversing-url-namespaces:
+
+URL namespaces
+--------------
+
+.. versionadded:: 1.1
+
+Namespaced URLs are specified using the ``:`` operator. For example, the main
+index page of the admin application is referenced using ``admin:index``. This
+indicates a namespace of ``admin``, and a named URL of ``index``.
+
+Namespaces can also be nested. The named URL ``foo:bar:whiz`` would look for
+a pattern named ``whiz`` in the namespace ``bar`` that is itself defined within
+the top-level namespace ``foo``.
+
+When given a namespaced URL (e.g. ``myapp:index``) to resolve, Django splits
+the fully qualified name into parts, and then tries the following lookup:
+
+    1. First, Django looks for a matching application namespace (in this
+       example, ``myapp``). This will yield a list of instances of that
+       application.
+
+    2. If there is a *current* application defined, Django finds and returns
+       the URL resolver for that instance. The *current* application can be
+       specified as an attribute on the template context - applications that
+       expect to have multiple deployments should set the ``current_app``
+       attribute on any ``Context`` or ``RequestContext`` that is used to
+       render a template.
+
+       The current application can also be specified manually as an argument
+       to the :func:`reverse()` function.
+
+    3. If there is no current application. Django looks for a default
+       application instance. The default application instance is the instance
+       that has an instance namespace matching the application namespace (in
+       this example, an instance of the ``myapp`` called ``myapp``).
+
+    4. If there is no default application instance, Django will pick the first
+       deployed instance of the application, whatever its instance name may be.
+
+    5. If the provided namespace doesn't match an application namespace in
+       step 1, Django will attempt a direct lookup of the namespace as an
+       instance namespace.
+
+If there are nested namespaces, these steps are repeated for each part of the
+namespace until only the view name is unresolved. The view name will then be
+resolved into a URL in the namespace that has been found.
+
+To show this resolution strategy in action, consider an example of two instances
+of ``myapp``: one called ``foo``, and one called ``bar``. ``myapp`` has a main
+index page with a URL named `index`. Using this setup, the following lookups are
+possible:
+
+    * If one of the instances is current - say, if we were rendering a utility page
+      in the instance ``bar`` - ``myapp:index`` will resolve to the index page of
+      the instance ``bar``.
+
+    * If there is no current instance - say, if we were rendering a page
+      somewhere else on the site - ``myapp:index`` will resolve to the first
+      registered instance of ``myapp``. Since there is no default instance,
+      the first instance of ``myapp`` that is registered will be used. This could
+      be ``foo`` or ``bar``, depending on the order they are introduced into the
+      urlpatterns of the project.
+
+    * ``foo:index`` will always resolve to the index page of the instance ``foo``.
+
+If there was also a default instance - i.e., an instance named `myapp` - the
+following would happen:
+
+    * If one of the instances is current - say, if we were rendering a utility page
+      in the instance ``bar`` - ``myapp:index`` will resolve to the index page of
+      the instance ``bar``.
+
+    * If there is no current instance - say, if we were rendering a page somewhere
+      else on the site - ``myapp:index`` will resolve to the index page of the
+      default instance.
+
+    * ``foo:index`` will again resolve to the index page of the instance ``foo``.
+
+
 Utility methods
 ===============
 
@@ -597,8 +774,7 @@ If you need to use something similar to the :ttag:`url` template tag in
 your code, Django provides the following method (in the
 ``django.core.urlresolvers`` module):
 
-.. currentmodule:: django.core.urlresolvers
-.. function:: reverse(viewname, urlconf=None, args=None, kwargs=None)
+.. function:: reverse(viewname, urlconf=None, args=None, kwargs=None, current_app=None)
 
 ``viewname`` is either the function name (either a function reference, or the
 string version of the name, if you used that form in ``urlpatterns``) or the
@@ -620,6 +796,14 @@ vertical bar (``"|"``) character. You can quite happily use such patterns for
 matching against incoming URLs and sending them off to views, but you cannot
 reverse such patterns.
 
+.. versionadded:: 1.1
+
+The ``current_app`` argument allows you to provide a hint to the resolver
+indicating the application to which the currently executing view belongs.
+This ``current_app`` argument is used as a hint to resolve application
+namespaces into URLs on specific application instances, according to the
+:ref:`namespaced URL resolution strategy `.
+
 .. admonition:: Make sure your views are all correct
 
     As part of working out which URL names map to which patterns, the
@@ -639,7 +823,6 @@ resolve()
 The :func:`django.core.urlresolvers.resolve` function can be used for resolving
 URL paths to the corresponding view functions. It has the following signature:
 
-.. currentmodule:: django.core.urlresolvers
 .. function:: resolve(path, urlconf=None)
 
 ``path`` is the URL path you want to resolve. As with ``reverse()`` above, you
diff --git a/docs/topics/i18n.txt b/docs/topics/i18n.txt
index 86c03221aa..c5f4ab6481 100644
--- a/docs/topics/i18n.txt
+++ b/docs/topics/i18n.txt
@@ -223,7 +223,19 @@ Pluralization
 ~~~~~~~~~~~~~
 
 Use the function ``django.utils.translation.ungettext()`` to specify pluralized
-messages. Example::
+messages.
+
+``ungettext`` takes three arguments: the singular translation string, the plural
+translation string and the number of objects.
+
+This function is useful when your need you Django application to be localizable
+to languages where the number and complexity of `plural forms
+`_ is
+greater than the two forms used in English ('object' for the singular and
+'objects' for all the cases where ``count`` is different from zero, irrespective
+of its value.)
+
+For example::
 
     from django.utils.translation import ungettext
     def hello_world(request, count):
@@ -232,9 +244,61 @@ messages. Example::
         }
         return HttpResponse(page)
 
-``ungettext`` takes three arguments: the singular translation string, the plural
-translation string and the number of objects (which is passed to the
-translation languages as the ``count`` variable).
+In this example the number of objects is passed to the translation languages as
+the ``count`` variable.
+
+Lets see a slightly more complex usage example::
+
+    from django.utils.translation import ungettext
+
+    count = Report.objects.count()
+    if count == 1:
+        name = Report._meta.verbose_name
+    else:
+        name = Report._meta.verbose_name_plural
+
+    text = ungettext(
+            'There is %(count)d %(name)s available.',
+            'There are %(count)d %(name)s available.',
+            count
+    ) % {
+        'count': count,
+        'name': name
+    }
+
+Here we reuse localizable, hopefully already translated literals (contained in
+the ``verbose_name`` and ``verbose_name_plural`` model ``Meta`` options) for
+other parts of the sentence so all of it is consistently based on the
+cardinality of the elements at play.
+
+.. _pluralization-var-notes:
+
+.. note::
+
+    When using this technique, make sure you use a single name for every
+    extrapolated variable included in the literal. In the example above note how
+    we used the ``name`` Python variable in both translation strings. This
+    example would fail::
+
+        from django.utils.translation import ungettext
+        from myapp.models import Report
+
+        count = Report.objects.count()
+        d = {
+            'count': count,
+            'name': Report._meta.verbose_name
+            'plural_name': Report._meta.verbose_name_plural
+        }
+        text = ungettext(
+                'There is %(count)d %(name)s available.',
+                'There are %(count)d %(plural_name)s available.',
+                count
+        ) % d
+
+    You would get a ``a format specification for argument 'name', as in
+    'msgstr[0]', doesn't exist in 'msgid'`` error when running
+    ``django-admin.py compilemessages`` or a ``KeyError`` Python exception at
+    runtime.
 
 In template code
 ----------------
@@ -257,6 +321,8 @@ content that will require translation in the future::
 
     {% trans "myvar" noop %}
 
+Internally, inline translations use an ``ugettext`` call.
+
 It's not possible to mix a template variable inside a string within ``{% trans
 %}``. If your translations require strings with variables (placeholders), use
 ``{% blocktrans %}``::
@@ -288,8 +354,11 @@ To pluralize, specify both the singular and plural forms with the
     There are {{ counter }} {{ name }} objects.
     {% endblocktrans %}
 
-Internally, all block and inline translations use the appropriate
-``ugettext`` / ``ungettext`` call.
+When you use the pluralization feature and bind additional values to local
+variables apart from the counter value that selects the translated literal to be
+used, have in mind that the ``blocktrans`` construct is internally converted
+to an ``ungettext`` call. This means the same :ref:`notes regarding ungettext
+variables ` apply.
 
 Each ``RequestContext`` has access to three translation-specific variables:
 
@@ -890,11 +959,11 @@ Using the JavaScript translation catalog
 
 To use the catalog, just pull in the dynamically generated script like this::
 
-    
+    
 
-This is how the admin fetches the translation catalog from the server. When the
-catalog is loaded, your JavaScript code can use the standard ``gettext``
-interface to access it::
+This uses reverse URL lookup to find the URL of the JavaScript catalog view.
+When the catalog is loaded, your JavaScript code can use the standard
+``gettext`` interface to access it::
 
     document.write(gettext('this is to be translated'));
 
diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt
index 1256a61187..cec6002b7b 100644
--- a/docs/topics/testing.txt
+++ b/docs/topics/testing.txt
@@ -479,7 +479,7 @@ arguments at time of construction:
     Once you have a ``Client`` instance, you can call any of the following
     methods:
 
-    .. method:: Client.get(path, data={}, follow=False)
+    .. method:: Client.get(path, data={}, follow=False, **extra)
 
 
         Makes a GET request on the provided ``path`` and returns a ``Response``
@@ -495,6 +495,17 @@ arguments at time of construction:
 
             /customers/details/?name=fred&age=7
 
+        The ``extra`` keyword arguments parameter can be used to specify
+        headers to be sent in the request. For example::
+
+            >>> c = Client()
+            >>> c.get('/customers/details/', {'name': 'fred', 'age': 7},
+            ...       HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+
+        ...will send the HTTP header ``HTTP_X_REQUESTED_WITH`` to the
+        details	view, which is a good way to test code paths that use the
+        :meth:`django.http.HttpRequest.is_ajax()` method.
+
         .. versionadded:: 1.1
 
         If you already have the GET arguments in URL-encoded form, you can
@@ -518,7 +529,7 @@ arguments at time of construction:
             >>> response.redirect_chain
             [(u'http://testserver/next/', 302), (u'http://testserver/final/', 302)]
 
-    .. method:: Client.post(path, data={}, content_type=MULTIPART_CONTENT, follow=False)
+    .. method:: Client.post(path, data={}, content_type=MULTIPART_CONTENT, follow=False, **extra)
 
         Makes a POST request on the provided ``path`` and returns a
         ``Response`` object, which is documented below.
@@ -569,6 +580,8 @@ arguments at time of construction:
         Note that you should manually close the file after it has been provided
         to ``post()``.
 
+        The ``extra`` argument acts the same as for :meth:`Client.get`.
+
         .. versionchanged:: 1.1
 
         If the URL you request with a POST contains encoded parameters, these
@@ -585,7 +598,7 @@ arguments at time of construction:
         and a ``redirect_chain`` attribute will be set in the response object
         containing tuples of the intermediate urls and status codes.
 
-    .. method:: Client.head(path, data={}, follow=False)
+    .. method:: Client.head(path, data={}, follow=False, **extra)
 
         .. versionadded:: 1.1
 
@@ -597,7 +610,7 @@ arguments at time of construction:
         and a ``redirect_chain`` attribute will be set in the response object
         containing tuples of the intermediate urls and status codes.
 
-    .. method:: Client.options(path, data={}, follow=False)
+    .. method:: Client.options(path, data={}, follow=False, **extra)
 
         .. versionadded:: 1.1
 
@@ -608,7 +621,9 @@ arguments at time of construction:
         and a ``redirect_chain`` attribute will be set in the response object
         containing tuples of the intermediate urls and status codes.
 
-    .. method:: Client.put(path, data={}, content_type=MULTIPART_CONTENT, follow=False)
+        The ``extra`` argument acts the same as for :meth:`Client.get`.
+
+    .. method:: Client.put(path, data={}, content_type=MULTIPART_CONTENT, follow=False, **extra)
 
         .. versionadded:: 1.1
 
@@ -620,7 +635,7 @@ arguments at time of construction:
         and a ``redirect_chain`` attribute will be set in the response object
         containing tuples of the intermediate urls and status codes.
 
-    .. method:: Client.delete(path, follow=False)
+    .. method:: Client.delete(path, follow=False, **extra)
 
         .. versionadded:: 1.1
 
@@ -631,6 +646,8 @@ arguments at time of construction:
         and a ``redirect_chain`` attribute will be set in the response object
         containing tuples of the intermediate urls and status codes.
 
+        The ``extra`` argument acts the same as for :meth:`Client.get`.
+
     .. method:: Client.login(**credentials)
 
         .. versionadded:: 1.0
@@ -669,7 +686,13 @@ arguments at time of construction:
         user accounts that are valid on your production site will not work
         under test conditions. You'll need to create users as part of the test
         suite -- either manually (using the Django model API) or with a test
-        fixture.
+        fixture. Remember that if you want your test user to have a password,
+        you can't set the user's password by setting the password attribute
+        directly -- you must use the
+        :meth:`~django.contrib.auth.models.User.set_password()` function to
+        store a correctly hashed password. Alternatively, you can use the
+        :meth:`~django.contrib.auth.models.UserManager.create_user` helper
+        method to create a new user with a correctly hashed password.
 
     .. method:: Client.logout()
 
diff --git a/setup.py b/setup.py
index 4e84c94d8d..da565be2b5 100644
--- a/setup.py
+++ b/setup.py
@@ -74,7 +74,6 @@ setup(
     name = "Django",
     version = version.replace(' ', '-'),
     url = 'http://www.djangoproject.com/',
-    download_url = 'http://media.djangoproject.com/releases/1.1/Django-1.1-beta-1.tar.gz',
     author = 'Django Software Foundation',
     author_email = 'foundation@djangoproject.com',
     description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.',
@@ -82,7 +81,7 @@ setup(
     cmdclass = cmdclasses,
     data_files = data_files,
     scripts = ['django/bin/django-admin.py'],
-    classifiers = ['Development Status :: 3 - Alpha',
+    classifiers = ['Development Status :: 5 - Production/Stable',
                    'Environment :: Web Environment',
                    'Framework :: Django',
                    'Intended Audience :: Developers',
@@ -92,6 +91,7 @@ setup(
                    'Topic :: Internet :: WWW/HTTP',
                    'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
                    'Topic :: Internet :: WWW/HTTP :: WSGI',
+                   'Topic :: Software Development :: Libraries :: Application Frameworks',
                    'Topic :: Software Development :: Libraries :: Python Modules',
                    ],
 )