diff options
| author | Jannis Leidel <jannis@leidel.info> | 2011-01-21 19:42:52 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2011-01-21 19:42:52 +0000 |
| commit | 47c653999f473b9dab9aa000fb2f3e164af437e1 (patch) | |
| tree | 3b4df6fee28387d797e1288d8bf023858a9e94c3 /django | |
| parent | 70a2a71c9b9f1b25361a4ec096671be37e8c3a0d (diff) | |
Updated admin translation files.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
126 files changed, 3939 insertions, 2462 deletions
diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo Binary files differindex 3c2c47b84b..6cb8923bb8 100644 --- a/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ar/LC_MESSAGES/django.po b/django/contrib/admin/locale/ar/LC_MESSAGES/django.po index 6ec0df9d06..0dad762d2e 100644 --- a/django/contrib/admin/locale/ar/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ar/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-12 11:20+0300\n" "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n" "Language-Team: Arabic <support@arabeyes.org>\n" @@ -24,11 +24,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "تم حذف %(count)d %(items)s بنجاح." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "هل أنت متأكد؟" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "حذف سجلات %(verbose_name_plural)s المحددة" @@ -132,89 +137,89 @@ msgstr "مُدخلات السجل" msgid "None" msgstr "لاشيء" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "عدّل %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "و" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "أضاف %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "غيّر %(list)s في %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "حذف %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "لم يتم تغيير أية حقول." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "تم اضافة %(name)s \"%(obj)s\" بنجاح." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "يمكنك تعديله مجددا في الأسفل." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "يمكنك إضافة %s آخر بالأسفل." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "تم تغيير %(name)s \"%(obj)s\" بنجاح." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "تمت إضافة %(name)s \"%(obj)s\" بنجاح، يمكنك تعديله مرة أخرى بالأسفل." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "يجب تحديد العناصر لتطبيق الإجراءات عليها. لم يتم تغيير أية عناصر." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "لم يحدد أي إجراء." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "أضف %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "العنصر %(name)s الذي به الحقل الأساسي %(key)r غير موجود." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "عدّل %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "خطـأ في قاعدة البيانات" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -223,7 +228,7 @@ msgstr[1] "تم تغيير عنصري %(name)s بنجاح." msgstr[2] "تم تغيير %(count)s %(name)s بنجاح." msgstr[3] "تم تغيير %(count)s %(name)s بنجاح." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -232,17 +237,17 @@ msgstr[1] "%(total_count)s تم تحديدهما" msgstr[2] "%(total_count)s تم تحديدهم" msgstr[3] "%(total_count)s تم تحديدهم" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "لا شيء محدد من %(cnt)s" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "تاريخ التغيير: %s" @@ -420,7 +425,7 @@ msgstr "مرشّح" msgid "Delete" msgstr "احذف" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -430,7 +435,16 @@ msgstr "" "حذف العنصر %(object_name)s '%(escaped_object)s' سيتسبب بحذف العناصر المرتبطة " "به، إلا أنك لا تملك صلاحية حذف العناصر التالية:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"حذف العنصر %(object_name)s '%(escaped_object)s' سيتسبب بحذف العناصر المرتبطة " +"به، إلا أنك لا تملك صلاحية حذف العناصر التالية:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -439,8 +453,8 @@ msgstr "" "متأكد أنك تريد حذف العنصر %(object_name)s \"%(escaped_object)s\"؟ سيتم حذف " "جميع العناصر التالية المرتبطة به:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "نعم، أنا متأكد" @@ -448,21 +462,30 @@ msgstr "نعم، أنا متأكد" msgid "Delete multiple objects" msgstr "حذف عدّة عناصر" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 قد يؤدي إلى حذف العناصر المرتبطة به، إلا أن حساب " "المستخدم الخاص بك ليست له صلاحية حذف أنواع العناصر التالية:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"حذف %(object_name)s قد يؤدي إلى حذف العناصر المرتبطة به، إلا أن حساب " +"المستخدم الخاص بك ليست له صلاحية حذف أنواع العناصر التالية:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "متأكد أنك تريد حذف سجلات %(object_name)s المحددة؟ جميع العناصر التالية " "والسجلات المتعلقة بها سيتم حذفها:" @@ -779,12 +802,12 @@ msgstr "استعد كلمة مروري" msgid "All dates" msgstr "كافة التواريخ" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "اختر %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "اختر %s لتغييره" diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo b/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo Binary files differindex 90618484a6..ce7ed23edc 100644 --- a/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/bg/LC_MESSAGES/django.po b/django/contrib/admin/locale/bg/LC_MESSAGES/django.po index 71e41b5c25..d1dc5c7b86 100644 --- a/django/contrib/admin/locale/bg/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/bg/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2008-03-12 13:01+0200\n" "Last-Translator: Vladislav <vladislav.mitov@gmail.com>\n" "Language-Team: \n" @@ -18,11 +18,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Сериозно?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -130,54 +135,54 @@ msgstr "записки" msgid "None" msgstr "един" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Променен %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "и" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Добави %(name)s" -#: options.py:617 +#: options.py:629 #, fuzzy, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "свързани `%(label)s.%(name)s` обекти" -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "свързани `%(label)s.%(name)s` обекти" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Няма променени полета." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Обектът %(name)s \"%(obj)s\" бе успешно добавен. " -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Може да го редактирате пак по-долу. " -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Може да добавите още един обект %s по-долу. " -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Обектът %(name)s \"%(obj)s\" бе успешно актуализиран. " -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -185,61 +190,61 @@ msgstr "" "Обектът %(name)s \"%(obj)s\" бе успешно добавен. Може да го редактирате по-" "долу. " -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "време на действие" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Добави %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Промени %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Грешка с базата данни" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "Обектът %(name)s \"%(obj)s\" бе успешно актуализиран. " msgstr[1] "Обектът %(name)s \"%(obj)s\" бе успешно актуализиран. " -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Обектът %(name)s \"%(obj)s\" бе успешно изтрит. " -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "История на промените: %s" @@ -419,7 +424,7 @@ msgstr "Филтър" msgid "Delete" msgstr "Изтрий" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -430,7 +435,17 @@ msgstr "" "извършено без да се изтрият и някой свързани обекти, върху които обаче " "нямате права: " -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Изтриването на обекта %(object_name)s '%(escaped_object)s' не може да бъде " +"извършено без да се изтрият и някой свързани обекти, върху които обаче " +"нямате права: " + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -439,8 +454,8 @@ msgstr "" "Наистина ли искате да затрием обектите %(object_name)s \"%(escaped_object)s" "\"? Следните свързани елементи също ще бъдат изтрити:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Абсолютно" @@ -448,22 +463,32 @@ msgstr "Абсолютно" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 '%(escaped_object)s' не може да бъде " +"извършено без да се изтрият и някой свързани обекти, върху които обаче " +"нямате права: " + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "Изтриването на обекта %(object_name)s '%(escaped_object)s' не може да бъде " "извършено без да се изтрият и някой свързани обекти, върху които обаче " "нямате права: " -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Наистина ли искате да затрием обектите %(object_name)s \"%(escaped_object)s" "\"? Следните свързани елементи също ще бъдат изтрити:" @@ -791,12 +816,12 @@ msgstr "Нова парола" msgid "All dates" msgstr "Всички дати" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Изберете %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Изберете %s за промяна" diff --git a/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo Binary files differindex b7cfdfad43..25b4303560 100644 --- a/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/bn/LC_MESSAGES/django.po b/django/contrib/admin/locale/bn/LC_MESSAGES/django.po index 3f3e401beb..db9adbc448 100644 --- a/django/contrib/admin/locale/bn/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/bn/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2009-07-19 22:49+0000\n" "Last-Translator: Nasimul Haque <nasim.haque@gmail.com>\n" "Language-Team: Nasimul Haque <nasim.haque@gmail.com>\n" @@ -18,11 +18,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "আপনি কি নিশ্চিত?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -124,54 +129,54 @@ msgstr "লগ এন্ট্রিসমূহ" msgid "None" msgstr "কিছু না" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s পরিবর্তিত হয়েছে।" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "এবং" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" যুক্ত হয়েছে।" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" এর জন্য %(list)s পরিবর্তিত হয়েছে।" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" মোছা হয়েছে।" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "কোন ফিল্ড পরিবর্তন হয়নি।" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" সফলতার সাথে যুক্ত হয়েছে।" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "আপনি নিচে থেকে এটি পুনরায় সম্পাদন করতে পারেন।" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "আপনি নিচে থেকে আরেকটি %s যোগ করতে পারেন।" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" সফলতার সাথে পরিবর্তিত হয়েছে।" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -179,61 +184,61 @@ msgstr "" "%(name)s \"%(obj)s\" সফলতার সাথে যুক্ত হয়েছে। আপনি নিচে থেকে এটি পুনরায় সম্পাদন " "করতে পারেন।" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "কার্য সময়" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s যোগ করুন" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s পরিবর্তন করুন" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "ডাটাবেস সমস্যা" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" সফলতার সাথে পরিবর্তিত হয়েছে।" msgstr[1] "%(name)s \"%(obj)s\" সফলতার সাথে পরিবর্তিত হয়েছে।" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" সফলতার সাথে মুছে ফেলা হয়েছে।" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "ইতিহাস পরিবর্তনঃ %s" @@ -409,7 +414,7 @@ msgstr "ফিল্টার" msgid "Delete" msgstr "মুছুন" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -419,7 +424,16 @@ msgstr "" "%(object_name)s '%(escaped_object)s' মুছে ফেললে এর সম্পর্কিত অবজেক্টগুলোও মুছে " "যাবে, কিন্তু আপনার নিম্নবর্ণিত অবজেক্টগুলো মোছার অধিকার নেইঃ" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"%(object_name)s '%(escaped_object)s' মুছে ফেললে এর সম্পর্কিত অবজেক্টগুলোও মুছে " +"যাবে, কিন্তু আপনার নিম্নবর্ণিত অবজেক্টগুলো মোছার অধিকার নেইঃ" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -428,8 +442,8 @@ msgstr "" "আপনি কি %(object_name)s \"%(escaped_object)s\" মুছে ফেলার ব্যাপারে নিশ্চিত? " "নিম্নে বর্ণিত সকল আইটেম মুছে যাবেঃ" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "হ্যা়ঁ, আমি নিশ্চিত" @@ -438,21 +452,30 @@ msgstr "হ্যা়ঁ, আমি নিশ্চিত" msgid "Delete multiple objects" msgstr "%(name)s \"%(object)s\" মোছা হয়েছে।" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 '%(escaped_object)s' মুছে ফেললে এর সম্পর্কিত অবজেক্টগুলোও মুছে " +"যাবে, কিন্তু আপনার নিম্নবর্ণিত অবজেক্টগুলো মোছার অধিকার নেইঃ" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "%(object_name)s '%(escaped_object)s' মুছে ফেললে এর সম্পর্কিত অবজেক্টগুলোও মুছে " "যাবে, কিন্তু আপনার নিম্নবর্ণিত অবজেক্টগুলো মোছার অধিকার নেইঃ" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "আপনি কি %(object_name)s \"%(escaped_object)s\" মুছে ফেলার ব্যাপারে নিশ্চিত? " "নিম্নে বর্ণিত সকল আইটেম মুছে যাবেঃ" @@ -768,12 +791,12 @@ msgstr "আমার পাসওয়ার্ড রিসেট করুন" msgid "All dates" msgstr "সকল তারিখ" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s বাছাই করুন" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "%s পরিবর্তনের জন্য বাছাই করুন" diff --git a/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo b/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo Binary files differindex 9de3880110..b80b9c6373 100644 --- a/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/bs/LC_MESSAGES/django.po b/django/contrib/admin/locale/bs/LC_MESSAGES/django.po index c839724063..d0e5bb72ac 100644 --- a/django/contrib/admin/locale/bs/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/bs/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-04-28 13:45+0100\n" "Last-Translator: Filip Dupanović <kron@kron.ba>\n" "Language-Team: Filip Dupanović <kron@kron.ba>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Uspješno obrisano: %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Da li ste sigurni?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Briši označene objekte klase %(verbose_name_plural)s" @@ -126,54 +131,54 @@ msgstr "zapisi u logovima" msgid "None" msgstr "Ništa" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Izmjenjena polja %s" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "i" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Sačuvan objekat „%(object)s“ klase %(name)s." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Izmjenjena polja %(list)s objekata „%(object)s“ klase %(name)s ." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Obrisan objekat „%(object)s“ klase %(name)s." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Bez izmjena u poljima." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Objekat „%(obj)s“ klase %(name)s sačuvan je uspješno." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Dole možete ponovo unositi izmjene." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Dole možete dodati novi objekat klase %s" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Objekat „%(obj)s“ klase %(name)s izmjenjen je uspješno." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -181,7 +186,7 @@ msgstr "" "Objekat „%(obj)s“ klase %(name)s dodat je uspješno. Dole možete unjeti " "dodatne izmjene." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -189,30 +194,30 @@ msgstr "" "Predmeti moraju biti izabrani da bi se mogla obaviti akcija nad njima. " "Nijedan predmet nije bio izmjenjen." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nijedna akcija nije izabrana." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Dodaj objekat klase %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Izmjeni objekat klase %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Greška u bazi podataka" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -220,7 +225,7 @@ msgstr[0] "%(count)s objekat klase %(name)s izmjenjen je uspješno." msgstr[1] "%(count)s objekata klase %(name)s izmjenjeni su uspješno." msgstr[2] "%(count)s objekta klase %(name)s izmjenjeno je uspješno." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -228,17 +233,17 @@ msgstr[0] "%(total_count)s izabran" msgstr[1] "%(total_count)s izabrana" msgstr[2] "%(total_count)s izabrani" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 od %(cnt)s izabrani" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Objekat „%(obj)s“ klase %(name)s obrisan je uspješno." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Historijat izmjena: %s" @@ -415,7 +420,7 @@ msgstr "Filter" msgid "Delete" msgstr "Obriši" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -426,7 +431,17 @@ msgstr "" "objekata koji su povezani sa ovim objektom, ali vaš nalog nema dozvole za " "brisanje slijedećih tipova objekata:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related 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 slijedećih tipova objekata:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -436,8 +451,8 @@ msgstr "" "s“? Slijedeći objekti koji su u vezi sa ovim objektom će također biti " "obrisani:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Da, siguran sam" @@ -445,22 +460,32 @@ msgstr "Da, siguran sam" msgid "Delete multiple objects" msgstr "Brisanje više objekata" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 slijedećih tipova " "objekata:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Uklanjanje %(object_name)s povlači uklanjanje svih objekata koji su povezani " +"sa ovim objektom, ali vaš nalog nema dozvole za brisanje slijedećih tipova " +"objekata:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Da li ste sigurni da želite da obrišete odabrane %(object_name)s? Slijedeći " "objekti koji su u vezi sa ovim objektom će također biti obrisani:" @@ -777,12 +802,12 @@ msgstr "Resetuj moju lozinku" msgid "All dates" msgstr "Svi datumi" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Odaberi objekat klase %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Odaberi objekat klase %s za izmjenu" diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo Binary files differindex 68dc3d4040..7bf8498d12 100644 --- a/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ca/LC_MESSAGES/django.po b/django/contrib/admin/locale/ca/LC_MESSAGES/django.po index 216ac68295..21d29558c6 100644 --- a/django/contrib/admin/locale/ca/LC_MESSAGES/django.po +++ b/django/contrib/admin/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: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2009-03-24 13:28+0100\n" "Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n" "Language-Team: Catalan <ca@li.org>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Eliminat/s %(count)d %(items)s satisfactòriament." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "N'esteu segur?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Eliminar els %(verbose_name_plural)s seleccionats" @@ -128,61 +133,61 @@ msgstr "entrades del registre" msgid "None" msgstr "cap" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Modificat %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "i" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Afegit %(name)s \"%(object)s\"" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificat %(list)s per a %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Eliminat %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Cap camp modificat." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "El/la %(name)s \"%(obj)s\" ha estat afegit/da amb èxit." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Podeu editar-lo de nou a sota." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Podeu afegir un altre %s a sota." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "S'ha afegit amb èxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou a sota." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -190,54 +195,54 @@ msgstr "" "Heu de seleccionar els elements per poder realitzar-hi accions. No heu " "seleccionat cap element." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "no heu seleccionat cap acció" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Afegir %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "No existeix cap objecte %(name)s amb la clau primària %(key)r." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Error de base de dades" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionat(s)" msgstr[1] "Tots %(total_count)s seleccionat(s)" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s seleccionats" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "El/la %(name)s \"%(obj)s\" s'ha eliminat amb èxit." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Modificar històric: %s" @@ -414,7 +419,7 @@ msgstr "Filtre" msgid "Delete" msgstr "Eliminar" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -425,7 +430,17 @@ msgstr "" "d'objectes relacionats, però el vostre compte no te permisos per esborrar " "els tipus d'objecte següents:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Eliminar el/la %(object_name)s '%(escaped_object)s' provocaria l'eliminació " +"d'objectes relacionats, però el vostre compte no te permisos per esborrar " +"els tipus d'objecte següents:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -434,8 +449,8 @@ msgstr "" "Esteu segurs de voler esborrar els/les %(object_name)s \"%(escaped_object)s" "\"? S'esborraran els següents elements relacionats:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Sí, n'estic segur" @@ -443,22 +458,32 @@ msgstr "Sí, n'estic segur" msgid "Delete multiple objects" msgstr "Eliminar múltiples objectes" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but 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 permisos per esborrar els tipus " "d'objecte següents:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Eliminar el/la %(object_name)s provocaria l'eliminació d'objectes " +"relacionats, però el vostre compte no te permisos per esborrar els tipus " +"d'objecte següents:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Esteu segur de voler esborrar els/les %(object_name)s seleccionats? Tots " "aquests objectes i els seus elements relacionats s'esborraran:" @@ -779,12 +804,12 @@ msgstr "Restablir la meva contrasenya" msgid "All dates" msgstr "Totes les dates" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Seleccioneu %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Seleccioneu %s per modificar" diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo b/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo Binary files differindex 049512033b..12f3815b6d 100644 --- a/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/cs/LC_MESSAGES/django.po b/django/contrib/admin/locale/cs/LC_MESSAGES/django.po index 632fee63b4..b18db9b9fa 100644 --- a/django/contrib/admin/locale/cs/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/cs/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-08-06 18:33+0100\n" "Last-Translator: Vlada Macek <macek@sandbox.cz>\n" "Language-Team: Czech\n" @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Úspěšně odstraněno: %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Jste si jisti?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Odstranit vybrané %(verbose_name_plural)s" @@ -130,55 +135,55 @@ msgstr "položky protokolu" msgid "None" msgstr "Žádný" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Změněno: %s" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "a" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Položka \"%(object)s\" typu %(name)s byla přidána." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" "Pole \"%(list)s\" pro položku \"%(object)s\" typu %(name)s změněno/změněna." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Položka \"%(object)s\" typu %(name)s byla odstraněna." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Nebyla změněna žádná pole." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně přidána." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "V úpravách můžete pokračovat níže." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Níže můžete přidat další položku typu %s." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně změněna." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -186,7 +191,7 @@ msgstr "" "Položka \"%(obj)s\" typu %(name)s byla úspěšně přidána. Níže můžete v " "úpravách pokračovat." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -194,30 +199,30 @@ msgstr "" "K provedení hromadných operací je třeba vybrat nějaké položky. Nedošlo k " "žádným změnám." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nebyla vybrána žádná operace." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s: přidat" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Položka \"%(name)s\" s primárním klíčem \"%(key)r\" neexistuje." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s: změnit" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Chyba databáze" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -225,7 +230,7 @@ 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -233,17 +238,17 @@ msgstr[0] "%(total_count)s položka vybrána." msgstr[1] "Všechny %(total_count)s položky vybrány." msgstr[2] "Vybráno všech %(total_count)s položek." -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "Vybraných je 0 položek z celkem %(cnt)s." -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně odstraněna." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Historie změn: %s" @@ -420,7 +425,7 @@ msgstr "Filtr" msgid "Delete" msgstr "Odstranit" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -431,7 +436,17 @@ msgstr "" "odstranění souvisejících položek. Nemáte však oprávnění k odstranění položek " "následujících typů:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Odstranění položky \"%(escaped_object)s\" typu %(object_name)s by vyústilo v " +"odstranění souvisejících položek. Nemáte však oprávnění k odstranění položek " +"následujících typů:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -440,8 +455,8 @@ msgstr "" "Opravdu má být odstraněna položka \"%(escaped_object)s\" typu %(object_name)" "s? Následující související položky budou všechny odstraněny:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ano, jsem si jist(a)" @@ -449,22 +464,32 @@ msgstr "Ano, jsem si jist(a)" msgid "Delete multiple objects" msgstr "Odstranit vybrané položky" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Odstranění položky \"%(object_name)s\" by vyústilo v odstranění " "souvisejících položek. Nemáte však oprávnění k odstranění položek " "následujících typů:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Odstranění položky \"%(object_name)s\" by vyústilo v odstranění " +"souvisejících položek. Nemáte však oprávnění k odstranění položek " +"následujících typů:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Opravdu mají být odstraněny vybrané položky typu %(object_name)s? " "Následující položky a položky s nimi související budou všechny odstraněny:" @@ -779,12 +804,12 @@ msgstr "Obnovit heslo" msgid "All dates" msgstr "Všechna data" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s: vybrat" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Vyberte položku %s ke změně" diff --git a/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo b/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo Binary files differindex 2c4db10bb2..ee45b1b78f 100644 --- a/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/cy/LC_MESSAGES/django.po b/django/contrib/admin/locale/cy/LC_MESSAGES/django.po index 6b92e2be6a..8cfbe824e2 100644 --- a/django/contrib/admin/locale/cy/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/cy/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies <jason@jasondavies.com>\n" "Language-Team: Cymraeg <cy@li.org>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Ydych yn sicr?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -126,90 +131,90 @@ msgstr "cofnodion" msgid "None" msgstr "Na" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Newidiwyd %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ac" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Ychwanegu %(name)s" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "amser gweithred" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Ychwanegu %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Newidio %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -218,7 +223,7 @@ msgstr[1] "Newid cyfrinair yn lwyddianus" msgstr[2] "Newid cyfrinair yn lwyddianus" msgstr[3] "Newid cyfrinair yn lwyddianus" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -227,17 +232,17 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Hanes newid: %s" @@ -418,7 +423,7 @@ msgstr "safle" msgid "Delete" msgstr "Dileu" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, fuzzy, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -428,7 +433,16 @@ msgstr "" "Bydda dileu'r %(object_name)s '%(object)s' yn ddilyn i dileu'r wrthrychau " "perthynol, ond ni chaniateir eich cyfrif ddileu'r mathau o wrthrych canlynol:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Bydda dileu'r %(object_name)s '%(object)s' yn ddilyn i dileu'r wrthrychau " +"perthynol, ond ni chaniateir eich cyfrif ddileu'r mathau o wrthrych canlynol:" + +#: templates/admin/delete_confirmation.html:33 #, fuzzy, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -437,8 +451,8 @@ msgstr "" "Ydych yn sicr chi eiso ddileu'r %(object_name)s \"%(object)s\"? Bydd y cwbl " "o'r eitemau perthynol canlynol yn cae eu ddileu:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Yndw, rwy'n sicr" @@ -446,21 +460,30 @@ msgstr "Yndw, rwy'n sicr" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Bydda dileu'r %(object_name)s '%(object)s' yn ddilyn i dileu'r wrthrychau " +"perthynol, ond ni chaniateir eich cyfrif ddileu'r mathau o wrthrych canlynol:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "Bydda dileu'r %(object_name)s '%(object)s' yn ddilyn i dileu'r wrthrychau " "perthynol, ond ni chaniateir eich cyfrif ddileu'r mathau o wrthrych canlynol:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Ydych yn sicr chi eiso ddileu'r %(object_name)s \"%(object)s\"? Bydd y cwbl " "o'r eitemau perthynol canlynol yn cae eu ddileu:" @@ -784,12 +807,12 @@ msgstr "Ailosodi fy nghyfrinair" msgid "All dates" msgstr "Dyddiadau i gyd" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Dewis %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Dewis %s i newid" diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/django.mo b/django/contrib/admin/locale/da/LC_MESSAGES/django.mo Binary files differindex fba0e9e372..6e3178b157 100644 --- a/django/contrib/admin/locale/da/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/da/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/da/LC_MESSAGES/django.po b/django/contrib/admin/locale/da/LC_MESSAGES/django.po index 244964be8b..f631a94c16 100644 --- a/django/contrib/admin/locale/da/LC_MESSAGES/django.po +++ b/django/contrib/admin/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: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-02-20 20:41+0200\n" "Last-Translator: Finn Gruwier Larsen<finn@gruwier.dk>\n" "Language-Team: \n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s blev slettet." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Er du sikker?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Slet valgte %(verbose_name_plural)s" @@ -127,113 +132,113 @@ msgstr "logmeddelelser" msgid "None" msgstr "Ingen" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Ændrede %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "og" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Tilføjede %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Ændrede %(list)s for %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Slettede %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Ingen felter ændret." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" blev tilføjet i databasen." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Du kan redigere det igen herunder." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Du kan tilføje endnu en %s herunder." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" blev ændret." -#: options.py:741 +#: options.py:753 #, 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." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Ingen handling valgt." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Tilføj %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Ret %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "databasefejl" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valgt" msgstr[1] "Alle %(total_count)s valgt" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 af %(cnt)s valgt" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" blev slettet." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Ændringshistorik: %s" @@ -409,7 +414,7 @@ msgstr "Filtrer" msgid "Delete" msgstr "Slet" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -420,7 +425,17 @@ msgstr "" "relaterede objekter, men din konto har ikke rettigheder til at slette " "følgende objekttyper:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Hvis du sletter %(object_name)s '%(escaped_object)s', vil du også slette " +"relaterede objekter, men din konto har ikke rettigheder til at slette " +"følgende objekttyper:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -429,8 +444,8 @@ msgstr "" "Er du sikker på du vil slette %(object_name)s \"%(escaped_object)s\"? Alle " "de følgende relaterede objekter vil blive slettet:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ja, jeg er sikker" @@ -438,21 +453,30 @@ msgstr "Ja, jeg er sikker" msgid "Delete multiple objects" msgstr "Slet flere objekter" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related 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:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their 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:" @@ -772,12 +796,12 @@ msgstr "Nulstil min adgangskode" msgid "All dates" msgstr "Alle datoer" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Vælg %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Vælg %s, der skal ændres" diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/django.mo b/django/contrib/admin/locale/de/LC_MESSAGES/django.mo Binary files differindex 4da5bc7d9e..d242188b56 100644 --- a/django/contrib/admin/locale/de/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/de/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/de/LC_MESSAGES/django.po b/django/contrib/admin/locale/de/LC_MESSAGES/django.po index 1ffed491fa..daf7287f4b 100644 --- a/django/contrib/admin/locale/de/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-10-10 00:58+0200\n" "Last-Translator: Jannis Leidel <jannis@leidel.info>\n" "Language-Team: \n" @@ -24,11 +24,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Erfolgreich %(count)d %(items)s gelöscht." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Ausgewählte %(verbose_name_plural)s löschen" @@ -133,54 +138,54 @@ msgstr "Logeinträge" msgid "None" msgstr "-" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s geändert." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "und" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" hinzugefügt." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s von %(name)s \"%(object)s\" geändert." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" gelöscht." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Keine Felder geändert." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Das Element kann jetzt erneut bearbeitet werden." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Es kann ein weiteres Element des Typs %s angelegt werden." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -188,7 +193,7 @@ msgstr "" "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt " "geändert werden." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -196,55 +201,55 @@ msgstr "" "Es müssen Objekte aus der Liste ausgewählt werden, um Aktionen " "durchzuführen. Es wurden keine Objekte geändert." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Keine Aktion ausgewählt." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s hinzufügen" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s ändern" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Datenbankfehler" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s ausgewählt" msgstr[1] "Alle %(total_count)s ausgewählt" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 von %(cnt)s ausgewählt" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Änderungsgeschichte: %s" @@ -422,7 +427,7 @@ msgstr "Filter" msgid "Delete" msgstr "Löschen" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -433,7 +438,17 @@ msgstr "" "abhängiger Daten zur Folge, aber Sie haben nicht die nötigen Rechte, um die " "folgenden davon abhängigen Daten zu löschen:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Das Löschen des %(object_name)s '%(escaped_object)s' hätte das Löschen davon " +"abhängiger Daten zur Folge, aber Sie haben nicht die nötigen Rechte, um die " +"folgenden davon abhängigen Daten zu löschen:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -442,8 +457,8 @@ msgstr "" "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen " "wollen? Es werden zusätzlich die folgenden davon abhängigen Daten gelöscht:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ja, ich bin sicher" @@ -451,22 +466,32 @@ msgstr "Ja, ich bin sicher" msgid "Delete multiple objects" msgstr "Mehrere Objekte löschen" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Das Löschen von %(object_name)s hätte das Löschen davon abhängiger Daten zur " "Folge, aber Sie haben nicht die nötigen Rechte, um die folgenden davon " "abhängigen Daten zu löschen:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Das Löschen von %(object_name)s hätte das Löschen davon abhängiger Daten zur " +"Folge, aber Sie haben nicht die nötigen Rechte, um die folgenden davon " +"abhängigen Daten zu löschen:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Sind Sie sicher, dass Sie die ausgewählten %(object_name)s-Objekte löschen " "wollen? Die folgenden Objekte und und die von ihnen abhängigen Daten werden " @@ -787,12 +812,12 @@ msgstr "Mein Passwort zurücksetzen" msgid "All dates" msgstr "Alle Daten" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s auswählen" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "%s zur Änderung auswählen" diff --git a/django/contrib/admin/locale/el/LC_MESSAGES/django.mo b/django/contrib/admin/locale/el/LC_MESSAGES/django.mo Binary files differindex ac2a25087b..8e82214e49 100644 --- a/django/contrib/admin/locale/el/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/el/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/el/LC_MESSAGES/django.po b/django/contrib/admin/locale/el/LC_MESSAGES/django.po index 94a0f4d738..bc75add89c 100644 --- a/django/contrib/admin/locale/el/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/el/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2007-09-03 04:19+0100\n" "Last-Translator: Dimitris Glezos <dimitris@glezos.com>\n" "Language-Team: el <fedora-trans-el@redhat.com>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Είστε σίγουροι;" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -135,54 +140,54 @@ msgstr "εγγραφές καταγραφής" msgid "None" msgstr "ένα" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Έγινε επεξεργασία του %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "και" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Προσθήκη %(name)s" -#: options.py:617 +#: options.py:629 #, fuzzy, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "όνομα" -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "όνομα" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Κανένα πεδίο δεν άλλαξε." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Το %(name)s \"%(obj)s\" αποθηκεύτηκε με επιτυχία." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Μπορείτε να το επεξεργαστείτε ξανά παρακάτω." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Μπορείτε να προσθέσετε ακόμα ένα %s παρακάτω." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Το %(name)s \"%(obj)s\" αλλάχτηκε με επιτυχία." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -190,61 +195,61 @@ msgstr "" "Το %(name)s \"%(obj)s\" αποθηκεύτηκε με επιτυχία. Μπορείτε να το " "επεξεργαστείτε πάλι παρακάτω." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "ώρα ενέργειας" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Προσθήκη %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Αλλαγή του %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Σφάλμα βάσης δεδομένων" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "Το %(name)s \"%(obj)s\" αλλάχτηκε με επιτυχία." msgstr[1] "Το %(name)s \"%(obj)s\" αλλάχτηκε με επιτυχία." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Το %(name)s \"%(obj)s\" διαγράφηκε με επιτυχία." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Ιστορικό αλλαγών: %s" @@ -424,7 +429,7 @@ msgstr "Φίλτρο" msgid "Delete" msgstr "Διαγραφή" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, fuzzy, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -432,15 +437,22 @@ msgid "" "following types of objects:" msgstr "Διαγραφή αντικείμενο μέσα λογαριασμός t δικαίωμα διαγραφή από:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "Διαγραφή αντικείμενο μέσα λογαριασμός t δικαίωμα διαγραφή από:" + +#: templates/admin/delete_confirmation.html:33 #, fuzzy, 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 "υποφαινόμενο υποφαινόμενο διαγραφή αντικείμενο Όλα από διαγράφηκε:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ναι, είμαι βέβαιος" @@ -448,19 +460,26 @@ msgstr "Ναι, είμαι βέβαιος" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "Διαγραφή αντικείμενο μέσα λογαριασμός t δικαίωμα διαγραφή από:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "Διαγραφή αντικείμενο μέσα λογαριασμός t δικαίωμα διαγραφή από:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "υποφαινόμενο υποφαινόμενο διαγραφή αντικείμενο Όλα από διαγράφηκε:" #: templates/admin/filter.html:2 @@ -787,12 +806,12 @@ msgstr "Επαναφορά του συνθηματικού μου" msgid "All dates" msgstr "Όλες οι ημερομηνίες" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Επιλέξτε %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Επιλέξτε %s προς αλλαγή" diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.mo b/django/contrib/admin/locale/en/LC_MESSAGES/django.mo Binary files differindex 9c102455e5..f2f6aa8106 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po index b363215b4b..5c072d58df 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English <en@li.org>\n" @@ -17,11 +17,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -120,113 +125,113 @@ msgstr "" msgid "None" msgstr "" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "" @@ -400,7 +405,7 @@ msgstr "" msgid "Delete" msgstr "" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -408,15 +413,22 @@ msgid "" "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: templates/admin/delete_confirmation.html:33 #, 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 "" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "" @@ -424,19 +436,26 @@ msgstr "" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:24 #, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" #: templates/admin/filter.html:2 @@ -733,12 +752,12 @@ msgstr "" msgid "All dates" msgstr "" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "" diff --git a/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo b/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo Binary files differindex 8326045da6..ee55dc2457 100644 --- a/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po b/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po index 9869c53025..614a233080 100644 --- a/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-03-25 08:00+1000\n" "Last-Translator: Simon Meers <DrMeers@gmail.com>\n" "Language-Team: \n" @@ -17,11 +17,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -120,113 +125,113 @@ msgstr "" msgid "None" msgstr "" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "" @@ -400,7 +405,7 @@ msgstr "" msgid "Delete" msgstr "" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -408,15 +413,22 @@ msgid "" "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: templates/admin/delete_confirmation.html:33 #, 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 "" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "" @@ -424,19 +436,26 @@ msgstr "" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:24 #, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" #: templates/admin/filter.html:2 @@ -733,12 +752,12 @@ msgstr "" msgid "All dates" msgstr "" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "" diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es/LC_MESSAGES/django.mo Binary files differindex 3342fee3d3..7833b3e264 100644 --- a/django/contrib/admin/locale/es/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/es/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/es/LC_MESSAGES/django.po b/django/contrib/admin/locale/es/LC_MESSAGES/django.po index 1d6ed90119..7df20c520a 100644 --- a/django/contrib/admin/locale/es/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/es/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2009-11-30 11:31+0100\n" "Last-Translator: Django Spanish Team, <django-cat@googlegroups.com>\n" "Language-Team: Django Spanish Team, <django-cat@googlegroups.com>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Eliminado/s %(count)d %(items)s satisfactoriamente." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "¿Está seguro?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Eliminar %(verbose_name_plural)s seleccionado/s" @@ -128,61 +133,61 @@ msgstr "entradas de registro" msgid "None" msgstr "Ninguno" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Modificado/a %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "y" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Añadido/a \"%(object)s\" %(name)s." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificados %(list)s para \"%(object)s\" %(name)s." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Eliminado/a \"%(object)s\" %(name)s." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "No ha cambiado ningún campo." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Puede editarlo de nuevo abajo." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Puede añadir otro %s abajo." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Se modificó con éxito el %(name)s \"%(obj)s\"." -#: options.py:741 +#: options.py:753 #, 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." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -190,54 +195,54 @@ msgstr "" "Se deben seleccionar elementos para poder realizar acciones sobre estos. No " "se han modificado elementos." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "No se seleccionó ninguna acción." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Añadir %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Error en la base de datos" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionado" msgstr[1] "Todos %(total_count)s seleccionados" -#: options.py:1127 +#: options.py:1139 #, fuzzy, python-format msgid "0 of %(cnt)s selected" msgstr "de %(count)d seleccionado" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Histórico de modificaciones: %s" @@ -414,7 +419,7 @@ msgstr "Filtro" msgid "Delete" msgstr "Eliminar" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -425,7 +430,17 @@ msgstr "" "de objetos relacionados, pero su cuenta no tiene permiso para borrar los " "siguientes tipos de objetos:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Eliminar el %(object_name)s '%(escaped_object)s' provocaría la eliminación " +"de objetos relacionados, pero su cuenta no tiene permiso para borrar los " +"siguientes tipos de objetos:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -434,8 +449,8 @@ msgstr "" "¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_object)s" "\"? Se borrarán los siguientes objetos relacionados:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Sí, estoy seguro" @@ -443,22 +458,32 @@ msgstr "Sí, estoy seguro" msgid "Delete multiple objects" msgstr "Eliminar múltiples objetos." -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but 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:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related 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:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "¿Está seguro de que quiere eliminar los %(object_name)s seleccionados? Los " "siguientes objetos y sus elementos relacionados serán eliminados:" @@ -783,12 +808,12 @@ msgstr "Restablecer mi contraseña" msgid "All dates" msgstr "Todas las fechas" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Escoja %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Escoja %s a modificar" diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo Binary files differindex 88099c4ba1..fb39be229b 100644 --- a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po index fc48c9a8a2..14a70f4225 100644 --- a/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-08-11 09:00-0300\n" "Last-Translator: Ramiro <rm0@gmx.net>\n" "Language-Team: Django-I18N <django-i18n@googlegroups.com>\n" @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Se eliminaron con éxito %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "¿Está seguro?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Eliminar %(verbose_name_plural)s seleccionados/as" @@ -131,54 +136,54 @@ msgstr "entradas de registro" msgid "None" msgstr "Ninguno" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Modifica %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "y" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Se agregó %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Se modificaron %(list)s en %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Se eliminó %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "No ha modificado ningún campo." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Se agregó con éxito %(name)s \"%(obj)s\"." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Puede modificarlo/a nuevamente abajo." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Puede agregar otro/a %s abajo." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Se modificó con éxito %(name)s \"%(obj)s\"." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -186,7 +191,7 @@ msgstr "" "Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente " "abajo." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -194,54 +199,54 @@ msgstr "" "Deben existir items seleccionados para poder realizar acciones sobre los " "mismos. No se modificó ningún item." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "No se ha seleccionado ninguna acción." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Agregar %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Error de base de datos" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionados/as" msgstr[1] "Todos/as (%(total_count)s en total) han sido seleccionados/as" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s seleccionados/as" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Historia de modificaciones: %s" @@ -418,7 +423,7 @@ msgstr "Filtrar" msgid "Delete" msgstr "Eliminar" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -429,7 +434,17 @@ msgstr "" "de objetos relacionados, pero su cuenta no tiene permiso para eliminar los " "siguientes tipos de objetos:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Eliminar el %(object_name)s '%(escaped_object)s' provocaría la eliminación " +"de objetos relacionados, pero su cuenta no tiene permiso para eliminar los " +"siguientes tipos de objetos:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -438,8 +453,8 @@ msgstr "" "¿Está seguro de que quiere eliminar los %(object_name)s \"%(escaped_object)s" "\"? Se eliminarán los siguientes objetos relacionados:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Sí, estoy seguro" @@ -447,22 +462,32 @@ msgstr "Sí, estoy seguro" msgid "Delete multiple objects" msgstr "Eliminar múltiples objetos" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "El eliminar %(object_name)s provocaría la eliminación de objetos " "relacionados, pero su cuenta no tiene permiso para eliminar los siguientes " "tipos de objetos:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"El eliminar %(object_name)s provocaría la eliminación de objetos " +"relacionados, pero su cuenta no tiene permiso para eliminar los siguientes " +"tipos de objetos:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "¿Está seguro de que quiere eliminar los objetos %(object_name)s " "seleccionados? Se eliminarán todos los siguientes objetos y sus items " @@ -787,12 +812,12 @@ msgstr "Recuperar mi contraseña" msgid "All dates" msgstr "Todas las fechas" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Seleccione %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Seleccione %s a modificar" diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/django.mo b/django/contrib/admin/locale/et/LC_MESSAGES/django.mo Binary files differindex c7a0f22825..68c5adffed 100644 --- a/django/contrib/admin/locale/et/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/et/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/et/LC_MESSAGES/django.po b/django/contrib/admin/locale/et/LC_MESSAGES/django.po index 9d9fefaf0c..cacf608a14 100644 --- a/django/contrib/admin/locale/et/LC_MESSAGES/django.po +++ b/django/contrib/admin/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: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2008-09-03 00:35+0200\n" "Last-Translator: Erik Allik <removethis-eallik_at_gmail-com>\n" "Language-Team: Django-i18n <django-i18n@googlegroups.com>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s kustutamine õnnestus" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Kas olete kindel?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Kustuta valitud %(verbose_name_plural)s" @@ -126,114 +131,114 @@ msgstr "logisissekanded" msgid "None" msgstr "Puudub" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Muutsin %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ja" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Lisatud %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Muudetud %(list)s objektil %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Kustutatud %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Ühtegi välja ei muudetud." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" lisamine õnnestus." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Võite jätkata redigeerimist." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Võite jätkata uue %s lisamisega." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" muutmine õnnestus." -#: options.py:741 +#: options.py:753 #, 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." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "toimingu aeg" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Lisa %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s primaarvõtmega %(key)r ei eksisteeri." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Muuda %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Andmebaasi viga" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" kustutati." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Muudatuste ajalugu: %s" @@ -410,7 +415,7 @@ msgstr "Filtreeri" msgid "Delete" msgstr "Kustuta" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -421,7 +426,17 @@ msgstr "" "kustutada lisaks ka kõik seotud objecktid, aga teil puudub õigus järgnevat " "tüüpi objektide kustutamiseks:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Selleks, et kustutada %(object_name)s '%(escaped_object)s', on vaja " +"kustutada lisaks ka kõik seotud objecktid, aga teil puudub õigus järgnevat " +"tüüpi objektide kustutamiseks:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -431,8 +446,8 @@ msgstr "" "(escaped_object)s\"? Kõik järgnevad seotud objektid kustutatakse koos " "sellega:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Jah, olen kindel" @@ -440,21 +455,30 @@ msgstr "Jah, olen kindel" msgid "Delete multiple objects" msgstr "Kustuta mitu objekti" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 kustutamiseks on vaja kustutada ka seotud objektid, aga teil " +"puudub õigus järgnevat tüüpi objektide kustutamiseks:" + +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "%(object_name)s kustutamiseks on vaja kustutada ka seotud objektid, aga teil " "puudub õigus järgnevat tüüpi objektide kustutamiseks:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Kas olete kindel, et soovite kustutada valitud %(object_name)s objektid? " "Kõik järgnevad objektid ja seotud objektid kustutatakse:" @@ -773,12 +797,12 @@ msgstr "Reseti parool" msgid "All dates" msgstr "Kõik kuupäevad" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Vali %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Vali %s mida muuta" diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo b/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo Binary files differindex c7ae77b044..182b0a49db 100644 --- a/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/eu/LC_MESSAGES/django.po b/django/contrib/admin/locale/eu/LC_MESSAGES/django.po index e09f3e4aa4..679dd6d4c0 100644 --- a/django/contrib/admin/locale/eu/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/eu/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-07-08 12:55+0200\n" "Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n" "Language-Team: Django-i18n <django-i18n@googlegroups.com>\n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Ziur al zaude?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -132,114 +137,114 @@ msgstr "log sarrerak" msgid "None" msgstr "bat" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s aldatuta." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "eta" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Gehitu %(name)s" -#: options.py:617 +#: options.py:629 #, fuzzy, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "erlazionatutako `%(label)s.%(name)s` objetua" -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "erlazionatutako `%(label)s.%(name)s` objetua" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Ez da eremurik aldatu." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" ondo gehitu da." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Berriro alkatu zenezake beherago." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Beste %s gehitu dezakezu jarraian." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ondo aldatu da." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" ondo gehitu da. Jarraian aldatu dezakezu berriro." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "Ekintza hordua" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s gehitu" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s aldatu" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Data base errorea" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" ondo aldatu da." msgstr[1] "%(name)s \"%(obj)s\" ondo aldatu da." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ondo ezabatu da." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Aldaketa zerrenda: %s" @@ -418,7 +423,7 @@ msgstr "Filtroa" msgid "Delete" msgstr "Ezabatu" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -428,7 +433,16 @@ msgstr "" "%(object_name)s ezabatzean bere '%(escaped_object)s' ere ezabatzen dira, " "baina zure kontuak ez dauka baimenik objetu mota hauek ezabatzeko:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"%(object_name)s ezabatzean bere '%(escaped_object)s' ere ezabatzen dira, " +"baina zure kontuak ez dauka baimenik objetu mota hauek ezabatzeko:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -437,8 +451,8 @@ msgstr "" "Ziur zaude %(object_name)s \"%(escaped_object)s\" ezabatu nahi dituzula? " "Erlazionaturik dauden hurrengo elementuak ere ezabatuko dira:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Bai, ziur nago" @@ -446,21 +460,30 @@ msgstr "Bai, ziur nago" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 ezabatzean bere '%(escaped_object)s' ere ezabatzen dira, " +"baina zure kontuak ez dauka baimenik objetu mota hauek ezabatzeko:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "%(object_name)s ezabatzean bere '%(escaped_object)s' ere ezabatzen dira, " "baina zure kontuak ez dauka baimenik objetu mota hauek ezabatzeko:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Ziur zaude %(object_name)s \"%(escaped_object)s\" ezabatu nahi dituzula? " "Erlazionaturik dauden hurrengo elementuak ere ezabatuko dira:" @@ -786,12 +809,12 @@ msgstr "Pasahitza berrezarri" msgid "All dates" msgstr "Data guztiak" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s aukeratu" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Aldaketarako %s aukeratu" diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo Binary files differindex 1c640e0757..21676bc2d8 100644 --- a/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/fa/LC_MESSAGES/django.po b/django/contrib/admin/locale/fa/LC_MESSAGES/django.po index 29b2a24763..5ef3da5b0e 100644 --- a/django/contrib/admin/locale/fa/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/fa/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2008-09-01 02:00+0430\n" "Last-Translator: Reza Mohammadi <reza@zeerak.ir>\n" "Language-Team: Persian <farsi@lists.sharif.edu>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "آیا مطمئن هستید؟" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -133,113 +138,113 @@ msgstr "موارد اتفاقات" msgid "None" msgstr "هیچ" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s تغییر یافته." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "و" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s «%(object)s» اضافه شد." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s %(name)s «%(object)s» تغییر یافت." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s «%(object)s» حذف شد." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "فیلدی تغییر نیافته است." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s «%(obj)s» با موفقیت اضافه شد." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "میتوانید مجدداً آنرا در این پایین ویراش کنید." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "میتوانید یک %s دیگر در این پایین اضافه کنید" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s·\"%(obj)s\" با موفقیت تغییر یافت." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s·\"%(obj)s\" با موفقیت اضافه شد. میتوانید در این پایین ویرایشش کنید." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "زمان اتفاق" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "اضافه کردن %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "تغییر %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "خطا در بانک اطلاعاتی" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s·\"%(obj)s\" با موفقیت تغییر یافت." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s·\"%(obj)s\" با موفقیت حذف شد." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "تاریخچهٔ تغییر: %s" @@ -414,7 +419,7 @@ msgstr "فیلتر" msgid "Delete" msgstr "حذف" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -424,7 +429,16 @@ msgstr "" "حذف %(object_name)s·'%(escaped_object)s' می تواند باعث حذف اشیاء مرتبط شود. " "اما حساب شما دسترسی لازم برای حذف اشیای از انواع زیر را ندارد:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"حذف %(object_name)s·'%(escaped_object)s' می تواند باعث حذف اشیاء مرتبط شود. " +"اما حساب شما دسترسی لازم برای حذف اشیای از انواع زیر را ندارد:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -433,8 +447,8 @@ msgstr "" "آیا مطمئنید که میخواهید %(object_name)s·\"%(escaped_object)s\" را حذف کنید؟ " "کلیهٔ اشیای مرتبط زیر حذف خواهند شد:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "بله، مطمئن هستم." @@ -443,21 +457,30 @@ msgstr "بله، مطمئن هستم." msgid "Delete multiple objects" msgstr "%(name)s «%(object)s» حذف شد." -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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·'%(escaped_object)s' می تواند باعث حذف اشیاء مرتبط شود. " +"اما حساب شما دسترسی لازم برای حذف اشیای از انواع زیر را ندارد:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "حذف %(object_name)s·'%(escaped_object)s' می تواند باعث حذف اشیاء مرتبط شود. " "اما حساب شما دسترسی لازم برای حذف اشیای از انواع زیر را ندارد:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "آیا مطمئنید که میخواهید %(object_name)s·\"%(escaped_object)s\" را حذف کنید؟ " "کلیهٔ اشیای مرتبط زیر حذف خواهند شد:" @@ -778,12 +801,12 @@ msgstr "ایجاد گذرواژهٔ جدید" msgid "All dates" msgstr "همهٔ تاریخها" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s انتخاب کنید" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "%s را برای تغییر انتخاب کنید" diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo Binary files differindex 9c11386e86..3668da02c1 100644 --- a/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/fi/LC_MESSAGES/django.po b/django/contrib/admin/locale/fi/LC_MESSAGES/django.po index f4d950604b..ae0583aad4 100644 --- a/django/contrib/admin/locale/fi/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/fi/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2007-09-15 00:34+0300\n" "Last-Translator: Aku Kotkavuo <aku.kotkavuo@norfello.com>\n" "Language-Team: Django I18N <Django-I18N@googlegroups.com>\n" @@ -23,11 +23,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Onnistuneesti poistettu %(count)d \"%(items)s\"-kohdetta." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Oletko varma?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Poista valitut \"%(verbose_name_plural)s\"-kohteet" @@ -130,60 +135,60 @@ msgstr "lokimerkinnät" msgid "None" msgstr "Ei arvoa" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Muokattu: %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ja" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Lisätty %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Muutettu %(list)s kohteelle %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Poistettu %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Ei muutoksia kenttiin." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" on lisätty." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Voit muokata sitä edelleen alla." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Uusi %s on lisättävissä alla." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" on muutettu." -#: options.py:741 +#: options.py:753 #, 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." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -191,54 +196,54 @@ msgstr "" "Kohteiden täytyy olla valittuna, jotta niihin voi kohdistaa toimintoja. " "Kohteita ei ole muutettu." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Ei toimintoa valittuna." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Lisää %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s perusavaimella %(key)r ei ole olemassa." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Muokkaa %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Tietokantavirhe" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valittu" msgstr[1] "Kaikki %(total_count)s valittu" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 valittuna %(cnt)s mahdollisesta" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" on poistettu." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Muokkaushistoria: %s" @@ -414,7 +419,7 @@ msgstr "Suodatin" msgid "Delete" msgstr "Poista" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -425,7 +430,17 @@ msgstr "" "liittyviä kohteita, mutta sinulla ei ole oikeutta näiden kohteiden " "poistamiseen:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Kohteen '%(escaped_object)s' (%(object_name)s) poisto poistaisi myös siihen " +"liittyviä kohteita, mutta sinulla ei ole oikeutta näiden kohteiden " +"poistamiseen:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -434,8 +449,8 @@ msgstr "" "Haluatko varmasti poistaa kohteen \"%(escaped_object)s\" (%(object_name)s)? " "Myös seuraavat kohteet poistettaisiin samalla:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Kyllä, olen varma" @@ -443,21 +458,30 @@ msgstr "Kyllä, olen varma" msgid "Delete multiple objects" msgstr "Poista useita kohteita" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Kohteen (%(object_name)s) poisto poistaisi myös siihen liittyviä kohteita, " +"mutta sinulla ei ole oikeutta näiden kohteiden poistamiseen:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Haluatko varmasti poistaa valitut (%(object_name)s) kohteet? Myös seuraavat " "kohteet ja niihin liittyvät kohteet poistettaisiin samalla:" @@ -773,12 +797,12 @@ msgstr "Nollaa salasanani" msgid "All dates" msgstr "Kaikki päivät" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Valitse %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Valitse muokattava %s" diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo Binary files differindex 940820fd1b..83ef6316e7 100644 --- a/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/fr/LC_MESSAGES/django.po b/django/contrib/admin/locale/fr/LC_MESSAGES/django.po index 56ec9022d8..e81883b366 100644 --- a/django/contrib/admin/locale/fr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/fr/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-08-09 14:38+0200\n" "Last-Translator: Stéphane Raimbault <stephane.raimbault@gmail.com>\n" "Language-Team: French <http://django-fr.org>\n" @@ -24,11 +24,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s supprimés avec succès." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Êtes-vous sûr ?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Supprimer les %(verbose_name_plural)s sélectionnés" @@ -134,54 +139,54 @@ msgstr "entrées d'historique" msgid "None" msgstr "Aucun(e)" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Modifié %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "et" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s « %(object)s » ajouté." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s modifié pour %(name)s « %(object)s »." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s « %(object)s » supprimé." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Aucun champ modifié." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "L'objet %(name)s « %(obj)s » a été ajouté avec succès." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Vous pouvez continuer l'édition ci-dessous." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Vous pouvez ajouter un autre %s ci-dessous." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "L'objet %(name)s « %(obj)s » a été modifié avec succès." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -189,7 +194,7 @@ msgstr "" "L'objet %(name)s « %(obj)s » a été ajouté avec succès. Vous pouvez continuer " "l'édition ci-dessous." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -197,56 +202,56 @@ msgstr "" "Des éléments doivent être sélectionnés afin d'appliquer les actions. Aucun " "élément n'a été modifié." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Aucune action sélectionnée." # Titre -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Ajout %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "L'objet %(name)s avec la clef primaire %(key)r n'existe pas." # Titre -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Modification de %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Erreur de base de données" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s objet %(name)s a été modifié avec succès." msgstr[1] "%(count)s objets %(name)s ont été modifiés avec succès." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s sélectionné" msgstr[1] "Tous les %(total_count)s sélectionnés" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 sur %(cnt)s sélectionné" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "L'objet %(name)s « %(obj)s » a été supprimé avec succès." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Historique des changements : %s" @@ -423,7 +428,7 @@ msgstr "Filtre" msgid "Delete" msgstr "Supprimer" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -434,7 +439,17 @@ msgstr "" "suppression des objets qui lui sont liés, mais votre compte ne possède pas " "la permission de supprimer les types d'objets suivants :" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Supprimer l'objet %(object_name)s « %(escaped_object)s » provoquerait la " +"suppression des objets qui lui sont liés, mais votre compte ne possède pas " +"la permission de supprimer les types d'objets suivants :" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -443,8 +458,8 @@ msgstr "" "Voulez-vous vraiment supprimer l'objet %(object_name)s « %(escaped_object)" "s » ? Les éléments suivants sont liés à celui-ci et seront aussi supprimés :" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Oui, je suis sûr" @@ -452,22 +467,32 @@ msgstr "Oui, je suis sûr" msgid "Delete multiple objects" msgstr "Supprimer plusieurs objets" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Supprimer l'objet %(object_name)s provoquerait la suppression des objets qui " "lui sont liés, mais votre compte ne possède pas la permission de supprimer " "les types d'objets suivants :" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Supprimer l'objet %(object_name)s provoquerait la suppression des objets qui " +"lui sont liés, mais votre compte ne possède pas la permission de supprimer " +"les types d'objets suivants :" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Voulez-vous vraiment supprimer les objets %(object_name)s sélectionnés ? " "Tous les objets suivants et leurs éléments liés seront aussi supprimés :" @@ -791,12 +816,12 @@ msgstr "Réinitialiser mon mot de passe" msgid "All dates" msgstr "Toutes les dates" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Sélectionnez %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Sélectionnez l'objet %s à changer" diff --git a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo b/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo Binary files differindex 471a6a6126..9ee1be0bce 100644 --- a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po b/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po index d81c018ecd..be1fcd8348 100644 --- a/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-01-27 22:36-0700\n" "Last-Translator: Wim Benes <fryskefirefox@gmail.com>\n" "Language-Team: FRISIAN <LL@li.org>\n" @@ -18,11 +18,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -121,113 +126,113 @@ msgstr "" msgid "None" msgstr "" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "" @@ -401,7 +406,7 @@ msgstr "" msgid "Delete" msgstr "" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -409,15 +414,22 @@ msgid "" "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: templates/admin/delete_confirmation.html:33 #, 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 "" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "" @@ -425,19 +437,26 @@ msgstr "" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:24 #, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" #: templates/admin/filter.html:2 @@ -734,12 +753,12 @@ msgstr "" msgid "All dates" msgstr "" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "" diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo Binary files differindex 16d370f587..51e9c64055 100644 --- a/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ga/LC_MESSAGES/django.po b/django/contrib/admin/locale/ga/LC_MESSAGES/django.po index e47d9d42a9..4a4076b795 100644 --- a/django/contrib/admin/locale/ga/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ga/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-07 17:33+0100\n" "Last-Translator: Michael Thornhill <michael@maithu.com>\n" "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "D'éirigh le scriosadh %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "An bhfuil tú cinnte?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Scrios %(verbose_name_plural) roghnaithe" @@ -126,54 +131,54 @@ msgstr "loga iontrálacha" msgid "None" msgstr "Dada" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Athraithe %s" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "agus" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Suimithe %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Athraithe %(list)s le %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Scriosaithe %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Dada réimse aithraithe" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Bhí %(name)s \"%(obj)s\" breisithe go rathúil" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Is féidir leat é a cuir in eagar thíos." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Is féidir le ceann eile %s a cuir le thíos." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Bhí an %(name)s \"%(obj)s\" aithraithe to rathúil" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -181,7 +186,7 @@ msgstr "" "Chuir an %(name)s·\"%(obj)s\"·go rathúil.·Is féidir leat é a cuir in eagar " "thíos." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -189,30 +194,30 @@ msgstr "" "Ní mór Míreanna a roghnú chun caingne a dhéanamh orthu. Níl aon mhíreanna a " "athrú." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Uimh gníomh roghnaithe." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Cuir %s le" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Níl réad le hainm %(name)s agus eochair %(key)r ann." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Aithrigh %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Botún bunachar sonraí" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -222,7 +227,7 @@ msgstr[2] "Bhí %(count)s %(name)s aithraithe to rathúil" msgstr[3] "Bhí %(count)s %(name)s aithraithe to rathúil" msgstr[4] "Bhí %(count)s %(name)s aithraithe to rathúil" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -232,17 +237,17 @@ msgstr[2] "Gach %(total_count)s roghnaithe" msgstr[3] "Gach %(total_count)s roghnaithe" msgstr[4] "Gach %(total_count)s roghnaithe" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 as %(cnt)s roghnaithe." -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Bhí %(name)s \"%(obj)s\" scrioste go rathúil." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Athraigh stáir %s" @@ -422,7 +427,7 @@ msgstr "Scagaire" msgid "Delete" msgstr "Cealaigh" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -432,7 +437,16 @@ msgstr "" "Má scriossan tú %(object_name)s '%(escaped_object)s' scriosfaidh oibiachtí " "gaolta. Ach níl cead ag do cuntas na oibiacht a leanúint a scriosadh:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Má scriossan tú %(object_name)s '%(escaped_object)s' scriosfaidh oibiachtí " +"gaolta. Ach níl cead ag do cuntas na oibiacht a leanúint a scriosadh:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -441,8 +455,8 @@ msgstr "" "An bhfuil tú cinnte na %(object_name)s \"%(escaped_object)s\" a scroiseadh?" "Beidh gach oibiacht a leanúint scroiste freisin:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Táim cinnte" @@ -450,21 +464,30 @@ msgstr "Táim cinnte" msgid "Delete multiple objects" msgstr "Scrios na réadanna" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Má scriossan tú %(object_name)s scriosfaidh oibiachtí gaolta. Ach níl cead " "ag do cuntas na oibiacht a leanúint a scriosadh:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Má scriossan tú %(object_name)s scriosfaidh oibiachtí gaolta. Ach níl cead " +"ag do cuntas na oibiacht a leanúint a scriosadh:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "An bhfuil tú cinnte na %(object_name)s a scroiseadh? Beidh gach oibiacht a " "leanúint agus na oibiachta gaolta scroiste freisin:" @@ -790,12 +813,12 @@ msgstr "Athsocraigh mo focal faire" msgid "All dates" msgstr "Gach dáta" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Roghnaigh %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Roghnaigh %s a athrú" diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo Binary files differindex dcb5fb8f8f..94f28b1d7a 100644 --- a/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/gl/LC_MESSAGES/django.po b/django/contrib/admin/locale/gl/LC_MESSAGES/django.po index 9023a1c1b6..18e21cd601 100644 --- a/django/contrib/admin/locale/gl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/gl/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2007-05-28 17:29+0200\n" "Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n" "Language-Team: Galego\n" @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Está seguro?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -136,114 +141,114 @@ msgstr "entradas de rexistro" msgid "None" msgstr "un" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Modificado(s) %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "e" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Engadir %(name)s" -#: options.py:617 +#: options.py:629 #, fuzzy, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "obxectos `%(label)s.%(name)s` relacionados" -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "obxectos `%(label)s.%(name)s` relacionados" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Non se modificou ningún campo." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Engadiuse correctamente o/a %(name)s \"%(obj)s\"." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Pode editalo embaixo." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Pode engadir outro/a %s embaixo." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Modificouse correctamente o/a %(name)s \"%(obj)s\"." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "Engadiuse correctamente o/a %(name)s \"%(obj)s\" Pode editalo embaixo." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "hora da acción" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Engadir %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Erro da base de datos" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "Modificouse correctamente o/a %(name)s \"%(obj)s\"." msgstr[1] "Modificouse correctamente o/a %(name)s \"%(obj)s\"." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Eliminouse correctamente o/a %(name)s \"%(obj)s\"." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Histórico de cambios: %s" @@ -422,7 +427,7 @@ msgstr "Filtro" msgid "Delete" msgstr "Eliminar" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -433,7 +438,17 @@ msgstr "" "elementos relacionados, pero a súa conta non ten permiso para borrar os " "seguintes tipos de elementos:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Borrar o %(object_name)s '%(escaped_object)s' resultaría na eliminación de " +"elementos relacionados, pero a súa conta non ten permiso para borrar os " +"seguintes tipos de elementos:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -442,8 +457,8 @@ msgstr "" "Seguro que quere borrar o %(object_name)s \"%(escaped_object)s\"? " "Eliminaranse os seguintes obxectos relacionados:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Si, estou seguro" @@ -451,22 +466,32 @@ msgstr "Si, estou seguro" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Borrar o %(object_name)s '%(escaped_object)s' resultaría na eliminación de " +"elementos relacionados, pero a súa conta non ten permiso para borrar os " +"seguintes tipos de elementos:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "Borrar o %(object_name)s '%(escaped_object)s' resultaría na eliminación de " "elementos relacionados, pero a súa conta non ten permiso para borrar os " "seguintes tipos de elementos:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Seguro que quere borrar o %(object_name)s \"%(escaped_object)s\"? " "Eliminaranse os seguintes obxectos relacionados:" @@ -794,12 +819,12 @@ msgstr "Recuperar o meu contrasinal" msgid "All dates" msgstr "Todas as datas" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Seleccione un/ha %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Seleccione %s que modificar" diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/django.mo b/django/contrib/admin/locale/he/LC_MESSAGES/django.mo Binary files differindex 821c0c56f5..b03c39fc69 100644 --- a/django/contrib/admin/locale/he/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/he/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/he/LC_MESSAGES/django.po b/django/contrib/admin/locale/he/LC_MESSAGES/django.po index 40f2323cbf..e5af919be7 100644 --- a/django/contrib/admin/locale/he/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/he/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-09 15:10-0500\n" "Last-Translator: Alex <alex.gaynor@gmail.com>\n" "Language-Team: Django-i18n <django-i18n@googlegroups.com>\n" @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s נמחקו בהצלחה." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "האם את/ה בטוח/ה ?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "מחק %(verbose_name_plural)s שנבחרו" @@ -128,113 +133,113 @@ msgstr "רישומי יומן" msgid "None" msgstr "ללא" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s שונה." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ו" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "התווסף %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "שונה %(list)s עבור %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "נמחק %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "אף שדה לא השתנה." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "ניתן לערוך שוב מתחת" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "ניתן להוסיף %s נוסף מתחת." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "שינוי %(name)s \"%(obj)s\" בוצע בהצלחה." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן לערוך אותו שוב מתחת." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "יש לסמן פריטים כדי לבצע עליהם פעולות. לא שונו פריטים." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "לא נבחרה פעולה." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "הוספת %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "הפריט %(name)s עם המפתח הראשי %(key)r אינו קיים." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "שינוי %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "שגיאת בסיס נתונים" -#: options.py:1095 +#: options.py:1107 #, 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 בהצלחה." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s נבחר" msgstr[1] "כל ה־%(total_count)s נבחרו" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 מ %(cnt)s נבחרות" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "היסטוריית שינוי: %s" @@ -409,7 +414,7 @@ msgstr "סינון" msgid "Delete" msgstr "מחיקה" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -419,7 +424,16 @@ msgstr "" "מחיקת %(object_name)s '%(escaped_object)s' מצריכה מחיקת אובייקטים מקושרים, " "אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"מחיקת %(object_name)s '%(escaped_object)s' מצריכה מחיקת אובייקטים מקושרים, " +"אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -428,8 +442,8 @@ msgstr "" "האם ברצונך למחוק את %(object_name)s \"%(escaped_object)s\"? כל הפריטים " "הקשורים הבאים יימחקו:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "כן, אני בטוח/ה" @@ -437,21 +451,30 @@ msgstr "כן, אני בטוח/ה" msgid "Delete multiple objects" msgstr "מחק כמה פריטים" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 מצריכה מחיקת אובייקטים מקושרים, אך לחשבון שלך אין " "הרשאות למחיקת סוגי האובייקטים הבאים:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"מחיקת %(object_name)s מצריכה מחיקת אובייקטים מקושרים, אך לחשבון שלך אין " +"הרשאות למחיקת סוגי האובייקטים הבאים:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "האם אתה בטוח שאתה רוצה למחוק את פריטי ה %(object_name)s שנבחרו. כל הפריטים " "הבאים והחומר הנלווה אליהם יימחקו." @@ -763,12 +786,12 @@ msgstr "אפס את סיסמתי" msgid "All dates" msgstr "כל התאריכים" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "בחירת %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "בחירת %s לשינוי" diff --git a/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo Binary files differindex 702f1ab257..a44e1413be 100644 --- a/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/hi/LC_MESSAGES/django.po b/django/contrib/admin/locale/hi/LC_MESSAGES/django.po index b2e4f117a5..53e0f8c679 100644 --- a/django/contrib/admin/locale/hi/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/hi/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django SVN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2008-11-12 08:14+0530\n" "Last-Translator: Thejaswi Puthraya <thejaswi.puthraya@gmail.com>\n" "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n" @@ -23,11 +23,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "क्या आप निश्चित हैं?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -129,115 +134,115 @@ msgstr "लॉग प्रविष्टियाँ" msgid "None" msgstr "कोई नहीं" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s को बदला गया हैं" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "और" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" को जोडा गया हैं" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" की %(list)s बदला गया है" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" निकाला गया है" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "कोई क्षेत्र नहीं बदला" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" को कामयाबी से जोडा गया है" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "आप इसे फिर से संपादित कर सकते हैं" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "आप नीचे एक और %s जोड सकते हैं" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" को कामयाबी से बदला गया हैं" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" कामयाबी से जोडा गया हैं । आप इसे फिर से संपादित कर सकते हैं" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "कार्य समय" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s बढाएं" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s बदलो" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "डेटाबेस त्रुटि" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" को कामयाबी से बदला गया हैं" msgstr[1] "%(name)s \"%(obj)s\" को कामयाबी से बदला गया हैं" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" को कामयाबी से निकाला गया है" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "चरित्र बदलो: %s" @@ -411,7 +416,7 @@ msgstr "छन्नी" msgid "Delete" msgstr "मिटाएँ" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -419,15 +424,22 @@ msgid "" "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: templates/admin/delete_confirmation.html:33 #, 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 "" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "हाँ, मैं निश्चित हूँ" @@ -436,19 +448,26 @@ msgstr "हाँ, मैं निश्चित हूँ" msgid "Delete multiple objects" msgstr "%(name)s \"%(object)s\" निकाला गया है" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:24 #, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" #: templates/admin/filter.html:2 @@ -758,12 +777,12 @@ msgstr "शब्दकूट पुनस्थाप" msgid "All dates" msgstr "सभी तारीख" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s चुनें" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "%s के बदली के लिए चयन करें" diff --git a/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo Binary files differindex e42c285490..41eb46a921 100644 --- a/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/hr/LC_MESSAGES/django.po b/django/contrib/admin/locale/hr/LC_MESSAGES/django.po index 916e2eafd8..f54c6c66ea 100644 --- a/django/contrib/admin/locale/hr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/hr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-10 18:56+0200\n" "Last-Translator: Aljosa Mohorovic <aljosa.mohorovic@gmail.com>\n" "Language-Team: Django i18n team <django-i18n@googlegroups.com>\n" @@ -18,11 +18,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Uspješno izbrisano %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Jeste li sigurni?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Izbrišite odabrane %(verbose_name_plural)s" @@ -125,60 +130,60 @@ msgstr "zapisi" msgid "None" msgstr "Nijedan" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Promijenjeno %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "i" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Dodano %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Promijeni %(list)s za %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Izbrisani %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Nije bilo promjena polja." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" uspješno je dodano." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Možete ponovo urediti unos dolje." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Možete dodati još jedan %s ispod." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" uspješno promijenjeno." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" uspješno dodan. Možete ponovo urediti unos dolje." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -186,30 +191,30 @@ msgstr "" "Unosi moraju biti odabrani da bi se nad njima mogle izvršiti akcije. Nijedan " "unos nije promijenjen." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nije odabrana akcija." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Novi unos (%s)" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Unos %(name)s sa primarnim ključem %(key)r ne postoji." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Promijeni %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Pogreška u bazi" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -218,7 +223,7 @@ msgstr[1] "%(count)s %(name)s uspješno promijenjeno." msgstr[2] "%(count)s %(name)s uspješno promijenjeno." msgstr[3] "%(count)s %(name)s uspješno promijenjeno." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -227,17 +232,17 @@ msgstr[1] "Svih %(total_count)s odabrano" msgstr[2] "Svih %(total_count)s odabrano" msgstr[3] "Svih %(total_count)s odabrano" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 od %(cnt)s odabrano" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" uspješno izbrisan." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Promijeni povijest: %s" @@ -415,7 +420,7 @@ msgstr "Filter" msgid "Delete" msgstr "Izbriši" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -425,7 +430,16 @@ msgstr "" "Brisanje %(object_name)s '%(escaped_object)s' rezultiralo bi brisanjem " "povezanih objekta, ali vi nemate privilegije za brisanje navedenih objekta: " -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Brisanje %(object_name)s '%(escaped_object)s' rezultiralo bi brisanjem " +"povezanih objekta, ali vi nemate privilegije za brisanje navedenih objekta: " + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -434,8 +448,8 @@ msgstr "" "Jeste li sigurni da želite izbrisati %(object_name)s \"%(escaped_object)s\"? " "Svi navedeni objekti biti će izbrisani:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Da, siguran sam" @@ -443,21 +457,30 @@ msgstr "Da, siguran sam" msgid "Delete multiple objects" msgstr "Izbriši više unosa." -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Brisanje %(object_name)s rezultiralo bi brisanjem povezanih objekta, ali vi " "nemate privilegije za brisanje navedenih objekta: " -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Brisanje %(object_name)s rezultiralo bi brisanjem povezanih objekta, ali vi " +"nemate privilegije za brisanje navedenih objekta: " + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Jeste li sigurni da želite izbrisati odabrane %(object_name)s? Svi navedeni " "objekti i povezani unosi biti će izbrisani:" @@ -775,12 +798,12 @@ msgstr "Resetiraj moju lozinku" msgid "All dates" msgstr "Svi datumi" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Odaberi %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Odaberi za promjenu - %s" diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo b/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo Binary files differindex 768d0065c1..4cb8f00095 100644 --- a/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/hu/LC_MESSAGES/django.po b/django/contrib/admin/locale/hu/LC_MESSAGES/django.po index ca499774c2..9c0923aa50 100644 --- a/django/contrib/admin/locale/hu/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/hu/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2008-08-30 01:11+0200\n" "Last-Translator: Szilveszter Farkas <szilveszter.farkas@gmail.com>\n" "Language-Team: Hungarian <hu@li.org>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Biztos benne?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -130,115 +135,115 @@ msgstr "naplóbejegyzések" msgid "None" msgstr "Egyik sem" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s módosítva." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "és" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "\"%(object)s\" %(name)s létrehozva." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "\"%(object)s\" %(name)s tulajdonságai (%(list)s) megváltoztak." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "\"%(object)s\" %(name)s törlésre került." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Egy mező sem változott." # TODO -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "\"%(obj)s\" %(name)s sikeresen létrehozva." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Alább ismét szerkesztheti." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Alább hozzáadhat egy másikat ebből: %s." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "\"%(obj)s\" %(name)s sikeresen módosítva." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "\"%(obj)s\" %(name)s sikeresen létrehozva. Alább ismét szerkesztheted." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "művelet időpontja" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Új %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s módosítása" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Adatbázis hiba" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "\"%(obj)s\" %(name)s sikeresen módosítva." msgstr[1] "\"%(obj)s\" %(name)s sikeresen módosítva." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "\"%(obj)s\" %(name)s sikeresen törölve." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Változások története: %s" @@ -414,7 +419,7 @@ msgstr "Szűrő" msgid "Delete" msgstr "Törlés" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -425,7 +430,17 @@ msgstr "" "törlését is eredményezi, de a hozzáférése nem engedi a következő típusú " "objektumok törlését:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"'%(escaped_object)s' %(object_name)s törlése a kapcsolódó objektumok " +"törlését is eredményezi, de a hozzáférése nem engedi a következő típusú " +"objektumok törlését:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -434,8 +449,8 @@ msgstr "" "Biztos hogy törli a következőt: \"%(escaped_object)s\" (típus: %(object_name)" "s)? A összes további kapcsolódó elem is törlődik:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Igen, biztos vagyok benne" @@ -444,22 +459,32 @@ msgstr "Igen, biztos vagyok benne" msgid "Delete multiple objects" msgstr "\"%(object)s\" %(name)s törlésre került." -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"'%(escaped_object)s' %(object_name)s törlése a kapcsolódó objektumok " +"törlését is eredményezi, de a hozzáférése nem engedi a következő típusú " +"objektumok törlését:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "'%(escaped_object)s' %(object_name)s törlése a kapcsolódó objektumok " "törlését is eredményezi, de a hozzáférése nem engedi a következő típusú " "objektumok törlését:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Biztos hogy törli a következőt: \"%(escaped_object)s\" (típus: %(object_name)" "s)? A összes további kapcsolódó elem is törlődik:" @@ -780,12 +805,12 @@ msgstr "Jelszavam törlése" msgid "All dates" msgstr "Minden dátum" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Kiválasztás %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Válasszon ki egyet a módosításhoz (%s)" diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/django.mo b/django/contrib/admin/locale/id/LC_MESSAGES/django.mo Binary files differindex f7ed7c6066..e5c000d230 100644 --- a/django/contrib/admin/locale/id/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/id/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/id/LC_MESSAGES/django.po b/django/contrib/admin/locale/id/LC_MESSAGES/django.po index b54def9f2b..6a872b5f08 100644 --- a/django/contrib/admin/locale/id/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/id/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-08 18:39+0700\n" "Last-Translator: Selwin Ong <selwin@ui.co.id>\n" "Language-Team: Indonesian <id@li.org>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Berhasil menghapus %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Apakah Anda yakin?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Hapus %(verbose_name_plural)s yang terpilih" @@ -125,112 +130,112 @@ msgstr "pencatatan log" msgid "None" msgstr "None" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s telah diubah" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "dan" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" telah ditambahkan." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s untuk %(name)s \"%(object)s\" telah diubah." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" telah dihapus." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Tidak ada field yang berubah." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" berhasil ditambahkan." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Anda boleh mengubahnya kembali di bawah." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Anda boleh menambahkan %s lagi di bawah." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" berhasil diubah." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" berhasil ditambahkan. Anda boleh mengubahnya di bawah." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "Obyek harus dipilih sebelum dimanipulasi. Tidak ada obyek yang diubah." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Tidak ada aksi yang terpilih." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Tambahkan %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Obyek %(name)s dengan primary key %(key)r tidak ada." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Ubah %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Database error" -#: options.py:1095 +#: options.py:1107 #, 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 berhasil diubah." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s terpilih" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 dari %(cnt)s terpilih" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" berhasil dihapus." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Ubah riwayat: %s" @@ -405,7 +410,7 @@ msgstr "Filter" msgid "Delete" msgstr "Hapus" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -416,7 +421,17 @@ msgstr "" "lain yang terhubung, akan tetapi akun Anda tidak memiliki ijin untuk " "menghapus obyek-obyek dengan tipe:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Menghapus %(object_name)s '%(escaped_object)s' akan menghapus obyek-obyek " +"lain yang terhubung, akan tetapi akun Anda tidak memiliki ijin untuk " +"menghapus obyek-obyek dengan tipe:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -425,8 +440,8 @@ msgstr "" "Apakah Anda yakin ingin menghapus %(object_name)s \"%(escaped_object)s\"? " "Semua obyek-obyek lain yang berhubungan juga akan dihapus:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ya, saya yakin" @@ -434,21 +449,30 @@ msgstr "Ya, saya yakin" msgid "Delete multiple objects" msgstr "Hapus beberapa obyek" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Menghapus %(object_name)s akan menghapus obyek-obyek lain yang berhubungan, " "tetapi akun Anda tidak memiliki ijin untuk menghapus tipe-tipe obyek:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Menghapus %(object_name)s akan menghapus obyek-obyek lain yang berhubungan, " +"tetapi akun Anda tidak memiliki ijin untuk menghapus tipe-tipe obyek:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Apakah Anda yakin ingin menghapus obyek %(object_name)s yang terpilih? Semua " "obyek di bawah ini dan obyek-obyek lain yang berhubungan akan dihapus:" @@ -763,12 +787,12 @@ msgstr "Reset sandi saya" msgid "All dates" msgstr "Semua tanggal" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Pilih %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Pilih %s untuk diubah" diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/django.mo b/django/contrib/admin/locale/is/LC_MESSAGES/django.mo Binary files differindex 93f35a1b7c..693fa0e832 100644 --- a/django/contrib/admin/locale/is/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/is/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/is/LC_MESSAGES/django.po b/django/contrib/admin/locale/is/LC_MESSAGES/django.po index f2c721433b..86b1ec1afc 100644 --- a/django/contrib/admin/locale/is/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/is/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2008-09-09 16:34-0000\n" "Last-Translator: Jökull Sólberg Auðunsson <jokullsolberg@gmail.com>\n" "Language-Team: <dagurp@gmail.com>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Ertu viss?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -128,115 +133,115 @@ msgstr "kladdafærslur" msgid "None" msgstr "Ekkert" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Breytti %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "og" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Bætti við %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Breytti %(list)s fyrir %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Eyddi %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Engum reitum breytt." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s „%(obj)s“ var bætt við." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Þú getur breytt því aftur að neðan." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Þú getur bætt öðru %s við að neðan." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s „%(obj)s“ hefur verið breytt." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s „%(obj)s“ hefur verið bætt við. Þú getur breytt því aftur að neðan." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "tími aðgerðar" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Bæta við %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Breyta %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Gagnagrunnsvilla" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s „%(obj)s“ hefur verið breytt." msgstr[1] "%(name)s „%(obj)s“ hefur verið breytt." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s „%(obj)s“ var eytt." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Breytingarsaga: %s" @@ -413,7 +418,7 @@ msgstr "Sía" msgid "Delete" msgstr "Eyða" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -423,7 +428,16 @@ msgstr "" "Eyðing á %(object_name)s „%(escaped_object)s“ hefði í för með sér eyðingu á " "tengdum hlutum en þú hefur ekki réttindi til að eyða eftirfarandi hlutum:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Eyðing á %(object_name)s „%(escaped_object)s“ hefði í för með sér eyðingu á " +"tengdum hlutum en þú hefur ekki réttindi til að eyða eftirfarandi hlutum:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -432,8 +446,8 @@ msgstr "" "Ertu viss um að þú viljir eyða %(object_name)s „%(escaped_object)s“? Öllu " "eftirfarandi verður eytt:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Já ég er viss." @@ -442,21 +456,30 @@ msgstr "Já ég er viss." msgid "Delete multiple objects" msgstr "Eyddi %(name)s \"%(object)s\"." -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Eyðing á %(object_name)s „%(escaped_object)s“ hefði í för með sér eyðingu á " +"tengdum hlutum en þú hefur ekki réttindi til að eyða eftirfarandi hlutum:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "Eyðing á %(object_name)s „%(escaped_object)s“ hefði í för með sér eyðingu á " "tengdum hlutum en þú hefur ekki réttindi til að eyða eftirfarandi hlutum:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Ertu viss um að þú viljir eyða %(object_name)s „%(escaped_object)s“? Öllu " "eftirfarandi verður eytt:" @@ -778,12 +801,12 @@ msgstr "Endursstilla lykilorðið mitt" msgid "All dates" msgstr "Allar dagsetningar" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Veldu %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Veldu %s til að breyta" diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/django.mo b/django/contrib/admin/locale/it/LC_MESSAGES/django.mo Binary files differindex 638a8cd108..e4135a0521 100644 --- a/django/contrib/admin/locale/it/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/it/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/it/LC_MESSAGES/django.po b/django/contrib/admin/locale/it/LC_MESSAGES/django.po index cfc9da3b1f..5502e82672 100644 --- a/django/contrib/admin/locale/it/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/it/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:21+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-10 14:44+0200\n" "Last-Translator: Nicola Larosa <nico@tekNico.net>\n" "Language-Team: Italian <django-it@googlegroups.com>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Cancellati/e con successo %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Sei sicuro?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Cancella %(verbose_name_plural)s selezionati/e" @@ -128,54 +133,54 @@ msgstr "voci di log" msgid "None" msgstr "Nessuno" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s modificato/a." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "e" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Aggiunto/a %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Cambiato/i %(list)s per %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Cancellato/a %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Nessun campo modificato." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" aggiunto/a correttamente." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "È possibile modificare nuovamente qui sotto." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Puoi aggiungere un altro/a %s qui sotto." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" modificato/a correttamente." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -183,7 +188,7 @@ msgstr "" "%(name)s \"%(obj)s\" aggiunto/a correttamente. Puoi modificare ancora qui " "sotto." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -191,54 +196,54 @@ msgstr "" "Occorre selezionare degli oggetti per potervi eseguire azioni. Nessun " "oggetto è stato cambiato." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nessuna azione selezionata." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Aggiungi %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Modifica %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Errore nel database" -#: options.py:1095 +#: options.py:1107 #, 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 modificato/a correttamente." msgstr[1] "%(count)s %(name)s modificati/e correttamente." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s selezionati/e" msgstr[1] "%(total_count)s selezionata." -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 di %(cnt)s selezionati/e" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" cancellato/a correttamente." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Tracciato delle modifiche: %s" @@ -414,7 +419,7 @@ msgstr "Filtro" msgid "Delete" msgstr "Cancella" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -425,7 +430,17 @@ msgstr "" "cancellazione di oggetti collegati, ma questo account non ha i permessi per " "cancellare gli oggetti dei seguenti tipi:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"La cancellazione di %(object_name)s '%(escaped_object)s' causerebbe la " +"cancellazione di oggetti collegati, ma questo account non ha i permessi per " +"cancellare gli oggetti dei seguenti tipi:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -434,8 +449,8 @@ msgstr "" "Sicuro di voler cancellare %(object_name)s \"%(escaped_object)s\"? Tutti gli " "oggetti collegati seguenti saranno cancellati:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Sì, sono sicuro" @@ -443,22 +458,32 @@ msgstr "Sì, sono sicuro" msgid "Delete multiple objects" msgstr "Cancella più oggetti" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "La cancellazione di %(object_name)s causerebbe la cancellazione di oggetti " "collegati, ma il tuo account non ha i permessi per cancellare gli oggetti " "dei seguenti tipi:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"La cancellazione di %(object_name)s causerebbe la cancellazione di oggetti " +"collegati, ma il tuo account non ha i permessi per cancellare gli oggetti " +"dei seguenti tipi:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Sicuro di voler cancellare gli oggetti %(object_name)s selezionati? Tutti i " "seguenti oggetti, e i loro oggetti collegati, saranno cancellati:" @@ -777,12 +802,12 @@ msgstr "Reimposta la mia password" msgid "All dates" msgstr "Tutte le date" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Scegli %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Scegli %s da modificare" diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo Binary files differindex 355c2fbfab..4a9cf06057 100644 --- a/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ja/LC_MESSAGES/django.po b/django/contrib/admin/locale/ja/LC_MESSAGES/django.po index f9c2ac70b6..4a16f7001c 100644 --- a/django/contrib/admin/locale/ja/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ja/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-09 12:41+0900\n" "Last-Translator: Takashi Matsuo <matsuo.takashi@gmail.com>\n" "Language-Team: Japanese <django-ja@googlegroups.com>\n" @@ -17,11 +17,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d 個の %(items)sを削除しました。" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "よろしいですか？" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "選択された %(verbose_name_plural)s の削除" @@ -124,112 +129,112 @@ msgstr "ログエントリ" msgid "None" msgstr "None" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s を変更しました。" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "と" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\"を追加しました。" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" の %(list)s を変更しました。" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" を削除しました。" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "変更はありませんでした。" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" を追加しました。" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "続けて編集できます。" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "続けて別の %s を追加できます。" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" を変更しました。" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "操作を実行するには、対象を選択する必要があります。何も変更されませんでした。" -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "操作が選択されていません。" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s を追加" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "主キーが %(key)r である %(name)s オブジェクトは存在しません。" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s を変更" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "データベースエラー" -#: options.py:1095 +#: options.py:1107 #, 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 を変更しました。" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s 個選択されました" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s個の内ひとつも選択されていません" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" を削除しました。" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "変更履歴: %s" @@ -404,7 +409,7 @@ msgstr "フィルタ" msgid "Delete" msgstr "削除" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -415,7 +420,17 @@ msgstr "" "除しようとしましたが、あなたのアカウントには以下のタイプのオブジェクトを削除" "するパーミッションがありません:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"%(object_name)s '%(escaped_object)s' の削除時に関連づけられたオブジェクトも削" +"除しようとしましたが、あなたのアカウントには以下のタイプのオブジェクトを削除" +"するパーミッションがありません:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -424,8 +439,8 @@ msgstr "" "%(object_name)s \"%(escaped_object)s\"を削除しますか？ 関連づけられている以下" "のオブジェクトも全て削除されます:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "はい。" @@ -433,22 +448,32 @@ msgstr "はい。" msgid "Delete multiple objects" msgstr "複数のオブジェクトを削除します" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 の削除時に関連づけられたオブジェクトも削除しようとしました" "が、あなたのアカウントには以下のタイプのオブジェクトを削除するパーミッション" "がありません:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"%(object_name)s の削除時に関連づけられたオブジェクトも削除しようとしました" +"が、あなたのアカウントには以下のタイプのオブジェクトを削除するパーミッション" +"がありません:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "%(object_name)s を削除しますか？ 関連づけられている以下のオブジェクトと関連す" "る項目も全て削除されます:" @@ -764,12 +789,12 @@ msgstr "パスワードをリセット" msgid "All dates" msgstr "いつでも" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s を選択" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "変更する %s を選択" diff --git a/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo Binary files differindex 24a16eca93..3e424b3494 100644 --- a/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ka/LC_MESSAGES/django.po b/django/contrib/admin/locale/ka/LC_MESSAGES/django.po index e3d4486423..d81453147f 100644 --- a/django/contrib/admin/locale/ka/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ka/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2008-10-05 14:34+0400\n" "Last-Translator: David Avsajanishvili <avsd05@gmail.com>\n" "Language-Team: Georgian <ka@li.org>\n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "დარწმუნებული ხართ?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -130,54 +135,54 @@ msgstr "ლოგის ერთეულები" msgid "None" msgstr "არცერთი" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s შეცვლილია." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "და" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "დამატებულია %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "შეცვლილია %(list)s for %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "წაშლილია %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "არცერთი ველი არ შეცვლილა." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" წარმატებით დაემატა." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "თქვენ შეგიძლიათ შეცვალოთ იგი." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "შეგიძლიათ დაამატოთ კიდევ ერთი %s." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" წარმატებით შეიცვალა." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -185,59 +190,59 @@ msgstr "" "%(name)s \"%(obj)s\" წარმატებით დაემატა. შეგიძლიათ განაგრძოთ მისი " "რედაქტირება." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "მოქმედების დრო" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "დავამატოთ %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "შევცვალოთ %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "მონაცემთა ბაზის შეცდომა" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" წარმატებით შეიცვალა." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" წარმატებით წაიშალა." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "ცვლილებების ისტორია: %s" @@ -413,7 +418,7 @@ msgstr "ფილტრი" msgid "Delete" msgstr "წავშალოთ" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -424,7 +429,17 @@ msgstr "" "დაკავშირებული ობიექტების წაშლას, მაგრამ თქვენ არა გაქვთ შემდეგი ტიპების " "ობიექტების წაშლის უფლება:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"ობიექტების წაშლა: %(object_name)s '%(escaped_object)s' გამოიწვევს " +"დაკავშირებული ობიექტების წაშლას, მაგრამ თქვენ არა გაქვთ შემდეგი ტიპების " +"ობიექტების წაშლის უფლება:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -433,8 +448,8 @@ msgstr "" "ნამდვილად გსურთ, წაშალოთ %(object_name)s \"%(escaped_object)s\"? ყველა " "ქვემოთ მოყვანილი დაკავშირებული ობიექტი წაშლილი იქნება:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "კი, ნამდვილად" @@ -443,22 +458,32 @@ msgstr "კი, ნამდვილად" msgid "Delete multiple objects" msgstr "წაშლილია %(name)s \"%(object)s\"." -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 '%(escaped_object)s' გამოიწვევს " +"დაკავშირებული ობიექტების წაშლას, მაგრამ თქვენ არა გაქვთ შემდეგი ტიპების " +"ობიექტების წაშლის უფლება:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "ობიექტების წაშლა: %(object_name)s '%(escaped_object)s' გამოიწვევს " "დაკავშირებული ობიექტების წაშლას, მაგრამ თქვენ არა გაქვთ შემდეგი ტიპების " "ობიექტების წაშლის უფლება:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "ნამდვილად გსურთ, წაშალოთ %(object_name)s \"%(escaped_object)s\"? ყველა " "ქვემოთ მოყვანილი დაკავშირებული ობიექტი წაშლილი იქნება:" @@ -779,12 +804,12 @@ msgstr "აღვადგინოთ ჩემი პაროლი" msgid "All dates" msgstr "ყველა თარიღი" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "ავირჩიოთ %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "აირჩიეთ %s შესაცვლელად" diff --git a/django/contrib/admin/locale/km/LC_MESSAGES/django.mo b/django/contrib/admin/locale/km/LC_MESSAGES/django.mo Binary files differindex c6b1953ac1..e0c893bd8a 100644 --- a/django/contrib/admin/locale/km/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/km/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/km/LC_MESSAGES/django.po b/django/contrib/admin/locale/km/LC_MESSAGES/django.po index 281454229d..35fc28fd16 100644 --- a/django/contrib/admin/locale/km/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/km/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2007-08-10 00:21+0900\n" "Last-Translator: Chay Sengtha <sengtha@e-khmer.com>\n" "Language-Team: Chay Sengtha <sengtha@e-khmer.com>\n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "តើលោកអ្នកប្រាកដទេ?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -128,54 +133,54 @@ msgstr "កំណត់ហេតុ" msgid "None" msgstr "មិនយល់ព្រម" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "បានផ្លាស់ប្តូរ %s" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "និង" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "បន្ថែម %(name)s" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "ជាប់ទាក់ទងជាមួយនឹងកម្មវិធី `%s.%s` " -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "ពុំមានទិន្នន័យត្រូវបានផ្លាស់ប្តូរ។" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "ឈ្មោះកម្មវិធី %(name)s \"%(obj)s\" បានបញ្ជូលដោយជោគជ័យ។" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "សូមសាកល្បងកែប្រែម្តងទៀត។" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "លោកអ្នកអាចបន្ថែម %s ផ្សេងទៀតដូចខាងក្រោម។" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "កម្មវិធីឈ្មោះ %(name)s \"%(obj)s\" ត្រូវបានផ្លាស់ប្តូរដោយជោគជ័យ។" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -183,59 +188,59 @@ msgstr "" "ឈ្មោះកម្មវីធី %(name)s \"%(obj)s\" " "ត្រូវបានបន្ថែមដោយជោគជ័យ។ លោកអ្នកអាចផ្លាស់ប្តូរម្តងទៀតនៅខាងក្រោម។" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "ពេលវេលាប្រតិបត្តិការ" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "បន្ថែម %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "ផ្លាស់ប្តូរ %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "ទិន្នន័យមូលដ្ឋានមានបញ្ហា" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "កម្មវិធីឈ្មោះ %(name)s \"%(obj)s\" ត្រូវបានផ្លាស់ប្តូរដោយជោគជ័យ។" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "ឈ្មោះកម្មវិធី %(name)s \"%(obj)s\" ត្រូវបានលប់ដោយជោគជ័យ។" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "សកម្មភាពផ្លាស់ប្តូរកន្លងមក : %s" @@ -412,7 +417,7 @@ msgstr "ស្វែងរកជាមួយ" msgid "Delete" msgstr "លប់" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -422,7 +427,16 @@ msgstr "" "ការលប់ %(object_name)s '%(escaped_object)s' អាចធ្វើអោយកម្មវិធីដែលពាក់" "ព័ន្ធបាត់បង់ ។ ក៏ប៉ន្តែលោកអ្នកពុំមានសិទ្ធិលប់កម្មវិធីប្រភេទនេះទេ។" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"ការលប់ %(object_name)s '%(escaped_object)s' អាចធ្វើអោយកម្មវិធីដែលពាក់" +"ព័ន្ធបាត់បង់ ។ ក៏ប៉ន្តែលោកអ្នកពុំមានសិទ្ធិលប់កម្មវិធីប្រភេទនេះទេ។" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -431,8 +445,8 @@ msgstr "" "តើលោកអ្នកប្រាកដជាចង់លប់ %(object_name)s \"%(escaped_object)s\"? ការលប់ %" "(object_name)s '%(escaped_object)s' អាចធ្វើអោយកម្មវិធីដែលពាក់ព័ន្ធបាត់បង់។" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "ខ្ញុំច្បាស់ជាចង់លប់" @@ -440,21 +454,30 @@ msgstr "ខ្ញុំច្បាស់ជាចង់លប់" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 '%(escaped_object)s' អាចធ្វើអោយកម្មវិធីដែលពាក់" +"ព័ន្ធបាត់បង់ ។ ក៏ប៉ន្តែលោកអ្នកពុំមានសិទ្ធិលប់កម្មវិធីប្រភេទនេះទេ។" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "ការលប់ %(object_name)s '%(escaped_object)s' អាចធ្វើអោយកម្មវិធីដែលពាក់" "ព័ន្ធបាត់បង់ ។ ក៏ប៉ន្តែលោកអ្នកពុំមានសិទ្ធិលប់កម្មវិធីប្រភេទនេះទេ។" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "តើលោកអ្នកប្រាកដជាចង់លប់ %(object_name)s \"%(escaped_object)s\"? ការលប់ %" "(object_name)s '%(escaped_object)s' អាចធ្វើអោយកម្មវិធីដែលពាក់ព័ន្ធបាត់បង់។" @@ -770,12 +793,12 @@ msgstr "កំណត់ពាក្យសំងាត់សារជាថ្ម msgid "All dates" msgstr "កាលបរិច្ឆេទទាំងអស់" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "ជ្រើសរើស %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "ជ្រើសរើស %s ដើម្បីផ្លាស់ប្តូរ" diff --git a/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo Binary files differindex 17b5e873a4..2dab45b21d 100644 --- a/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/kn/LC_MESSAGES/django.po b/django/contrib/admin/locale/kn/LC_MESSAGES/django.po index 75fd365342..7640d4f4e1 100644 --- a/django/contrib/admin/locale/kn/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/kn/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2007-01-08 20:22+0530\n" "Last-Translator: Kannada Localization Team <translation@sampada.info>\n" "Language-Team: Kannada <translation@sampada.info>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "ಖಚಿತಪಡಿಸುವಿರಾ? " -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -133,54 +138,54 @@ msgstr "ಲಾಗ್ ದಾಖಲೆಗಳು" msgid "None" msgstr "ಇಲ್ಲ" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s ಬದಲಾಯಿಸಲಾಯಿತು." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ಮತ್ತು" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s ಸೇರಿಸಿ" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "ಸಂಬಂಧಿಸಿದ `%s.%s` ವಸ್ತುಗಳು" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "ಯಾವುದೇ ಅಂಶಗಳು ಬದಲಾಗಲಿಲ್ಲ." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr " %(name)s \"%(obj)s\" ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "ನೀವು ಅದನ್ನು ಕೆಳಗೆ ಮತ್ತೆ ಬದಲಾಯಿಸಬಹುದು." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "ನೀವು ಕೆಳಗೆ ಇನ್ನೊಂದು %s ಸೇರಿಸಬಹುದು." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ಸಫಲವಾಗಿ ಬದಲಾಯಿಸಲಾಯಿತು." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -188,61 +193,61 @@ msgstr "" "%(name)s \"%(obj)s\" ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು. ನೀವು ಕೆಳಗೆ ಅದನ್ನು ಮತ್ತೆ " "ಬದಲಾಯಿಸಬಹುದು." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "ಕ್ರಮದ(ಕ್ರಿಯೆಯ) ಸಮಯ" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s ಸೇರಿಸಿ" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s ಅನ್ನು ಬದಲಿಸು" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "ದತ್ತಸಂಚಯದ ದೋಷ" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" ಸಫಲವಾಗಿ ಬದಲಾಯಿಸಲಾಯಿತು." msgstr[1] "%(name)s \"%(obj)s\" ಸಫಲವಾಗಿ ಬದಲಾಯಿಸಲಾಯಿತು." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ಯಶಸ್ವಿಯಾಗಿ ಅಳಿಸಲಾಯಿತು." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "ಬದಲಾವಣೆಗಳ ಇತಿಹಾಸ: %s" @@ -422,7 +427,7 @@ msgstr "ಸೋಸಕ" msgid "Delete" msgstr "ಅಳಿಸಿಹಾಕಿ" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -433,7 +438,17 @@ msgstr "" "ಕಳೆದುಹೋಗುತ್ತವೆ. ಆದರೆ ನಿಮ್ಮ ಖಾತೆಗೆ ಕೆಳಕಂಡ ಬಗೆಗಳ ವಸ್ತುಗಳನ್ನು ತೆಗೆದುಹಾಕಲು " "ಅನುಮತಿಯಿಲ್ಲ." -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"'%(escaped_object)s' %(object_name)s ಅನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ ಸಂಬಂಧಿತ ವಸ್ತುಗಳೂ " +"ಕಳೆದುಹೋಗುತ್ತವೆ. ಆದರೆ ನಿಮ್ಮ ಖಾತೆಗೆ ಕೆಳಕಂಡ ಬಗೆಗಳ ವಸ್ತುಗಳನ್ನು ತೆಗೆದುಹಾಕಲು " +"ಅನುಮತಿಯಿಲ್ಲ." + +#: templates/admin/delete_confirmation.html:33 #, fuzzy, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -442,8 +457,8 @@ msgstr "" "ದಿಟವಾಗಿಯೂ, ನೀವು %(object_name)s \"%(escaped_object)ಗಳನ್ನು\"? " "ತೆಗೆದುಹಾಕಬಯಸಿದ್ದೀರಾ? ಸಂಬಂಧಪಟ್ಟ ಕೆಳಕಂಡ ಎಲ್ಲವನ್ನೂ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "ಹೌದು,ನನಗೆ ಖಚಿತವಿದೆ" @@ -451,22 +466,32 @@ msgstr "ಹೌದು,ನನಗೆ ಖಚಿತವಿದೆ" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"'%(escaped_object)s' %(object_name)s ಅನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ ಸಂಬಂಧಿತ ವಸ್ತುಗಳೂ " +"ಕಳೆದುಹೋಗುತ್ತವೆ. ಆದರೆ ನಿಮ್ಮ ಖಾತೆಗೆ ಕೆಳಕಂಡ ಬಗೆಗಳ ವಸ್ತುಗಳನ್ನು ತೆಗೆದುಹಾಕಲು " +"ಅನುಮತಿಯಿಲ್ಲ." + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "'%(escaped_object)s' %(object_name)s ಅನ್ನು ತೆಗೆದುಹಾಕುವುದರಿಂದ ಸಂಬಂಧಿತ ವಸ್ತುಗಳೂ " "ಕಳೆದುಹೋಗುತ್ತವೆ. ಆದರೆ ನಿಮ್ಮ ಖಾತೆಗೆ ಕೆಳಕಂಡ ಬಗೆಗಳ ವಸ್ತುಗಳನ್ನು ತೆಗೆದುಹಾಕಲು " "ಅನುಮತಿಯಿಲ್ಲ." -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "ದಿಟವಾಗಿಯೂ, ನೀವು %(object_name)s \"%(escaped_object)ಗಳನ್ನು\"? " "ತೆಗೆದುಹಾಕಬಯಸಿದ್ದೀರಾ? ಸಂಬಂಧಪಟ್ಟ ಕೆಳಕಂಡ ಎಲ್ಲವನ್ನೂ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ:" @@ -791,12 +816,12 @@ msgstr "ನನ್ನ ಪ್ರವೇಶಪದವನ್ನು ಮತ್ತೆ ನ msgid "All dates" msgstr "ಎಲ್ಲಾ ದಿನಾಂಕಗಳು" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s ಆಯ್ದುಕೊಳ್ಳಿ" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "ಬದಲಾಯಿಸಲು %s ಆಯ್ದುಕೊಳ್ಳಿ" diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo Binary files differindex d128865336..780b306ac9 100644 --- a/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ko/LC_MESSAGES/django.po b/django/contrib/admin/locale/ko/LC_MESSAGES/django.po index 407b577137..c3894a2cc8 100644 --- a/django/contrib/admin/locale/ko/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ko/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2007-04-06 11:04+0900\n" "Last-Translator: Joongi Kim (me@daybreaker.info)\n" "Language-Team: Korean\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d개의 %(items)s (을)를 성공적으로 삭제하였습니다." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "확실합니까?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "선택된 %(verbose_name_plural)s (을)를 삭제합니다." @@ -126,60 +131,60 @@ msgstr "로그 엔트리" msgid "None" msgstr "없음" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s (이)가 변경되었습니다." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "또한" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" (을)를 추가하였습니다." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s에 대한 %(name)s \"%(object)s\" (을)를 변경하였습니다." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" (을)를 삭제하였습니다." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "변경된 필드가 없습니다." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "계속해서 편집하실 수 있습니다." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "계속해서 다른 %s (을)를 추가하세요." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" (이)가 변경되었습니다." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다. 계속해서 편집하세요." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -187,52 +192,52 @@ msgstr "" "항목들에 액션을 적용하기 위해선 먼저 항목들이 선택되어 있어야 합니다. 아무 항" "목도 변경되지 않았습니다." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "액션이 선택되지 않았습니다." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s 추가" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Primary key %(key)r에 대한 오브젝트 %(name)s(이)가 존재하지 않습니다." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s 변경" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "데이터베이스 오류" -#: options.py:1095 +#: options.py:1107 #, 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(이)가 변경되었습니다." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "모두 %(total_count)s개가 선택되었습니다." -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s 중 아무것도 선택되지 않았습니다." -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\"(이)가 삭제되었습니다." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "변경 히스토리: %s" @@ -408,7 +413,7 @@ msgstr "필터" msgid "Delete" msgstr "삭제" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -419,7 +424,17 @@ msgstr "" "하고자 했으나, 지금 사용하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없" "습니다. :" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"%(object_name)s \"%(escaped_object)s\" (을)를 삭제하면서관련 오브젝트를 제거" +"하고자 했으나, 지금 사용하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없" +"습니다. :" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -428,8 +443,8 @@ msgstr "" "정말로 %(object_name)s \"%(escaped_object)s\"(을)를 삭제하시겠습니까? 다음의 " "관련 항목들이 모두 삭제됩니다. :" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "네, 확실합니다." @@ -437,21 +452,30 @@ msgstr "네, 확실합니다." msgid "Delete multiple objects" msgstr "여러 개의 오브젝트 삭제" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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(을)를 삭제하면서 관련 오브젝트를 제거하고자 했으나, 지금 사용" "하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없습니다. :" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"%(object_name)s(을)를 삭제하면서 관련 오브젝트를 제거하고자 했으나, 지금 사용" +"하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없습니다. :" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "정말로 선택된 %(object_name)s(을)를 삭제하시겠습니까? 다음의 항목들과 그 관" "련 항목들이 모두 삭제됩니다. :" @@ -763,12 +787,12 @@ msgstr "비밀번호 초기화" msgid "All dates" msgstr "언제나" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s 선택" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "변경할 %s 선택" diff --git a/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo b/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo Binary files differindex 454ec061f1..3498bd9c1c 100644 --- a/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/lt/LC_MESSAGES/django.po b/django/contrib/admin/locale/lt/LC_MESSAGES/django.po index 2a57730f3b..3961df73a3 100644 --- a/django/contrib/admin/locale/lt/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/lt/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2008-06-18 22:37+0200\n" "Last-Translator: Rapolas Kaselis <rapolas@gmail.com>\n" "Language-Team: Django-i18n <django-i18n@googlegroups.com>\n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Ar tu tikras?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -130,91 +135,91 @@ msgstr "log įrašai" msgid "None" msgstr "vienas" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Pakeistas %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ir" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Pridėti %(name)s" -#: options.py:617 +#: options.py:629 #, fuzzy, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "susiję `%(label)s.%(name)s` objektai" -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "susiję `%(label)s.%(name)s` objektai" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Nei vienas laukas nepakeistas" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" pridėtas sėkmingai." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Gali taisyti dar kartą žemiau." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Gali pridėti dar vieną %s žemiau." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" pridėtas sėkmingai. Gali taisytį jį dar kartą žemiau." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "veiksmo laikas" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Pridėti %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Pakeisti %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Duomenų bazės klaida" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -222,7 +227,7 @@ msgstr[0] "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas." msgstr[1] "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas." msgstr[2] "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -230,17 +235,17 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" sėkmingai ištrintas." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Pakeisti istoriją: %s" @@ -421,7 +426,7 @@ msgstr "Filtras" msgid "Delete" msgstr "Ištrinti" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -431,7 +436,16 @@ msgstr "" "Trinant %(object_name)s '%(escaped_object)s' turi būti ištrinti ir susiję " "objektai, bet tavo vartotojas neturi teisių ištrinti šių objektų:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Trinant %(object_name)s '%(escaped_object)s' turi būti ištrinti ir susiję " +"objektai, bet tavo vartotojas neturi teisių ištrinti šių objektų:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -440,8 +454,8 @@ msgstr "" "Ar tu esi tikras, kad nori ištrinti %(object_name)s \"%(escaped_object)s\"? " "Visi susiję objektai bus ištrinti:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Taip, aš esu tikras" @@ -449,21 +463,30 @@ msgstr "Taip, aš esu tikras" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Trinant %(object_name)s '%(escaped_object)s' turi būti ištrinti ir susiję " +"objektai, bet tavo vartotojas neturi teisių ištrinti šių objektų:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "Trinant %(object_name)s '%(escaped_object)s' turi būti ištrinti ir susiję " "objektai, bet tavo vartotojas neturi teisių ištrinti šių objektų:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Ar tu esi tikras, kad nori ištrinti %(object_name)s \"%(escaped_object)s\"? " "Visi susiję objektai bus ištrinti:" @@ -789,12 +812,12 @@ msgstr "Atstatyti slaptažodį" msgid "All dates" msgstr "Visos datos" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Pasirinkti %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Pasirinkti %s pakeitimui" diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo Binary files differindex 3ae8eec62c..4fba40665e 100644 --- a/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/lv/LC_MESSAGES/django.po b/django/contrib/admin/locale/lv/LC_MESSAGES/django.po index 6ac6abee91..2e8c88df4b 100644 --- a/django/contrib/admin/locale/lv/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/lv/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-10 20:18+0200\n" "Last-Translator: Reinis Veips <reinis.veips@wot.lv>\n" "Language-Team: Latvian translators' team <reinis.veips@wot.lv>\n" @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Veiksmīgi izdzēsti %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Vai esat pārliecināts?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Izdzēst izvēlēto %(verbose_name_plural)s" @@ -129,89 +134,89 @@ msgstr "žurnāla ieraksti" msgid "None" msgstr "nekas" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Izmainīts %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "un" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Pievienots %(name)s \"%(object)s\"" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Izmainīts %(list)s priekš %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Dzēsts %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Lauki nav izmainīti" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" pievienots sekmīgi." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Zemāk varat labot to atkal" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Zemāk varat pievienot vēl vienu %s." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" nomainīts sekmīgi." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" pievienots sekmīgi. Zemāk varat to labot." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "Lai veiktu darbību, jāizvēlas rindas. Rindas nav izmainītas." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nav izvēlēta darbība." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Pievienot %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s objekts ar primāro atslēgu %(key)r neeksistē." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Labot %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Datubāzes kļūda" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -219,7 +224,7 @@ msgstr[0] "%(count)s %(name)s ir labots sekmīgi" msgstr[1] "%(count)s %(name)s ir rediģēti sekmīgi" msgstr[2] "%(count)s %(name)s nav rediģēts." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -227,17 +232,17 @@ msgstr[0] "%(total_count)s izvēlēts" msgstr[1] "%(total_count)s izvēlēti" msgstr[2] "%(total_count)s izvēlēti" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 no %(cnt)s izvēlēti" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" sekmīgi izdzēsts." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Izmaiņu vēsture: %s" @@ -414,7 +419,7 @@ msgstr "Filtrs" msgid "Delete" msgstr "Dzēst" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -424,7 +429,16 @@ msgstr "" "Izdzēšot objektu %(object_name)s '%(escaped_object)s', tiks dzēsti visi " "saistītie objekti, bet jums nav tiesību dzēst sekojošus objektu tipus:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Izdzēšot objektu %(object_name)s '%(escaped_object)s', tiks dzēsti visi " +"saistītie objekti, bet jums nav tiesību dzēst sekojošus objektu tipus:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -433,8 +447,8 @@ msgstr "" "Vai esat pārliecināts, ka vēlaties dzēst %(object_name)s \"%(escaped_object)s" "\"? Tiks dzēsti arī sekojoši saistītie objekti:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Jā, esmu pārliecināts" @@ -442,21 +456,30 @@ msgstr "Jā, esmu pārliecināts" msgid "Delete multiple objects" msgstr "Dzēst vairākus objektus" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Izdzēšot objektu %(object_name)s, tiks dzēsti visi saistītie objekti , bet " "jums nav tiesību dzēst sekojošus objektu tipus:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Izdzēšot objektu %(object_name)s, tiks dzēsti visi saistītie objekti , bet " +"jums nav tiesību dzēst sekojošus objektu tipus:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Vai esat pārliecināts, ka vēlaties dzēst %(object_name)s? Tiks dzēsti arī " "sekojoši saistītie objekti:" @@ -773,12 +796,12 @@ msgstr "Paroles pārstatīšana" msgid "All dates" msgstr "Visi datumi" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Izvēlēties %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Izvēlēties %s, lai izmainītu" diff --git a/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo Binary files differindex 09f53b046b..51828e9dd0 100644 --- a/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/mk/LC_MESSAGES/django.po b/django/contrib/admin/locale/mk/LC_MESSAGES/django.po index f451aff561..65a1fac7a5 100644 --- a/django/contrib/admin/locale/mk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/mk/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-04-05 15:53+0100\n" "Last-Translator: Vasil Vangelovski <vvangelovski@gmail.com>\n" "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n" @@ -18,11 +18,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно беа избришани %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Сигурни сте?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Избриши ги избраните %(verbose_name_plural)s" @@ -125,54 +130,54 @@ msgstr "ставки во записникот" msgid "None" msgstr "Ништо" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Изменета %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "и" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Додадено %(name)s „%(object)s“." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Изменето %(list)s за %(name)s „%(object)s“." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Избришан %(name)s „%(object)s“." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Не беше изменето ниедно поле." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Ставката %(name)s \"%(obj)s\" беше успешно додадена." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Подолу можете повторно да го уредите." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Подолу можете да додате уште еден %s." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" беше успешно изменета." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -180,7 +185,7 @@ msgstr "" "Ставката %(name)s \"%(obj)s\" беше успешно додадена. Подолу можете повторно " "да ја уредите." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -188,54 +193,54 @@ msgstr "" "Мора да се одберат предмети за да се изврши акција врз нив. Ниеден предмет " "не беше променет." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Ниедна акција не е одбрана." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Додади %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "објект %(name)s со примарен клуч %(key)r не постои." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Измени %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Грешка во базата на податоци" -#: options.py:1095 +#: options.py:1107 #, 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 беа успешно изменети." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s одбран" msgstr[1] "Сите %(total_count)s одбрани" -#: options.py:1127 +#: options.py:1139 #, fuzzy, python-format msgid "0 of %(cnt)s selected" msgstr "од одбраниот %(count)d" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Ставаката %(name)s \"%(obj)s\" беше избришана успешно." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Историја на измени: %s" @@ -411,7 +416,7 @@ msgstr "Филтер" msgid "Delete" msgstr "Избриши" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -422,7 +427,17 @@ msgstr "" "поврзаните објекти, но со вашата сметка немате доволно привилегии да ги " "бришете следните типови на објекти:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Бришење на %(object_name)s '%(escaped_object)s' ќе резултира со бришење на " +"поврзаните објекти, но со вашата сметка немате доволно привилегии да ги " +"бришете следните типови на објекти:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -431,8 +446,8 @@ msgstr "" "Сигурне сте дека сакате да ги бришете %(object_name)s „%(escaped_object)s“? " "Сите овие ставки ќе бидат избришани:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Да, сигурен сум" @@ -440,22 +455,32 @@ msgstr "Да, сигурен сум" msgid "Delete multiple objects" msgstr "Избриши повеќе ставки" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 би резултирало со бришење на поврзаните објекти, " "но вие како корисник немате доволно привилегии да ги бришете следните типови " "на објекти:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Бришење на %(object_name)s би резултирало со бришење на поврзаните објекти, " +"но вие како корисник немате доволно привилегии да ги бришете следните типови " +"на објекти:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Сигурне сте дека сакате да ги избришете избраните %(object_name)s? Сите овие " "објекти и објектите поврзани со нив ќе бидат избришани:" @@ -774,12 +799,12 @@ msgstr "Ресетирај ја мојата лозинка" msgid "All dates" msgstr "Сите датуми" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Изберете %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Изберете %s за измена" diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo Binary files differindex d12f6db3d4..8bd835cb18 100644 --- a/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ml/LC_MESSAGES/django.po b/django/contrib/admin/locale/ml/LC_MESSAGES/django.po index 883b186208..689d9a3fd4 100644 --- a/django/contrib/admin/locale/ml/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ml/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django SVN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-28 15:09+0530\n" "Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n" "Language-Team: MALAYALAM <ML@li.org>\n" @@ -23,11 +23,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s വിജയകരമായി ഡിലീറ്റ് ചെയ്തു." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "തീര്ച്ചയാണോ?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "തെരഞ്ഞെടുത്ത %(verbose_name_plural)s ഡിലീറ്റ് ചെയ്യുക." @@ -130,113 +135,113 @@ msgstr "ലോഗ് എന്ട്രികള്" msgid "None" msgstr "ഒന്നുമില്ല" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s മാറ്റി." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ഉം" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ചേര്ത്തു." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ന്റെ %(list)s മാറ്റി." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ഡിലീറ്റ് ചെയ്തു." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "ഒരു മാറ്റവുമില്ല." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" വിജയകരമായി കൂട്ടിച്ചേര്ത്തു." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "താഴെ നിന്ന് വീണ്ടും മാറ്റം വരുത്താം" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "%s ഒന്നു കൂടി ചേര്ക്കാം" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ല് മാറ്റം വരുത്തി." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" കൂട്ടി ചേര്ത്തു. താഴെ നിന്നും മാറ്റം വരുത്താം." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "ആക്ഷന് നടപ്പിലാക്കേണ്ട വകകള് തെരഞ്ഞെടുക്കണം. ഒന്നും മാറ്റിയിട്ടില്ല." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "ആക്ഷനൊന്നും തെരഞ്ഞെടുത്തില്ല." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s ചേര്ക്കുക" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r എന്ന പ്രാഥമിക കീ ഉള്ള %(name)s വസ്തു ഒന്നും നിലവിലില്ല." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s മാറ്റാം" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "ഡേറ്റാബേസ് തകരാറാണ്." -#: options.py:1095 +#: options.py:1107 #, 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 ല് മാറ്റം വരുത്തി." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s തെരഞ്ഞെടുത്തു." msgstr[1] "%(total_count)sഉം തെരഞ്ഞെടുത്തു." -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s ല് ഒന്നും തെരഞ്ഞെടുത്തില്ല." -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ഡിലീറ്റ് ചെയ്തു." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "%s ലെ മാറ്റങ്ങള്." @@ -412,7 +417,7 @@ msgstr "" msgid "Delete" msgstr "" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -423,7 +428,17 @@ msgstr "" "വസ്തുക്കളുംഡിലീറ്റ് ആവും. പക്ഷേ നിങ്ങള്ക്ക് താഴെ പറഞ്ഞ തരം വസ്തുക്കള് ഡിലീറ്റ് ചെയ്യാനുള്ള അനുമതി " "ഇല്ല:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"%(object_name)s '%(escaped_object)s ഡിലീറ്റ് ചെയ്യുമ്പോള് അതുമായി ബന്ധമുള്ള " +"വസ്തുക്കളുംഡിലീറ്റ് ആവും. പക്ഷേ നിങ്ങള്ക്ക് താഴെ പറഞ്ഞ തരം വസ്തുക്കള് ഡിലീറ്റ് ചെയ്യാനുള്ള അനുമതി " +"ഇല്ല:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -432,8 +447,8 @@ msgstr "" "%(object_name)s \"%(escaped_object)s\" ഡിലീറ്റ് ചെയ്യണമെന്ന് തീര്ച്ചയാണോ?അതുമായി " "ബന്ധമുള്ള താഴെപ്പറയുന്ന വസ്തുക്കളെല്ലാം ഡിലീറ്റ് ആവും:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "അതെ, തീര്ച്ചയാണ്" @@ -441,21 +456,30 @@ msgstr "അതെ, തീര്ച്ചയാണ്" msgid "Delete multiple objects" msgstr "ഒന്നിലേറെ വസ്തുക്കള് ഡിലീറ്റ് ചെയ്തോളൂ" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 ഡിലീറ്റ് ചെയ്യുമ്പോള് അതുമായി ബന്ധമുള്ള വസ്തുക്കളുംഡിലീറ്റ് ആവും. പക്ഷേ " "നിങ്ങള്ക്ക് താഴെ പറഞ്ഞ തരം വസ്തുക്കള് ഡിലീറ്റ് ചെയ്യാനുള്ള അനുമതി ഇല്ല:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"%(object_name)s ഡിലീറ്റ് ചെയ്യുമ്പോള് അതുമായി ബന്ധമുള്ള വസ്തുക്കളുംഡിലീറ്റ് ആവും. പക്ഷേ " +"നിങ്ങള്ക്ക് താഴെ പറഞ്ഞ തരം വസ്തുക്കള് ഡിലീറ്റ് ചെയ്യാനുള്ള അനുമതി ഇല്ല:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "തെരഞ്ഞെടുത്ത %(object_name)s എല്ലാം ഡിലീറ്റ് ചെയ്യണമെന്ന് തീര്ച്ചയാണോ?താഴെപ്പറയുന്ന " "വസ്തുക്കളും അതുമായി ബന്ധമുള്ളതെല്ലാം ഡിലീറ്റ് ആവും:" @@ -770,12 +794,12 @@ msgstr "എന്റെ പാസ് വേര്ഡ് പുനസ്ഥാ msgid "All dates" msgstr "എല്ലാ തീയതികളും" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s തെരഞ്ഞെടുക്കൂ" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "മാറ്റാനുള്ള %s തെരഞ്ഞെടുക്കൂ" diff --git a/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo Binary files differindex bb46e8c48b..fe5cacec00 100644 --- a/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/mn/LC_MESSAGES/django.po b/django/contrib/admin/locale/mn/LC_MESSAGES/django.po index b7abb54242..b753a9e906 100644 --- a/django/contrib/admin/locale/mn/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/mn/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-03-11 17:23+0800\n" "Last-Translator: Urangua <urangua@adsolux.com>\n" "Language-Team: mn <translate@opensource.com>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Итгэлтэй байна уу?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -128,54 +133,54 @@ msgstr "" msgid "None" msgstr "" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Өөрчлөгдсөн %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ба" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Нэмэгдсэн %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\"-ийн өөрчлөгдсөн %(list)s" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Устгасан %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Өөрчилсөн зүйл байхгүй байна." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr " %(name)s \"%(obj)s\" амжилттай нэмэгдлээ." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Доорх хэсэгт үүнийг ахин засварлах боломжтой." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Доорх хэсэгт өөр %s нэмэх боломжтой." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr " %(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. " -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -183,61 +188,61 @@ msgstr "" "%(name)s \"%(obj)s\" амжилттай нэмэгдлээ. Доорх хэсэгт үүнийг ахин засварлах " "боломжтой." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "үйлдлийн хугацаа" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s-ийг нэмэх" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s-ийг өөрчлөх" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Өгөгдлийн сангийн алдаа" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] " %(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. " msgstr[1] " %(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. " -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr " %(name)s \"%(obj)s\" амжилттай устгагдлаа." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Өөрчлөлтийн түүх: %s" @@ -413,7 +418,7 @@ msgstr "Шүүлтүүр" msgid "Delete" msgstr "Устгах" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -423,7 +428,16 @@ msgstr "" "%(object_name)s '%(escaped_object)s'-ийг устгавал холбогдох объект нь устах " "ч бүртгэл тань дараах төрлийн объектуудийг устгах зөвшөөрөлгүй байна:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"%(object_name)s '%(escaped_object)s'-ийг устгавал холбогдох объект нь устах " +"ч бүртгэл тань дараах төрлийн объектуудийг устгах зөвшөөрөлгүй байна:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -432,8 +446,8 @@ msgstr "" "Та %(object_name)s \"%(escaped_object)s\"-ийг устгахдаа итгэлтэй байна уу? " "Үүнийг устгавал дараах холбогдох зүйлс нь бүгд устана:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Тийм, итгэлтэй байна." @@ -442,21 +456,30 @@ msgstr "Тийм, итгэлтэй байна." msgid "Delete multiple objects" msgstr "Устгасан %(name)s \"%(object)s\"." -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 '%(escaped_object)s'-ийг устгавал холбогдох объект нь устах " +"ч бүртгэл тань дараах төрлийн объектуудийг устгах зөвшөөрөлгүй байна:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "%(object_name)s '%(escaped_object)s'-ийг устгавал холбогдох объект нь устах " "ч бүртгэл тань дараах төрлийн объектуудийг устгах зөвшөөрөлгүй байна:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Та %(object_name)s \"%(escaped_object)s\"-ийг устгахдаа итгэлтэй байна уу? " "Үүнийг устгавал дараах холбогдох зүйлс нь бүгд устана:" @@ -776,12 +799,12 @@ msgstr "Нууц үгээ шинэчлэх" msgid "All dates" msgstr "Бүх огноо" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s-ийг сонго" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "%s-ийг өөрчлөхөөр сонго" diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo Binary files differindex 8e92943b19..217591b6b7 100644 --- a/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/nb/LC_MESSAGES/django.po b/django/contrib/admin/locale/nb/LC_MESSAGES/django.po index cc2ec8d38e..36219b3f30 100644 --- a/django/contrib/admin/locale/nb/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/nb/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-05-14 21:43+0200\n" "Last-Translator: Christian Mikalsen and Jon Lønne\n" "Language-Team: Norsk <no@li.org>\n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Slettet %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Er du sikker?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Slett valgte %(verbose_name_plural)s" @@ -127,60 +132,60 @@ msgstr "logginnlegg" msgid "None" msgstr "Ingen" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Endret %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "og" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Opprettet %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Endret %(list)s for %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Slettet %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Ingen felt endret." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" ble opprettet." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Du kan redigere videre nedenfor." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Du kan opprette ny %s nedenfor." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ble endret." -#: options.py:741 +#: options.py:753 #, 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." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -188,54 +193,54 @@ msgstr "" "Du må velge objekter for å utføre handlinger på dem. Ingen objekter har " "blitt endret." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Ingen handling valgt." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Opprett %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Endre %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Databasefeil" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valgt" msgstr[1] "Alle %(total_count)s valgt" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 av %(cnt)s valgt" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ble slettet." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Endringshistorikk: %s" @@ -411,7 +416,7 @@ msgstr "Filtrering" msgid "Delete" msgstr "Slett" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -422,7 +427,17 @@ msgstr "" "relaterte objekter, men du har ikke tillatelse til å slette følgende " "objekttyper:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Hvis du sletter %(object_name)s '%(escaped_object)s', vil også slette " +"relaterte objekter, men du har ikke tillatelse til å slette følgende " +"objekttyper:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -431,8 +446,8 @@ msgstr "" "Er du sikker på at du vil slette %(object_name)s \"%(escaped_object)s\"? " "Alle de følgende relaterte objektene vil bli slettet:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ja, jeg er sikker" @@ -440,21 +455,30 @@ msgstr "Ja, jeg er sikker" msgid "Delete multiple objects" msgstr "Slett flere objekter" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Sletting av %(object_name)s vil også slette relaterte objekter, men du har " "ikke tillatelse til å slette følgende objekttyper:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Sletting av %(object_name)s vil også slette relaterte objekter, men du har " +"ikke tillatelse til å slette følgende objekttyper:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Er du sikker på at du vil slette de valgte %(object_name)s-objektene? De " "følgende objektene og deres relaterte objekter vil bli slettet:" @@ -772,12 +796,12 @@ msgstr "Nullstill mitt passord" msgid "All dates" msgstr "Alle datoer" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Velg %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Velg %s du ønsker å endre" diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo Binary files differindex 418fd7174d..6ca544ffd7 100644 --- a/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/nl/LC_MESSAGES/django.po b/django/contrib/admin/locale/nl/LC_MESSAGES/django.po index d3ff9b23ec..4d15575f48 100644 --- a/django/contrib/admin/locale/nl/LC_MESSAGES/django.po +++ b/django/contrib/admin/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: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2008-08-28 13:58+0100\n" "Last-Translator: Rudolph Froger <rudolphfroger@estrate.nl>\n" "Language-Team: \n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s succesvol verwijderd." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Weet u het zeker?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Verwijder geselecteerde %(verbose_name_plural)s" @@ -127,114 +132,114 @@ msgstr "logregistraties" msgid "None" msgstr "Geen" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s gewijzigd." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "en" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" toegevoegd." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s aangepast voor %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" verwijderd." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Geen velden gewijzigd." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "De %(name)s \"%(obj)s\" is toegevoegd." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "U kunt dit hieronder weer bewerken." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "U kunt hieronder de volgende %s toevoegen." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Het wijzigen van %(name)s \"%(obj)s\" is geslaagd." -#: options.py:741 +#: options.py:753 #, 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." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "actietijd" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Toevoegen %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Wijzig %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Databasefout" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "De verwijdering van %(name)s \"%(obj)s\" is geslaagd." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Wijzigingsgeschiedenis: %s" @@ -410,7 +415,7 @@ msgstr "Filter" msgid "Delete" msgstr "Verwijderen" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -421,7 +426,17 @@ msgstr "" "gerelateerde objecten verwijderen. Echter u heeft geen rechten om de " "volgende typen objecten te verwijderen:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Het verwijderen van %(object_name)s '%(escaped_object)s' zal ook " +"gerelateerde objecten verwijderen. Echter u heeft geen rechten om de " +"volgende typen objecten te verwijderen:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -430,8 +445,8 @@ msgstr "" "Weet u zeker dat u %(object_name)s \"%(escaped_object)s\" wilt verwijderen? " "Alle volgende objecten worden verwijderd:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ja, ik weet het zeker" @@ -439,22 +454,32 @@ msgstr "Ja, ik weet het zeker" msgid "Delete multiple objects" msgstr "Verwijder meerdere objecten" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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:" + +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related 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:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Weet u zeker dat u %(object_name)s objecten wilt verwijderen? Alle volgende " "objecten worden verwijderd:" @@ -770,12 +795,12 @@ msgstr "Herstel mijn wachtwoord" msgid "All dates" msgstr "Alle data" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Selecteer %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Selecteer %s om te wijzigen" diff --git a/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo Binary files differindex a6d2629fa2..3dfbb41700 100644 --- a/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/nn/LC_MESSAGES/django.po b/django/contrib/admin/locale/nn/LC_MESSAGES/django.po index cca2934593..2a721c264e 100644 --- a/django/contrib/admin/locale/nn/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/nn/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-03-04 12:13+0200\n" "Last-Translator: Håvard Grimelid\n" "Language-Team: Norsk nynorsk <nn@li.org>\n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Sletta %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Er du sikker?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Slett valgte %(verbose_name_plural)s" @@ -127,60 +132,60 @@ msgstr "logginnlegg" msgid "None" msgstr "Ingen" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Endra %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "og" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Oppretta %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Endra %(list)s for %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Sletta %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Ingen felt endra." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" vart oppretta." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Du kan redigere vidare nedanfor." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Du kan opprette ny %s nedanfor." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" vart endra." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" vart endra Du kan redigere vidare nedanfor." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -188,54 +193,54 @@ msgstr "" "Objekt må vere valde for at dei skal kunne utførast handlingar på. Ingen " "object er endra." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Inga valt handling." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Opprett %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s-objekt med primærnøkkelen %(key)r eksisterer ikkje." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Rediger %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Databasefeil" -#: options.py:1095 +#: options.py:1107 #, 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 vart endra." msgstr[1] "%(count)s %(name)s vart endra." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valde" msgstr[1] "Alle %(total_count)s valde" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "Ingen av %(cnt)s valde" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" vart sletta." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Endringshistorikk: %s" @@ -411,7 +416,7 @@ msgstr "Filtrering" msgid "Delete" msgstr "Slett" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -421,7 +426,16 @@ msgstr "" "Dersom du slettar %(object_name)s '%(escaped_object)s', vil også slette " "relaterte objekt, men du har ikkje løyve til å slette følgande objekttypar:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Dersom du slettar %(object_name)s '%(escaped_object)s', vil også slette " +"relaterte objekt, men du har ikkje løyve til å slette følgande objekttypar:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -430,8 +444,8 @@ msgstr "" "Er du sikker på at du vil slette %(object_name)s \"%(escaped_object)s\"? " "Alle dei følgjande relaterte objekta vil bli sletta:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ja, eg er sikker" @@ -439,21 +453,30 @@ msgstr "Ja, eg er sikker" msgid "Delete multiple objects" msgstr "Slett fleire objekt" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Sletting av %(object_name)s vil også slette relaterte objekt, men du har " "ikkje løyve til å slette følgjande objekttypar:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Sletting av %(object_name)s vil også slette relaterte objekt, men du har " +"ikkje løyve til å slette følgjande objekttypar:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Er du sikker på at du vil slette desse %(object_name)s-objekta? Dei " "følgjande objekta og deira relaterte objekt vil bli sletta:" @@ -770,12 +793,12 @@ msgstr "Nullstill passordet" msgid "All dates" msgstr "Alle datoar" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Velg %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Velg %s du ønskar å redigere" diff --git a/django/contrib/admin/locale/no/LC_MESSAGES/django.mo b/django/contrib/admin/locale/no/LC_MESSAGES/django.mo Binary files differindex f9a0a26fcc..5a3cd4d815 100644 --- a/django/contrib/admin/locale/no/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/no/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/no/LC_MESSAGES/django.po b/django/contrib/admin/locale/no/LC_MESSAGES/django.po index b4266138a5..c2c36db42d 100644 --- a/django/contrib/admin/locale/no/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/no/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:11+0100\n" "PO-Revision-Date: 2010-03-11 14:22+0100\n" "Last-Translator: Christian Mikalsen and Jon Lønne\n" "Language-Team: Norsk <no@li.org>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Slettet %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Er du sikker?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Slett valgte %(verbose_name_plural)s" @@ -128,60 +133,60 @@ msgstr "logginnlegg" msgid "None" msgstr "Ingen" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Endret %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "og" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Opprettet %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Endret %(list)s for %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Slettet %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Ingen felt endret." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" ble opprettet." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Du kan redigere videre nedenfor." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Du kan opprette ny %s nedenfor." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ble endret." -#: options.py:741 +#: options.py:753 #, 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." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -189,54 +194,54 @@ msgstr "" "Du må velge objekter for å utføre handlinger på dem. Ingen objekter har " "blitt endret." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Ingen handling valgt." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Opprett %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Endre %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Databasefeil" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valgt" msgstr[1] "Alle %(total_count)s valgt" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 av %(cnt)s valgt" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ble slettet." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Endringshistorikk: %s" @@ -412,7 +417,7 @@ msgstr "Filtrering" msgid "Delete" msgstr "Slett" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -423,7 +428,17 @@ msgstr "" "relaterte objekter, men du har ikke tillatelse til å slette følgende " "objekttyper:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Hvis du sletter %(object_name)s '%(escaped_object)s', vil også slette " +"relaterte objekter, men du har ikke tillatelse til å slette følgende " +"objekttyper:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -432,8 +447,8 @@ msgstr "" "Er du sikker på at du vil slette %(object_name)s \"%(escaped_object)s\"? " "Alle de følgende relaterte objektene vil bli slettet:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ja, jeg er sikker" @@ -441,21 +456,30 @@ msgstr "Ja, jeg er sikker" msgid "Delete multiple objects" msgstr "Slett flere objekter" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Sletting av %(object_name)s vil også slette relaterte objekter, men du har " "ikke tillatelse til å slette følgende objekttyper:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Sletting av %(object_name)s vil også slette relaterte objekter, men du har " +"ikke tillatelse til å slette følgende objekttyper:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Er du sikker på at du vil slette de valgte %(object_name)s-objektene? De " "følgende objektene og deres relaterte objekter vil bli slettet:" @@ -773,12 +797,12 @@ msgstr "Nullstill mitt passord" msgid "All dates" msgstr "Alle datoer" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Velg %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Velg %s du ønsker å endre" diff --git a/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo Binary files differindex 6e8b35d981..c105216a2c 100644 --- a/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/pa/LC_MESSAGES/django.po b/django/contrib/admin/locale/pa/LC_MESSAGES/django.po index 0edf598426..ec4f30e5f6 100644 --- a/django/contrib/admin/locale/pa/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pa/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-10-15 22:47+0530\n" "Last-Translator: A S Alam <aalam@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n" @@ -18,11 +18,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਈਆਂ ਗਈਆਂ।" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਚਾਹੁੰਦੇ ਹੋ?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "ਚੁਣੇ %(verbose_name_plural)s ਹਟਾਓ" @@ -124,113 +129,113 @@ msgstr "ਲਾਗ ਐਂਟਰੀਆਂ" msgid "None" msgstr "ਕੋਈ ਨਹੀਂ" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s ਬਦਲਿਆ।" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ਅਤੇ" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ਸ਼ਾਮਲ ਕੀਤਾ।" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ਲਈ %(list)s ਨੂੰ ਬਦਲਿਆ" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ਹਟਾਇਆ ਗਿਆ।" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "ਕੋਈ ਖੇਤਰ ਨਹੀਂ ਬਦਲਿਆ।" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਇਆ ਗਿਆ ਹੈ।" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "ਤੁਸੀਂ ਇਸ ਨੂੰ ਹੇਠਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "ਤੁਸੀਂ ਇੱਕ ਹੋਰ %s ਹੇਠਾਂ ਜੋੜ ਸਕਦੇ ਹੋ।" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ਨੂੰ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ ਸੀ।" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਜੋੜਿਆ ਗਿਆ ਸੀ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਹੇਠਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "ਕੋਈ ਕਾਰਵਾਈ ਨਹੀਂ ਚੁਣੀ ਗਈ।" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s ਸ਼ਾਮਲ" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s ਬਦਲੋ" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "ਡਾਟਾਬੇਸ ਗਲਤੀ" -#: options.py:1095 +#: options.py:1107 #, 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 ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲੇ ਗਏ ਹਨ।" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s ਚੁਣਿਆ।" msgstr[1] "%(total_count)s ਚੁਣੇ" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਇਆ ਗਿਆ ਹੈ।" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "ਅਤੀਤ ਬਦਲੋ: %s" @@ -404,7 +409,7 @@ msgstr "ਫਿਲਟਰ" msgid "Delete" msgstr "ਹਟਾਓ" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -412,15 +417,22 @@ msgid "" "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: templates/admin/delete_confirmation.html:33 #, 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 "" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "ਹਾਂ, ਮੈਂ ਚਾਹੁੰਦਾ ਹਾਂ" @@ -428,19 +440,26 @@ msgstr "ਹਾਂ, ਮੈਂ ਚਾਹੁੰਦਾ ਹਾਂ" msgid "Delete multiple objects" msgstr "ਕਈ ਆਬਜੈਕਟ ਹਟਾਓ" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:24 #, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" #: templates/admin/filter.html:2 @@ -744,12 +763,12 @@ msgstr "ਮੇਰਾ ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰੋ" msgid "All dates" msgstr "ਸਭ ਮਿਤੀਆਂ" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s ਚੁਣੋ" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "ਬਦਲਣ ਲਈ %s ਚੁਣੋ" diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo Binary files differindex 7e05ddd80a..d66a3f38ed 100644 --- a/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/pl/LC_MESSAGES/django.po b/django/contrib/admin/locale/pl/LC_MESSAGES/django.po index e51592e1dc..5d8ebf63f1 100644 --- a/django/contrib/admin/locale/pl/LC_MESSAGES/django.po +++ b/django/contrib/admin/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: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2008-02-25 15:53+0100\n" "Last-Translator: Jarek Zgoda <jarek.zgoda@gmail.com>\n" "Language-Team: PL <pl@li.org>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Usunięto %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Jesteś pewien?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Usuń wybrane %(verbose_name_plural)s" @@ -128,91 +133,91 @@ msgstr "logi" msgid "None" msgstr "brak" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Zmieniono %s" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "i" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Dodano %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Zmieniono %(list)s w %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Usunięto %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Żadne pole nie zmienione." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" dodany pomyślnie." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Możesz ponownie edytować wpis poniżej." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Możesz dodać nowy wpis %s poniżej." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" zostało pomyślnie zmienione." -#: options.py:741 +#: options.py:753 #, 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." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "Wykonanie akcji wymaga wybrania obiektów. Żaden obiekt nie został zmieniony." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nie wybrano akcji." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Dodaj %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Zmień %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Błąd bazy danych" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -220,7 +225,7 @@ 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -228,17 +233,17 @@ msgstr[0] "%(total_count)s wybrany" msgstr[1] "%(total_count)s wybrane" msgstr[2] "%(total_count)s wybranych" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 z %(cnt)s wybranych" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" usunięty pomyślnie." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Historia zmian: %s" @@ -415,7 +420,7 @@ msgstr "Filtr" msgid "Delete" msgstr "Usuń" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -426,7 +431,17 @@ msgstr "" "zależnych obiektów, lecz nie posiadasz uprawnień do usunięcia następujących " "typów obiektów:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Skasowanie %(object_name)s '%(escaped_object)s' spowoduje usunięcie " +"zależnych obiektów, lecz nie posiadasz uprawnień do usunięcia następujących " +"typów obiektów:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -435,8 +450,8 @@ msgstr "" "Czy chcesz skasować %(object_name)s \"%(escaped_object)s\"? Następujące " "zależne obiekty zostaną skasowane:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Tak, na pewno" @@ -444,21 +459,30 @@ msgstr "Tak, na pewno" msgid "Delete multiple objects" msgstr "Usuwanie wielu obiektów" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Skasowanie %(object_name)s spowoduje usunięcie zależnych obiektów, lecz nie " "posiadasz uprawnień do usunięcia następujących typów obiektów:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Skasowanie %(object_name)s spowoduje usunięcie zależnych obiektów, lecz nie " +"posiadasz uprawnień do usunięcia następujących typów obiektów:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Czy chcesz skasować wybrane %(object_name)s? Następujące obiekty i zależne " "od nich zostaną skasowane:" @@ -773,12 +797,12 @@ msgstr "Zresetuj moje hasło" msgid "All dates" msgstr "Wszystkie daty" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Zaznacz %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Zaznacz %s aby zmienić" diff --git a/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo Binary files differindex d9275ee3a0..1181bc9b42 100644 --- a/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/pt/LC_MESSAGES/django.po b/django/contrib/admin/locale/pt/LC_MESSAGES/django.po index 64c9035af7..fd30c26c3f 100644 --- a/django/contrib/admin/locale/pt/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pt/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-03-09 10:45+0000\n" "Last-Translator: Nuno Mariz <nmariz@gmail.com>\n" "Language-Team: pt_PT <nmariz@gmail.com>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Foram removidos com sucesso %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Tem a certeza?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Remover %(verbose_name_plural)s seleccionados" @@ -127,54 +132,54 @@ msgstr "entradas de log" msgid "None" msgstr "Nenhum" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Foi modificado %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "e" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Foram adicionados %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Foram modificados %(list)s para %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Foram removidos %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Nenhum campo foi modificado." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado(a) com sucesso." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Pode editá-lo(a) outra vez abaixo." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Pode adicionar outro %s abaixo." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi modificado(a) com sucesso." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -182,7 +187,7 @@ msgstr "" "O(A) %(name)s \"%(obj)s\" foi adicionado(a) com sucesso. Pode voltar a " "editar novamente abaixo." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -190,54 +195,54 @@ msgstr "" "Os itens devem ser seleccionados de forma a efectuar acções sobre eles. " "Nenhum item foi modificado." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nenhuma acção seleccionada." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Adicionar %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Erro de base de dados" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionado" msgstr[1] "Todos %(total_count)s seleccionados" -#: options.py:1127 +#: options.py:1139 #, fuzzy, python-format msgid "0 of %(cnt)s selected" msgstr "de %(count)d seleccionado" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi removido(a) com sucesso." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Histórico de modificações: %s" @@ -413,7 +418,7 @@ msgstr "Filtro" msgid "Delete" msgstr "Remover" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -424,7 +429,17 @@ msgstr "" "objectos relacionados, mas a sua conta não tem permissão de remoção dos " "seguintes tipos de objectos:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related 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:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -433,8 +448,8 @@ msgstr "" "Tem a certeza que deseja remover %(object_name)s \"%(escaped_object)s\"? " "Todos os items relacionados seguintes irão ser removidos:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Sim, tenho a certeza" @@ -442,22 +457,32 @@ msgstr "Sim, tenho a certeza" msgid "Delete multiple objects" msgstr "Remover múltiplos objectos." -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related 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:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their 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:" @@ -779,12 +804,12 @@ msgstr "Reinicializar a minha palavra-passe" msgid "All dates" msgstr "Todas as datas" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Seleccionar %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Seleccione %s para modificar" diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo Binary files differindex 6b2abfae75..815e4dcc6c 100644 --- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po index 52f43a3c1e..2b5fc73ff0 100644 --- a/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-03-19 17:58-0300\n" "Last-Translator: Guilherme Gondim <semente@taurinus.org>\n" "Language-Team: Grupo de Localização para o Português <django-l10n-" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Removido %(count)d %(items)s com sucesso." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Tem certeza?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Remover %(verbose_name_plural)s selecionados" @@ -127,54 +132,54 @@ msgstr "entradas de log" msgid "None" msgstr "Nenhum" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Modificado %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "e" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Adicionado %(name)s \"%(object)s\"" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificado %(list)s para %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Deletado %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Nenhum campo modificado." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\": adicionado com sucesso." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Você pode editar novamente abaixo." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Você pode adicionar outro %s abaixo." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\": modificado com sucesso." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -182,7 +187,7 @@ msgstr "" "%(name)s \"%(obj)s\": adicionado com sucesso. Você pode editar novamente " "abaixo." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -190,54 +195,54 @@ msgstr "" "Os itens devem ser selecionados a fim de executar ações sobre eles. Nenhum " "item foi modificado." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nenhuma ação selecionada." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Adicionar %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Erro no banco de dados" -#: options.py:1095 +#: options.py:1107 #, 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s selecionado" msgstr[1] "Todos %(total_count)s selecionados" -#: options.py:1127 +#: options.py:1139 #, fuzzy, python-format msgid "0 of %(cnt)s selected" msgstr "de %(count)d selecionado" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\": excluído com sucesso." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Histórico de modificações: %s" @@ -413,7 +418,7 @@ msgstr "Filtro" msgid "Delete" msgstr "Apagar" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -424,7 +429,17 @@ msgstr "" "de objetos relacionados, mas sua conta não tem a permissão para remoção dos " "seguintes tipos de objetos:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"A remoção de '%(object_name)s' %(escaped_object)s pode resultar na remoção " +"de objetos relacionados, mas sua conta não tem a permissão para remoção dos " +"seguintes tipos de objetos:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -433,8 +448,8 @@ msgstr "" "Você tem certeza que quer remover %(object_name)s \"%(escaped_object)s\"? " "Todos os seguintes itens relacionados serão removidos:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Sim, tenho certeza" @@ -442,22 +457,32 @@ msgstr "Sim, tenho certeza" msgid "Delete multiple objects" msgstr "Remover múltiplos objetos" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 pode resultar na remoção de objetos " "relacionados, mas sua conta não tem a permissão para remoção dos seguintes " "tipos de objetos:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"A remoção de %(object_name)s pode resultar na remoção de objetos " +"relacionados, mas sua conta não tem a permissão para remoção dos seguintes " +"tipos de objetos:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Você tem certeza que quer remover os objetos %(object_name)s selecionados? " "Todos os seguintes objetos e seus itens relacionados serão removidos:" @@ -774,12 +799,12 @@ msgstr "Reinicializar minha senha" msgid "All dates" msgstr "Todas as datas" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Selecione %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Selecione %s para modificar" diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo Binary files differindex 2a625e41f5..43e423ce5d 100644 --- a/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ro/LC_MESSAGES/django.po b/django/contrib/admin/locale/ro/LC_MESSAGES/django.po index 1dd5ebd5d0..e4307e2676 100644 --- a/django/contrib/admin/locale/ro/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ro/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2008-04-25 21:44+0200\n" "Last-Translator: \n" "Language-Team: Romanian <ro@li.org>\n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Sunteți sigur?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -134,115 +139,115 @@ msgstr "intrări log" msgid "None" msgstr "unu" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Am schimbat %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "și" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Adaugă %(name)s" -#: options.py:617 +#: options.py:629 #, fuzzy, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "obiectele `%(label)s.%(name)s` asociate" -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "obiectele `%(label)s.%(name)s` asociate" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Nici-un câmp nu a fost schimbat." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" a fost inserat cu succes." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Vă puteți edita datele din nou mai jos." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Mai puteți adauga un alt %s mai jos." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" au fost modificate cu succes." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" au fost adăugate cu succes. Le puteți edita mai jos." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "timp acţiune" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Adaugă %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Schimbă %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Eroare de bază de date" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" au fost modificate cu succes." msgstr[1] "%(name)s \"%(obj)s\" au fost modificate cu succes." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" au fost șterse cu succes." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Schimbări făcute: %s" @@ -421,7 +426,7 @@ msgstr "Filtru" msgid "Delete" msgstr "Șterge" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -432,7 +437,17 @@ msgstr "" "obiectelor asociate, dar contul tău nu are permisiunea de a şterge " "următoarele tipuri de obiecte:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Ştergerea %(object_name)s '%(escaped_object)s' ar cauza și ştergerea " +"obiectelor asociate, dar contul tău nu are permisiunea de a şterge " +"următoarele tipuri de obiecte:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -441,8 +456,8 @@ msgstr "" "Eşti sigur că vrei să ştergi %(object_name)s \"%(escaped_object)s\"? " "Următoarele componente asociate vor fi şterse:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Da, sunt sigur" @@ -450,22 +465,32 @@ msgstr "Da, sunt sigur" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Ştergerea %(object_name)s '%(escaped_object)s' ar cauza și ştergerea " +"obiectelor asociate, dar contul tău nu are permisiunea de a şterge " +"următoarele tipuri de obiecte:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "Ştergerea %(object_name)s '%(escaped_object)s' ar cauza și ştergerea " "obiectelor asociate, dar contul tău nu are permisiunea de a şterge " "următoarele tipuri de obiecte:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Eşti sigur că vrei să ştergi %(object_name)s \"%(escaped_object)s\"? " "Următoarele componente asociate vor fi şterse:" @@ -794,12 +819,12 @@ msgstr "Resetează-mi parola" msgid "All dates" msgstr "Toate datele" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Selectează %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Selectează %s pentru schimbare" diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo Binary files differindex 9fc6750d91..891971c3c0 100644 --- a/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ru/LC_MESSAGES/django.po b/django/contrib/admin/locale/ru/LC_MESSAGES/django.po index 36eb915c0d..7adcf28f3d 100644 --- a/django/contrib/admin/locale/ru/LC_MESSAGES/django.po +++ b/django/contrib/admin/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: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-05-11 17:36+0300\n" "Last-Translator: alexey boriskin <sun.void@gmail.com>\n" "Language-Team: Russian\n" @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно удалены %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Вы уверены?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Удалить выбранные %(verbose_name_plural)s" @@ -131,54 +136,54 @@ msgstr "записи в журнале" msgid "None" msgstr "Нет" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Изменен %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "и" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Добавлен %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Изменены %(list)s для %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Удален %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Ни одно поле не изменено." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" был успешно добавлен." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Ниже вы можете снова его отредактировать." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Ниже вы можете добавить еще один %s." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" был успешно изменен." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -186,7 +191,7 @@ msgstr "" "%(name)s \"%(obj)s\" был успешно добавлен. Ниже вы можете снова его " "отредактировать." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -194,30 +199,30 @@ msgstr "" "Чтобы произвести действия над объектами, необходимо их выбрать. Объекты не " "были изменены." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Действие не выбрано." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Добавить %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s с первичным ключом %(key)r не существует." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Изменить %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Ошибка базы данных" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -225,7 +230,7 @@ msgstr[0] "%(count)s %(name)s был успешно изменен." msgstr[1] "%(count)s %(name)s были успешно изменены." msgstr[2] "%(count)s %(name)s были успешно изменены." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -233,17 +238,17 @@ msgstr[0] "Все объекты общим количеством %(total_count msgstr[1] "Выбраны все %(total_count)s объекта" msgstr[2] "Выбраны все %(total_count)s объектов" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "Выбрано 0 объектов из %(cnt)s " -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" был успешно удален." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "История изменений: %s" @@ -420,7 +425,7 @@ msgstr "Фильтр" msgid "Delete" msgstr "Удалить" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -431,7 +436,17 @@ msgstr "" "объектов, но ваша учетная запись не имеет прав для удаления следующих типов " "объектов:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Удаление %(object_name)s '%(escaped_object)s' приведет к удалению связанных " +"объектов, но ваша учетная запись не имеет прав для удаления следующих типов " +"объектов:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -440,8 +455,8 @@ msgstr "" "Вы уверены, что хотите удалить %(object_name)s \"%(escaped_object)s\"? Все " "следующие связанные объекты также будут удалены:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Да, я уверен" @@ -449,21 +464,30 @@ msgstr "Да, я уверен" msgid "Delete multiple objects" msgstr "Удалить несколько объектов" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 приведет к удалению связанных объектов, но ваша " "учетная запись не имеет прав для удаления следующих типов объектов:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Удаление %(object_name)s приведет к удалению связанных объектов, но ваша " +"учетная запись не имеет прав для удаления следующих типов объектов:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Вы уверены, что хотите удалить выбранные объекты типа \"%(object_name)s\"? " "Все следующие объекты (и все связанные с ними) также будут удалены:" @@ -782,12 +806,12 @@ msgstr "Восстановить мой пароль" msgid "All dates" msgstr "Все даты" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Выберите %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Выберите %s для изменения" diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo Binary files differindex d0d8592739..da7fc16e33 100644 --- a/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/sk/LC_MESSAGES/django.po b/django/contrib/admin/locale/sk/LC_MESSAGES/django.po index 3e21b878d3..792b7004c9 100644 --- a/django/contrib/admin/locale/sk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sk/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-05-08 16:32+0200\n" "Last-Translator: Martin Kosír <martin@martinkosir.net>\n" "Language-Team: Slovak <>\n" @@ -19,11 +19,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Úspešne zmazaných %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Ste si istý?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Zmazať označené %(verbose_name_plural)s" @@ -128,54 +133,54 @@ msgstr "položky záznamu" msgid "None" msgstr "Žiadne" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Zmenené %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "a" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Pridaný %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Zmenený %(list)s pre %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Zmazaný %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Polia nezmenené." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Nižšie môžete znova robiť úpravy." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Nižšie môžete pridať ďalšie %s." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne zmenený." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -183,7 +188,7 @@ msgstr "" "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný. Ďalšie zmeny môžete urobiť " "nižšie." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -191,30 +196,30 @@ msgstr "" "Položky musia byť vybrané, ak chcete na nich vykonať akcie. Neboli vybrané " "žiadne položky." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nebola vybraná žiadna akcia." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Pridať %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekt %(name)s s primárnym kľúčom %(key)r neexistuje." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Zmeniť %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Chyba databázy" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -222,7 +227,7 @@ msgstr[0] "%(count)s %(name)s bola úspešne zmenená." msgstr[1] "%(count)s %(name)s boli úspešne zmenené." msgstr[2] "%(count)s %(name)s bolo úspešne zmenených." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -230,17 +235,17 @@ msgstr[0] "%(total_count)s vybraná" msgstr[1] "Všetky %(total_count)s vybrané" msgstr[2] "Všetkých %(total_count)s vybraných" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 z %(cnt)s vybraných" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne vymazaný." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Zmeniť históriu: %s" @@ -417,7 +422,7 @@ msgstr "Filtrovať" msgid "Delete" msgstr "Odstrániť" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -428,7 +433,17 @@ msgstr "" "aj odstránenie súvisiacich objektov. Váš účet však nemá oprávnenie na " "odstránenie nasledujúcich typov objektov:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Odstránenie objektu %(object_name)s '%(escaped_object)s' by malo za následok " +"aj odstránenie súvisiacich objektov. Váš účet však nemá oprávnenie na " +"odstránenie nasledujúcich typov objektov:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -437,8 +452,8 @@ msgstr "" "Ste si istý, že chcete odstrániť objekt %(object_name)s \"%(escaped_object)s" "\"? Všetky nasledujúce súvisiace objekty budú odstránené:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Áno, som si istý" @@ -446,22 +461,32 @@ msgstr "Áno, som si istý" msgid "Delete multiple objects" msgstr "Zmazať viacero objektov" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Odstránenie objektu %(object_name)s by malo za následok aj odstránenie " "súvisiacich objektov, Váš účet však nemá oprávnenie na odstránenie " "nasledujúcich typov objektov:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Odstránenie objektu %(object_name)s by malo za následok aj odstránenie " +"súvisiacich objektov, Váš účet však nemá oprávnenie na odstránenie " +"nasledujúcich typov objektov:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Ste si istý, že chcete odstrániť objekty %(object_name)s? Budú odstránené " "nasledujúce objekty a položky s nimi súvisiace:" @@ -778,12 +803,12 @@ msgstr "Obnova môjho hesla" msgid "All dates" msgstr "Všetky dátumy" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Vybrať %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Vybrať \"%s\" na úpravu" diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo Binary files differindex 18ef60b032..b546510e25 100644 --- a/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/sl/LC_MESSAGES/django.po b/django/contrib/admin/locale/sl/LC_MESSAGES/django.po index b17e2445c9..1990733e61 100644 --- a/django/contrib/admin/locale/sl/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sl/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-05-08 13:47+0100\n" "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n" "Language-Team: <sl@li.org>\n" @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Uspešno izbrisano %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Ste prepričani?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Izbriši izbrano: %(verbose_name_plural)s" @@ -129,61 +134,61 @@ msgstr "dnevniški vnosi" msgid "None" msgstr "Brez vrednosti" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Spremenjen %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "in" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Dodal %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Spremenjeno %(list)s za %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Izbrisan %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Nobeno polje ni bilo spremenjeno." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" je bil uspešno dodan." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Vsebino lahko znova uredite spodaj." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Spodaj lahko dodate še en %s." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" je bil uspešno spremenjen." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" je bil uspešno dodan. Ponovno ga lahko uredite spodaj." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -191,30 +196,30 @@ msgstr "" "Izbrati morate vnose, nad katerimi želite izvesti operacijo. Noben vnos ni " "bil spremenjen." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Brez dejanja." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Dodaj %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekt %(name)s z glavnim ključem %(key)r ne obstaja." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Spremeni %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Napaka v podatkovni bazi" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -223,7 +228,7 @@ msgstr[1] "%(count)s %(name)s sta bila uspešno spremenjena." msgstr[2] "%(count)s %(name)s so bili uspešno spremenjeni." msgstr[3] "%(count)s %(name)s je bilo uspešno spremenjenih." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -232,17 +237,17 @@ msgstr[1] "%(total_count)s izbrana" msgstr[2] "%(total_count)s izbrani" msgstr[3] "%(total_count)s izbranih" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 od %(cnt)s izbranih" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" je bil uspešno izbrisan." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Zgodovina sprememb: %s" @@ -420,7 +425,7 @@ msgstr "Filter" msgid "Delete" msgstr "Izbriši" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -430,7 +435,16 @@ msgstr "" "Izbris %(object_name)s '%(escaped_object)s' bi pomenil izbris povezanih " "objektov, vendar nimate dovoljenja za izbris naslednjih tipov objektov:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Izbris %(object_name)s '%(escaped_object)s' bi pomenil izbris povezanih " +"objektov, vendar nimate dovoljenja za izbris naslednjih tipov objektov:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -439,8 +453,8 @@ msgstr "" "Ste prepričani, da želite izbrisati %(object_name)s \"%(escaped_object)s\"? " "Vsi naslednji povezani elementi bodo izbrisani:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ja, prepričan sem" @@ -448,21 +462,30 @@ msgstr "Ja, prepričan sem" msgid "Delete multiple objects" msgstr "Izbriši več objektov" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" "Izbris %(object_name)s bi pomenil izbris povezanih objektov, vendar nimate " "dovoljenja za izbris naslednjih tipov objektov:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Izbris %(object_name)s bi pomenil izbris povezanih objektov, vendar nimate " +"dovoljenja za izbris naslednjih tipov objektov:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Ste prepričani, da želite izbrisati izbrane objekte %(object_name)s? Vsi " "naslednji vnosi in povezani vnosi bodo izbrisani:" @@ -779,12 +802,12 @@ msgstr "Ponastavi moje geslo" msgid "All dates" msgstr "Vsi datumi" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Izberite %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Izberite %s, ki ga želite spremeniti" diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo Binary files differindex 498162e958..81c6f6d8b8 100644 --- a/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/sq/LC_MESSAGES/django.po b/django/contrib/admin/locale/sq/LC_MESSAGES/django.po index cc11585ac9..3a004197ee 100644 --- a/django/contrib/admin/locale/sq/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sq/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-01-27 23:01+0200\n" "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n" "Language-Team: Albanian <sq@li.org>\n" @@ -18,11 +18,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -121,113 +126,113 @@ msgstr "" msgid "None" msgstr "" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "" @@ -401,7 +406,7 @@ msgstr "" msgid "Delete" msgstr "" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -409,15 +414,22 @@ msgid "" "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: templates/admin/delete_confirmation.html:33 #, 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 "" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "" @@ -425,19 +437,26 @@ msgstr "" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:24 #, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" #: templates/admin/filter.html:2 @@ -734,12 +753,12 @@ msgstr "" msgid "All dates" msgstr "" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "" diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo Binary files differindex d186fccb82..79fccda39c 100644 --- a/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/sr/LC_MESSAGES/django.po b/django/contrib/admin/locale/sr/LC_MESSAGES/django.po index 533ca29e0d..632f81e831 100644 --- a/django/contrib/admin/locale/sr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sr/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-08-06 19:47+0100\n" "Last-Translator: Janos Guljas <janos@janos.in.rs>\n" "Language-Team: Branko Vukelic <bg.branko@gmail.com> & Janos Guljas " @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно обрисано: %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Да ли сте сигурни?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Бриши означене објекте класе %(verbose_name_plural)s" @@ -129,54 +134,54 @@ msgstr "записи у логовима" msgid "None" msgstr "Ништа" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Измењена поља %s" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "и" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Сачуван објекат „%(object)s“ класе %(name)s." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Измењена поља %(list)s објеката „%(object)s“ класе %(name)s ." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Обрисан објекат „%(object)s“ класе %(name)s." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Без измена у пољима." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Објекат „%(obj)s“ класе %(name)s сачуван је успешно." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Доле можете поново да уносите измене." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Доле можете да додате нови објекат класе %s" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Објекат „%(obj)s“ класе %(name)s измењен је успешно." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -184,7 +189,7 @@ msgstr "" "Објекат „%(obj)s“ класе %(name)s додат је успешно. Доле можете унети додатне " "измене." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -192,30 +197,30 @@ msgstr "" "Потребно је изабрати објекте да би се извршила акција над њима. Ниједан " "објекат није промењен." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Није изабрана ниједна акција." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Додај објекат класе %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Објекат класе %(name)s са примарним кључем %(key)r не постоји." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Измени објекат класе %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Грешка у бази података" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -223,7 +228,7 @@ msgstr[0] "%(count)s објекат класе %(name)s измењен је ус msgstr[1] "%(count)s објеката класе %(name)s измењени су успешно." msgstr[2] "%(count)s објекта класе %(name)s измењено је успешно." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -231,17 +236,17 @@ msgstr[0] "%(total_count)s изабран" msgstr[1] "%(total_count)s изабрано" msgstr[2] "%(total_count)s изабраних" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 од %(cnt)s изабрано" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Објекат „%(obj)s“ класе %(name)s успешно је обрисан." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Историјат измена: %s" @@ -418,7 +423,7 @@ msgstr "Филтер" msgid "Delete" msgstr "Обриши" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -429,7 +434,17 @@ msgstr "" "који су повезани са овим објектом, али ваш налог нема дозволе за брисање " "следећих типова објеката:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Уклањање %(object_name)s „%(escaped_object)s“ повлачи уклањање свих објеката " +"који су повезани са овим објектом, али ваш налог нема дозволе за брисање " +"следећих типова објеката:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -438,8 +453,8 @@ msgstr "" "Да сигурни да желите да обришете %(object_name)s „%(escaped_object)s“? " "Следећи објекти који су у вези са овим објектом ће такође бити обрисани:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Да, сигуран сам" @@ -447,22 +462,32 @@ msgstr "Да, сигуран сам" msgid "Delete multiple objects" msgstr "Брисање више објеката" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 повлачи уклањање свих објеката који су повезани са " "овим објектом, али ваш налог нема дозволе за брисање следећих типова " "објеката:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Уклањање %(object_name)s повлачи уклањање свих објеката који су повезани са " +"овим објектом, али ваш налог нема дозволе за брисање следећих типова " +"објеката:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Да сигурни да желите да обришете одабране %(object_name)s? Следећи објекти " "који су у вези са овим објектом ће такође бити обрисани:" @@ -778,12 +803,12 @@ msgstr "Ресетуј моју лозинку" msgid "All dates" msgstr "Сви датуми" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Одабери објекат класе %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Одабери објекат класе %s за измену" diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo Binary files differindex d0dae6a91d..19457fb3d0 100644 --- a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po index 02abba0174..e5aa5d6b69 100644 --- a/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-08-06 19:47+0100\n" "Last-Translator: Janos Guljas <janos@janos.in.rs>\n" "Language-Team: Branko Vukelic <bg.branko@gmail.com> & Janos Guljas " @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Uspešno obrisano: %(count)d %(items)s." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Da li ste sigurni?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Briši označene objekte klase %(verbose_name_plural)s" @@ -129,54 +134,54 @@ msgstr "zapisi u logovima" msgid "None" msgstr "Ništa" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Izmenjena polja %s" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "i" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Sačuvan objekat „%(object)s“ klase %(name)s." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Izmenjena polja %(list)s objekata „%(object)s“ klase %(name)s ." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Obrisan objekat „%(object)s“ klase %(name)s." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Bez izmena u poljima." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Objekat „%(obj)s“ klase %(name)s sačuvan je uspešno." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Dole možete ponovo da unosite izmene." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Dole možete da dodate novi objekat klase %s" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Objekat „%(obj)s“ klase %(name)s izmenjen je uspešno." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -184,7 +189,7 @@ msgstr "" "Objekat „%(obj)s“ klase %(name)s dodat je uspešno. Dole možete uneti dodatne " "izmene." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -192,30 +197,30 @@ msgstr "" "Potrebno je izabrati objekte da bi se izvršila akcija nad njima. Nijedan " "objekat nije promenjen." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "Nije izabrana nijedna akcija." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Dodaj objekat klase %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, 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." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Izmeni objekat klase %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Greška u bazi podataka" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -223,7 +228,7 @@ 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." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -231,17 +236,17 @@ msgstr[0] "%(total_count)s izabran" msgstr[1] "%(total_count)s izabrano" msgstr[2] "%(total_count)s izabranih" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 od %(cnt)s izabrano" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Objekat „%(obj)s“ klase %(name)s uspešno je obrisan." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Istorijat izmena: %s" @@ -418,7 +423,7 @@ msgstr "Filter" msgid "Delete" msgstr "Obriši" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -429,7 +434,17 @@ msgstr "" "objekata koji su povezani sa ovim objektom, ali vaš nalog nema dozvole za " "brisanje sledećih tipova objekata:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related 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:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -438,8 +453,8 @@ 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:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Da, siguran sam" @@ -447,22 +462,32 @@ msgstr "Da, siguran sam" msgid "Delete multiple objects" msgstr "Brisanje više objekata" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related 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:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their 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:" @@ -778,12 +803,12 @@ msgstr "Resetuj moju lozinku" msgid "All dates" msgstr "Svi datumi" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Odaberi objekat klase %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Odaberi objekat klase %s za izmenu" diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo b/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo Binary files differindex 5c018168b5..a2a0c69636 100644 --- a/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/sv/LC_MESSAGES/django.po b/django/contrib/admin/locale/sv/LC_MESSAGES/django.po index 04413d1a09..f246da0e3c 100644 --- a/django/contrib/admin/locale/sv/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/sv/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2008-05-26 11:15+0200\n" "Last-Translator: Mikko Hellsing <mikko@aino.se>\n" "Language-Team: Django I18N <Django-I18N@googlegroups.com>\n" @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "Tog bort %(count)d %(items)s" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Är du säker?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Tag bort markerade %(verbose_name_plural)s" @@ -129,115 +134,115 @@ msgstr "loggposter" msgid "None" msgstr "Inget" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Ändrade %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "och" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Lade till %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Ändrade %(list)s på %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Tog bort %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Inga fält ändrade." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" lades till." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Du kan ändra det igen nedanför." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Du kan lägga till ytterligare %s nedanför." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ändrades." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" lades till. Du kan redigera objektet igen nedanför." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "händelsetid" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Lägg till %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s-objekt med primärnyckel %(key)r finns inte." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Ändra %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Databasfel" -#: options.py:1095 +#: options.py:1107 #, 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 ändrades." msgstr[1] "%(count)s %(name)s ändrades." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" togs bort." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Ändringshistorik: %s" @@ -414,7 +419,7 @@ msgstr "Filter" msgid "Delete" msgstr "Radera" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -425,7 +430,17 @@ msgstr "" "relaterade objekt togs bort, men ditt konto har inte rättigheter att ta bort " "följande objekttyper:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Att ta bort %(object_name)s '%(escaped_object)s' skulle innebära att " +"relaterade objekt togs bort, men ditt konto har inte rättigheter att ta bort " +"följande objekttyper:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -434,8 +449,8 @@ msgstr "" "Är du säker på att du vill ta bort %(object_name)s \"%(escaped_object)s\"? " "Följande relaterade objekt kommer att tas bort:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Ja, jag är säker" @@ -443,21 +458,30 @@ msgstr "Ja, jag är säker" msgid "Delete multiple objects" msgstr "Tog bort %(name)s \"%(object)s\"." -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Att ta bort %(object_name)s skulle innebära att relaterade objekt togs bort, " +"men ditt konto har inte rättigheter att ta bort följande objekttyper:" + +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "Att ta bort %(object_name)s skulle innebära att relaterade objekt togs bort, " "men ditt konto har inte rättigheter att ta bort följande objekttyper:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Är du säker på att du vill ta bort %(object_name)s objekten? Följande " "relaterade objekt kommer att tas bort:" @@ -776,12 +800,12 @@ msgstr "Nollställ mitt lösenord" msgid "All dates" msgstr "Alla datum" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Välj %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Välj %s att ändra" diff --git a/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo b/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo Binary files differindex fff5baf89b..07c40b8731 100644 --- a/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/ta/LC_MESSAGES/django.po b/django/contrib/admin/locale/ta/LC_MESSAGES/django.po index 4eb5efd0ed..dccdad10d8 100644 --- a/django/contrib/admin/locale/ta/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/ta/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2007-03-15 16:48+0530\n" "Last-Translator: PONNUSAMY <ponnusamy.simpleman@gmail.com>\n" "Language-Team: tamil <tamilinix@yahoogroups.com>\n" @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "உறுதியாக சொல்கிறீர்களா?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -134,115 +139,115 @@ msgstr "புகுபதிவு உள்ளீடுகள்" msgid "None" msgstr "இல்லை" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s மாற்றபட்டுள்ளது." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "மற்றும்" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s சேர்க்க" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "மாதரி %s பக்கம் %s ல் இல்லை" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "எந்த புலமும் மாறவில்லை." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாகச் சேர்க்கப்பட்டது." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "நீங்கள் மறுபடியும் தொகுக்க முடியும். " -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "நீங்கள் மற்ற %s யை கீழே சேர்க்க முடியும்." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாக மாற்றப்பட்டது." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" வெற்றிகரமாக சேர்க்கப்பட்டுள்ளது. நீங்கள் கீழே தொகுக்க முடியும்." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "செயல் நேரம்" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s யை சேர்க்க" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s யை மாற்று" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "தகவல்சேமிப்பு பிழை" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" வெற்றிகரமாக மாற்றப்பட்டது." msgstr[1] "%(name)s \"%(obj)s\" வெற்றிகரமாக மாற்றப்பட்டது." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாக அழிக்கப்பட்டுள்ளது." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "வரலாற்றை மாற்று: %s" @@ -421,7 +426,7 @@ msgstr "வடிகட்டி" msgid "Delete" msgstr "நீக்குக" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -431,7 +436,16 @@ msgstr "" "நீக்கும் '%(escaped_object)s' ஆனது %(object_name)s தொடர்புடைய மற்றவற்றையும் நீக்கும். " "ஆனால் அதை நீக்குவதற்குரிய உரிமை உங்களுக்கு இல்லை" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"நீக்கும் '%(escaped_object)s' ஆனது %(object_name)s தொடர்புடைய மற்றவற்றையும் நீக்கும். " +"ஆனால் அதை நீக்குவதற்குரிய உரிமை உங்களுக்கு இல்லை" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -440,8 +454,8 @@ msgstr "" "நீங்கள் இந்த \"%(escaped_object)s\" %(object_name)s நீக்குவதில் நிச்சயமா?தொடர்புடைய " "மற்றவையும் நீக்கப்படும். " -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "ஆம், எனக்கு உறுதி" @@ -449,21 +463,30 @@ msgstr "ஆம், எனக்கு உறுதி" msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"நீக்கும் '%(escaped_object)s' ஆனது %(object_name)s தொடர்புடைய மற்றவற்றையும் நீக்கும். " +"ஆனால் அதை நீக்குவதற்குரிய உரிமை உங்களுக்கு இல்லை" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "நீக்கும் '%(escaped_object)s' ஆனது %(object_name)s தொடர்புடைய மற்றவற்றையும் நீக்கும். " "ஆனால் அதை நீக்குவதற்குரிய உரிமை உங்களுக்கு இல்லை" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "நீங்கள் இந்த \"%(escaped_object)s\" %(object_name)s நீக்குவதில் நிச்சயமா?தொடர்புடைய " "மற்றவையும் நீக்கப்படும். " @@ -790,12 +813,12 @@ msgstr "எனது கடவுச்சொல்லை மாற்றிய msgid "All dates" msgstr "அனைத்து தேதியும்" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s யை தேர்ந்தெடு" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "%s யை மாற்ற தேர்ந்தெடு" diff --git a/django/contrib/admin/locale/te/LC_MESSAGES/django.mo b/django/contrib/admin/locale/te/LC_MESSAGES/django.mo Binary files differindex 085511c515..0e72d68289 100644 --- a/django/contrib/admin/locale/te/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/te/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/te/LC_MESSAGES/django.po b/django/contrib/admin/locale/te/LC_MESSAGES/django.po index 080421b9d9..0b12bbf8f0 100644 --- a/django/contrib/admin/locale/te/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/te/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2008-09-09 21:24+0530\n" "Last-Translator: Thejaswi Puthraya <thejaswi.puthraya@gmail.com>\n" "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "మీరు కచ్చితంగా ఉన్నారా?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -127,114 +132,114 @@ msgstr "లాగ్ ఎంట్రీలు" msgid "None" msgstr "వొకటీ లేదు" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr " %s మార్చబడిండి" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "మరియు" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" జతచేయబడినధి" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" తొలగిబడినది" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "క్షేత్రములు ఏమి మార్చబడలేదు" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\"జయప్రదంగా కలపబడ్డడి" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "మీరు మళ్ళీ దీనినీ క్రింద మార్చవచ్చు" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "మీరు ఇంకొక %s ని క్రింద జత చేయొచ్చు" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" జయప్రదంగా మార్చబడిండి" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" జయప్రదంగా కలపబడ్డడి .మీరు మళ్ళీ దీనినీ క్రింద మార్చవచ్చు" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "పని సమయము " -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%sని జత చేయండి " -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%sని మార్చంది" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "దత్తాంశస్థానము పొరబాటు " -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" జయప్రదంగా మార్చబడిండి" msgstr[1] "%(name)s \"%(obj)s\" జయప్రదంగా మార్చబడిండి" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\"జయప్రదంగా తీసివేయబడ్డడి" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "చరిత్రం మార్చు: %s" @@ -409,7 +414,7 @@ msgstr "వడపోత" msgid "Delete" msgstr "తొలగించు" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -417,15 +422,22 @@ msgid "" "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: templates/admin/delete_confirmation.html:33 #, 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 "" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "అవును " @@ -434,19 +446,26 @@ msgstr "అవును " msgid "Delete multiple objects" msgstr "%(name)s \"%(object)s\" తొలగిబడినది" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:24 #, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" #: templates/admin/filter.html:2 @@ -751,12 +770,12 @@ msgstr "అనుమతిపదం తిరిగి అమర్చు" msgid "All dates" msgstr "అన్నీ తరీఖులు" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s ని ఎన్నుకోండి" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "%s ని మార్చటానికి ఎన్నుకోండి" diff --git a/django/contrib/admin/locale/th/LC_MESSAGES/django.mo b/django/contrib/admin/locale/th/LC_MESSAGES/django.mo Binary files differindex 956d013074..42a2846bae 100644 --- a/django/contrib/admin/locale/th/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/th/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/th/LC_MESSAGES/django.po b/django/contrib/admin/locale/th/LC_MESSAGES/django.po index a392057eb9..6980b18266 100644 --- a/django/contrib/admin/locale/th/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/th/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django-1.1-rc-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2009-07-28 22:31+0700\n" "Last-Translator: Kowit Charoenratchatabhan <kowito@felspar.com>\n" "Language-Team: Kowit Charoenratchatabhan<kowito@felspar.com>,Kadsarin " @@ -22,11 +22,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "แน่ใจหรือ" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -128,112 +133,112 @@ msgstr "log entries" msgid "None" msgstr "ไม่มี" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s เปลี่ยนแล้ว" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "และ" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "เพิ่ม %(name)s \"%(object)s\" แล้ว" -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "เปลี่ยน %(list)s สำหรับ %(name)s \"%(object)s\" แล้ว" -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "ลบ %(name)s \"%(object)s\" แล้ว" -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "ไม่มีฟิลด์ใดถูกเปลี่ยน" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "สามารถแก้ไขเพิ่มเติมได้ที่ด้านล่าง" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "คุณสามารถเพิ่ม %s ได้อีกที่ด้านล่าง" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว แก้ไขได้อีกที่ด้านล่าง" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "เวลาลงมือ" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "เพิ่ม %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "เปลี่ยน %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "เกิดความผิดพลาดที่ฐานข้อมูล" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "ลบ %(name)s \"%(obj)s\" เรียบร้อยแล้ว" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "เปลี่ยนแปลงประวัติ: %s" @@ -408,7 +413,7 @@ msgstr "ตัวกรอง" msgid "Delete" msgstr "ลบ" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -418,7 +423,16 @@ msgstr "" "กำลังดำเนินการลบ %(object_name)s '%(escaped_object)s'และจะแสดงผลการลบ " "แต่บัญชีของคุณไม่สามารถทำการลบข้อมูลชนิดนี้ได้" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"กำลังดำเนินการลบ %(object_name)s '%(escaped_object)s'และจะแสดงผลการลบ " +"แต่บัญชีของคุณไม่สามารถทำการลบข้อมูลชนิดนี้ได้" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -427,8 +441,8 @@ msgstr "" "คุณแน่ใจหรือที่จะลบ %(object_name)s \"%(escaped_object)s\"?" "ข้อมูลที่เกี่ยวข้องทั้งหมดจะถูกลบไปด้วย:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "ใช่, ฉันแน่ใจ" @@ -437,21 +451,30 @@ msgstr "ใช่, ฉันแน่ใจ" msgid "Delete multiple objects" msgstr "ลบ %(name)s \"%(object)s\" แล้ว" -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 '%(escaped_object)s'และจะแสดงผลการลบ " +"แต่บัญชีของคุณไม่สามารถทำการลบข้อมูลชนิดนี้ได้" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "กำลังดำเนินการลบ %(object_name)s '%(escaped_object)s'และจะแสดงผลการลบ " "แต่บัญชีของคุณไม่สามารถทำการลบข้อมูลชนิดนี้ได้" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "คุณแน่ใจหรือที่จะลบ %(object_name)s \"%(escaped_object)s\"?" "ข้อมูลที่เกี่ยวข้องทั้งหมดจะถูกลบไปด้วย:" @@ -758,12 +781,12 @@ msgstr "ตั้งรหัสผ่านของฉันใหม่" msgid "All dates" msgstr "ทุกวัน" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "เลือก %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "เลือก %s เพื่อเปลี่ยนแปลง" diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo b/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo Binary files differindex 79cc638559..6fedb59128 100644 --- a/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/tr/LC_MESSAGES/django.po b/django/contrib/admin/locale/tr/LC_MESSAGES/django.po index 7f872de763..e605b784a1 100644 --- a/django/contrib/admin/locale/tr/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/tr/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-05-02 01:06+0300\n" "Last-Translator: Metin Amiroff <amiroff@gmail.com>\n" "Language-Team: Turkish <bahadir@pardus.org.tr>\n" @@ -20,11 +20,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d adet %(items)s başarıyla silindi." -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Emin misiniz?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Seçili %(verbose_name_plural)s nesnelerini sil" @@ -127,61 +132,61 @@ msgstr "log kayıtları" msgid "None" msgstr "Hiç biri" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s değiştirildi." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "ve" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" eklenmiştir." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s %(name)s \"%(object)s\" ile değiştirildi." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" silinmiştir." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Hiçbir alan değiştirilmedi." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "\"%(obj)s\" isimli %(name)s eklendi." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Tekrar düzenleyebilirsiniz." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Yeni bir %s ekleyebilirsiniz." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "\"%(obj)s\" isimli %(name)s değiştirildi." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "\"%(obj)s\" isimli %(name)s eklendi. Aşağıda tekrar düzenleyebilirsiniz." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -189,52 +194,52 @@ msgstr "" "İşlemlerin uygulanabilmesi için bir veya daha fazla nesne seçilmelidir. " "Herhangi bir değişiklik gerçekleştirilmedi." -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "İşlem seçimi yapılmamış. Lütfen bir işlem seçiniz." -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "%s ekle" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r birincil anahtarına sahip %(name)s nesnesi mevcut değil." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "%s değiştir" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Veritabanı hatası" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s adet %(name)s başarıyla değiştirildi." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "Toplam %(total_count)s nesne seçili" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s nesne arasından seçim yapılmamış" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "\"%(obj)s\" isimli %(name)s silindi." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "%s için değişiklik geçmişi:" @@ -409,7 +414,7 @@ msgstr "Filtrele" msgid "Delete" msgstr "Sil" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -420,7 +425,17 @@ msgstr "" "nesnelerin silinmesini gerektiriyor, ancak aşağıdaki nesneleri silme " "yetkiniz yok." -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"'%(escaped_object)s' isimli %(object_name)s nesnesini silmek, bağlantılı " +"nesnelerin silinmesini gerektiriyor, ancak aşağıdaki nesneleri silme " +"yetkiniz yok." + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -429,8 +444,8 @@ msgstr "" "\"%(escaped_object)s\" isimli %(object_name)s nesnesini silmek " "istediğinizden emin misiniz? Aşağıdaki bağlantılı öğeler silinecek:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Evet, eminim" @@ -438,21 +453,30 @@ msgstr "Evet, eminim" msgid "Delete multiple objects" msgstr "Birden fazla nesneyi sil" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_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 isimli nesneyi silmek, bağlantılı nesnelerin silinmesini " "gerektiriyor, fakat aşağıdaki nesneleri silme yetkiniz yok:" -#: templates/admin/delete_selected_confirmation.html:22 -#, python-format +#: templates/admin/delete_selected_confirmation.html:24 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"%(object_name)s isimli nesneyi silmek, bağlantılı nesnelerin silinmesini " +"gerektiriyor, fakat aşağıdaki nesneleri silme yetkiniz yok:" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "%(object_name)s nesnelerini silmek istediğinizden emin misiniz? Aşağıdaki " "nesneler ve bağlantılı öğeleri de silinecektir:" @@ -770,12 +794,12 @@ msgstr "Şifremi sıfırla" msgid "All dates" msgstr "Tüm tarihler" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "%s seç" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Değiştirilecek %s nesnesini seçin" diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo b/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo Binary files differindex e20ab0e215..1a4420a107 100644 --- a/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/uk/LC_MESSAGES/django.po b/django/contrib/admin/locale/uk/LC_MESSAGES/django.po index 4a4c094e16..58ac66e7a6 100644 --- a/django/contrib/admin/locale/uk/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/uk/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-04-06 00:02+0300\n" "Last-Translator: Mykola Zamkovoy <nickzam@gmail.com>\n" "Language-Team: UK <uk@li.org>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Ви впевнені?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -132,54 +137,54 @@ msgstr "реєстрування записів" msgid "None" msgstr "Ніщо" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "Змінено %s." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "та" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Додано %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Змінено %(list)s для %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Видалено %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Поля не змінені." -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" було додано успішно." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Ви можете редагувати це знову внизу." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Ви можете додати інший %s внизу." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" був успішно змінений." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -187,37 +192,37 @@ msgstr "" "%(name)s \"%(obj)s\" був успішно доданий. Ви модете редагувати його знову " "внизу." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "час дії" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Додати %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s об'єкт з первинним ключем %(key)r не існує." -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Змінити %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Помилка бази даних" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -225,7 +230,7 @@ msgstr[0] "%(name)s \"%(obj)s\" був успішно змінений." msgstr[1] "%(name)s \"%(obj)s\" був успішно змінений." msgstr[2] "%(name)s \"%(obj)s\" був успішно змінений." -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -233,17 +238,17 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" був видалений успішно." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Історія змін: %s" @@ -421,7 +426,7 @@ msgstr "Відфільтрувати" msgid "Delete" msgstr "Видалити" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -432,7 +437,17 @@ msgstr "" "пов'язаних об'єктів, але ваш реєстраційний запис не має дозволу видаляти " "наступні типи об'єктів:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Видалення %(object_name)s '%(escaped_object)s' призведе до видалення " +"пов'язаних об'єктів, але ваш реєстраційний запис не має дозволу видаляти " +"наступні типи об'єктів:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -441,8 +456,8 @@ msgstr "" "Ви впевнені що хочете видалити %(object_name)s \"%(escaped_object)s\"? Всі " "пов'язані записи, що перелічені, будуть видалені:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Так, я впевнений" @@ -451,22 +466,32 @@ msgstr "Так, я впевнений" msgid "Delete multiple objects" msgstr "Видалено %(name)s \"%(object)s\"." -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 '%(escaped_object)s' призведе до видалення " +"пов'язаних об'єктів, але ваш реєстраційний запис не має дозволу видаляти " +"наступні типи об'єктів:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "Видалення %(object_name)s '%(escaped_object)s' призведе до видалення " "пов'язаних об'єктів, але ваш реєстраційний запис не має дозволу видаляти " "наступні типи об'єктів:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "Ви впевнені що хочете видалити %(object_name)s \"%(escaped_object)s\"? Всі " "пов'язані записи, що перелічені, будуть видалені:" @@ -785,12 +810,12 @@ msgstr "Перевстановіть мій пароль" msgid "All dates" msgstr "Всі дати" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Вибрати %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Виберіть %s щоб змінити" diff --git a/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo b/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo Binary files differindex 8020d4b217..f2d43c4064 100644 --- a/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/vi/LC_MESSAGES/django.po b/django/contrib/admin/locale/vi/LC_MESSAGES/django.po index 6d109ee127..cc2e4cf821 100644 --- a/django/contrib/admin/locale/vi/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/vi/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2010-02-07 16:11+0700\n" "Last-Translator: Hung. NGUYEN Manh <loveleeyoungae@yahoo.com>\n" "Language-Team: Vietnamese <vi@li.org>\n" @@ -18,11 +18,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "Bạn có chắc chắn không?" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -121,54 +126,54 @@ msgstr "" msgid "None" msgstr "Không" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s đã được thay đổi." -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "và" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" đã được thêm vào." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s for %(name)s \"%(object)s\" đã được thay đổi." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" đã bị xóa." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "Không có trường nào thay đổi" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" được thêm vào thành công." -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "Bạn có thể sửa lại dưới đây." -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "Bạn có thể thêm vào %s dưới đây." -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" đã được thay đổi thành công." -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -176,59 +181,59 @@ msgstr "" "%(name)s \"%(obj)s\" đã được thêm vào thành công. Bạn có thể sửa lại dưới " "đây." -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 msgid "No action selected." msgstr "" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "Thêm %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "Thay đổi %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "Cơ sở dữ liệu bị lỗi" -#: options.py:1095 +#: options.py:1107 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" đã được xóa thành công." -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "Thay đổi bản ghi: %s" @@ -403,7 +408,7 @@ msgstr "Bộ lọc" msgid "Delete" msgstr "Xóa" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -413,7 +418,16 @@ msgstr "" "Xóa %(object_name)s '%(escaped_object)s' sẽ làm mất những dữ liệu có liên " "quan. Tài khoản của bạn không được cấp quyển xóa những dữ liệu đi kèm theo." -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Xóa %(object_name)s '%(escaped_object)s' sẽ làm mất những dữ liệu có liên " +"quan. Tài khoản của bạn không được cấp quyển xóa những dữ liệu đi kèm theo." + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -422,8 +436,8 @@ msgstr "" "Bạn có chắc là muốn xóa %(object_name)s \"%(escaped_object)s\"?Tất cả những " "dữ liệu đi kèm dưới đây cũng sẽ bị mất:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "Có, tôi chắc chắn." @@ -431,20 +445,31 @@ msgstr "Có, tôi chắc chắn." msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:15 -#, python-format +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, 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:" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" +"Xóa %(object_name)s '%(escaped_object)s' sẽ làm mất những dữ liệu có liên " +"quan. Tài khoản của bạn không được cấp quyển xóa những dữ liệu đi kèm theo." -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:24 #, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" + +#: templates/admin/delete_selected_confirmation.html:32 +#, fuzzy, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" +"Bạn có chắc là muốn xóa %(object_name)s \"%(escaped_object)s\"?Tất cả những " +"dữ liệu đi kèm dưới đây cũng sẽ bị mất:" #: templates/admin/filter.html:2 #, python-format @@ -750,12 +775,12 @@ msgstr "Làm lại mật khẩu" msgid "All dates" msgstr "Tất cả các ngày" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "Chọn %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "Chọn %s để thay đổi" diff --git a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo Binary files differindex 0fa3793411..775f6591e6 100644 --- a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po index ad01f3c4c9..926f3d24c7 100644 --- a/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2009-07-23 11:47+0800\n" "Last-Translator: Qing Feng <paradise.qingfeng@gmail.com>\n" "Language-Team: Simplified Chinese <paradise.qingfeng@gmail.com>\n" @@ -21,11 +21,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "删除了%(count)d的%(items)s" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "你确认吗？" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "删除了选择的%(verbose_name_plural)s" @@ -127,112 +132,112 @@ msgstr "日志记录" msgid "None" msgstr "无" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "已修改 %s 。" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "和" -#: options.py:613 +#: options.py:625 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "已添加 %(name)s \"%(object)s\"." -#: options.py:617 +#: options.py:629 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "已变更 %(list)s for %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "已删除 %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "没有字段被修改。" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" 添加成功。" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "你可以在下面再次编辑它。" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "你可以在下面增加另一个 %s 。" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" 修改成功。" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "动作时间" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "增加 %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "具有主键 %(key)r 的对象 %(name)s 不存在。" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "修改 %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "数据库错误" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" 修改成功。" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 删除成功。" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "变更历史： %s" @@ -407,7 +412,7 @@ msgstr "过滤器" msgid "Delete" msgstr "删除" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -417,7 +422,16 @@ msgstr "" "删除 %(object_name)s '%(escaped_object)s' 会导致删除相关的对象，但你的帐号无" "权删除下列类型的对象：" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"删除 %(object_name)s '%(escaped_object)s' 会导致删除相关的对象，但你的帐号无" +"权删除下列类型的对象：" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -426,8 +440,8 @@ msgstr "" "你确认想要删除 %(object_name)s \"%(escaped_object)s\"？ 下列所有相关的项目都" "将被删除：" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "是的，我确定" @@ -436,21 +450,30 @@ msgstr "是的，我确定" msgid "Delete multiple objects" msgstr "已删除 %(name)s \"%(object)s\"." -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 '%(escaped_object)s' 会导致删除相关的对象，但你的帐号无" +"权删除下列类型的对象：" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "删除 %(object_name)s '%(escaped_object)s' 会导致删除相关的对象，但你的帐号无" "权删除下列类型的对象：" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "你确认想要删除 %(object_name)s \"%(escaped_object)s\"？ 下列所有相关的项目都" "将被删除：" @@ -757,12 +780,12 @@ msgstr "重设我的密码" msgid "All dates" msgstr "所有日期" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "选择 %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "选择 %s 来修改" diff --git a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo Binary files differindex 20e965515e..50125be39a 100644 --- a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo +++ b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo diff --git a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po index c28d7fe1ae..2a9d90628a 100644 --- a/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-29 00:22+0100\n" +"POT-Creation-Date: 2011-01-20 16:12+0100\n" "PO-Revision-Date: 2007-04-05 01:32+1000\n" "Last-Translator: Terry Huang <terryh.tp@gmail.com>\n" "Language-Team: Terry Huang <terryh.tp@gmail.com>\n" @@ -18,11 +18,16 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:56 options.py:1185 +#: actions.py:61 options.py:1199 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: actions.py:63 options.py:1201 msgid "Are you sure?" msgstr "你確定嗎？" -#: actions.py:74 +#: actions.py:85 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" @@ -126,112 +131,112 @@ msgstr "紀錄項目" msgid "None" msgstr "無" -#: options.py:608 +#: options.py:620 #, python-format msgid "Changed %s." msgstr "%s 已變更。" -#: options.py:608 options.py:618 +#: options.py:620 options.py:630 msgid "and" msgstr "和" -#: options.py:613 +#: options.py:625 #, fuzzy, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "新增 %(name)s" -#: options.py:617 +#: options.py:629 #, fuzzy, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "已變更 %(list)s for %(name)s \"%(object)s\"." -#: options.py:622 +#: options.py:634 #, fuzzy, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "已删除 %(name)s \"%(object)s\"." -#: options.py:626 +#: options.py:638 msgid "No fields changed." msgstr "沒有欄位被變更。" -#: options.py:698 +#: options.py:710 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" 已成功新增。" -#: options.py:702 options.py:735 +#: options.py:714 options.py:747 msgid "You may edit it again below." msgstr "你可以在下面再次編輯。" -#: options.py:712 options.py:745 +#: options.py:724 options.py:757 #, python-format msgid "You may add another %s below." msgstr "你可以在下面新增另一個 %s。" -#: options.py:733 +#: options.py:745 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" 已成功變更。" -#: options.py:741 +#: options.py:753 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" 新增成功。你可以在下面再次编輯它。" -#: options.py:795 options.py:1053 +#: options.py:807 options.py:1065 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:814 +#: options.py:826 #, fuzzy msgid "No action selected." msgstr "動作時間" -#: options.py:895 +#: options.py:907 #, python-format msgid "Add %s" msgstr "新增 %s" -#: options.py:921 options.py:1162 +#: options.py:933 options.py:1174 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:986 +#: options.py:998 #, python-format msgid "Change %s" msgstr "變更 %s" -#: options.py:1033 +#: options.py:1045 msgid "Database error" msgstr "資料庫錯誤" -#: options.py:1095 +#: options.py:1107 #, fuzzy, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s \"%(obj)s\" 已成功變更。" -#: options.py:1122 +#: options.py:1134 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1127 +#: options.py:1139 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1178 +#: options.py:1190 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 已成功刪除。" -#: options.py:1215 +#: options.py:1235 #, python-format msgid "Change history: %s" msgstr "變更歷史: %s" @@ -408,7 +413,7 @@ msgstr "過濾器" msgid "Delete" msgstr "刪除" -#: templates/admin/delete_confirmation.html:16 +#: templates/admin/delete_confirmation.html:17 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -418,7 +423,16 @@ msgstr "" "刪除 %(object_name)s '%(escaped_object)s' 會把相關的物件也刪除，不過你的帳號" "並沒有刪除以下型態物件的權限:" -#: templates/admin/delete_confirmation.html:23 +#: templates/admin/delete_confirmation.html:25 +#, fuzzy, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"刪除 %(object_name)s '%(escaped_object)s' 會把相關的物件也刪除，不過你的帳號" +"並沒有刪除以下型態物件的權限:" + +#: templates/admin/delete_confirmation.html:33 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -427,8 +441,8 @@ msgstr "" "你確定想要刪除 %(object_name)s \"%(escaped_object)s\"？以下所有的相關項目都會" "被刪除:" -#: templates/admin/delete_confirmation.html:28 -#: templates/admin/delete_selected_confirmation.html:33 +#: templates/admin/delete_confirmation.html:38 +#: templates/admin/delete_selected_confirmation.html:43 msgid "Yes, I'm sure" msgstr "是的，我確定" @@ -437,21 +451,30 @@ msgstr "是的，我確定" msgid "Delete multiple objects" msgstr "已删除 %(name)s \"%(object)s\"." -#: templates/admin/delete_selected_confirmation.html:15 +#: templates/admin/delete_selected_confirmation.html:16 +#, fuzzy, python-format +msgid "" +"Deleting the selected %(objects_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 '%(escaped_object)s' 會把相關的物件也刪除，不過你的帳號" +"並沒有刪除以下型態物件的權限:" + +#: templates/admin/delete_selected_confirmation.html:24 #, fuzzy, 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:" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" msgstr "" "刪除 %(object_name)s '%(escaped_object)s' 會把相關的物件也刪除，不過你的帳號" "並沒有刪除以下型態物件的權限:" -#: templates/admin/delete_selected_confirmation.html:22 +#: templates/admin/delete_selected_confirmation.html:32 #, fuzzy, python-format msgid "" -"Are you sure you want to delete the selected %(object_name)s objects? All of " -"the following objects and their related items will be deleted:" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" msgstr "" "你確定想要刪除 %(object_name)s \"%(escaped_object)s\"？以下所有的相關項目都會" "被刪除:" @@ -769,12 +792,12 @@ msgstr "重設我的密碼" msgid "All dates" msgstr "所有日期" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s" msgstr "選擇 %s" -#: views/main.py:65 +#: views/main.py:68 #, python-format msgid "Select %s to change" msgstr "選擇 %s 來變更" |