diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 552ee001e9..5c8cacee7c 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -34,6 +34,7 @@ LANGUAGE_CODE = 'en-us' # Languages we provide translations for, out of the box. The language name # should be the utf-8 encoded local name for the language. LANGUAGES = ( + ('bn', _('Bengali')), ('cs', _('Czech')), ('cy', _('Welsh')), ('de', _('German')), diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo new file mode 100644 index 0000000000..4a9abb383a Binary files /dev/null and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po new file mode 100644 index 0000000000..de7dfe4ad7 --- /dev/null +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -0,0 +1,987 @@ +# django.bn.po -- Bengali (bn) translation of Django core +# Copyright (C) 2005 Django Authors +# This file is distributed under the same license as the Django package. +# Baishampayan Ghose , 2005. +# +# +msgid "" +msgstr "" +"Project-Id-Version: Django CVS\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-11-10 05:53-0600\n" +"PO-Revision-Date: 2005-11-10 06:11+0530\n" +"Last-Translator: Baishampayan Ghose \n" +"Language-Team: Bengali \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: contrib/admin/models/admin.py:6 +msgid "action time" +msgstr "কাজ সময়" + +#: contrib/admin/models/admin.py:9 +msgid "object id" +msgstr "বস্তু আই.ডি." + +#: contrib/admin/models/admin.py:10 +msgid "object repr" +msgstr "বস্তু repr" + +#: contrib/admin/models/admin.py:11 +msgid "action flag" +msgstr "কাজ ফ্ল্যাগ" + +#: contrib/admin/models/admin.py:12 +msgid "change message" +msgstr "বার্তা পরিবর্তন" + +#: contrib/admin/models/admin.py:15 +msgid "log entry" +msgstr "কার্যবিবরণী এন্ট্রি" + +#: contrib/admin/models/admin.py:16 +msgid "log entries" +msgstr "কার্যবিবরণী এন্ট্রি সমুহ" + +#: contrib/admin/templates/admin/object_history.html:5 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Home" +msgstr "বাড়ি" + +#: contrib/admin/templates/admin/object_history.html:5 +msgid "History" +msgstr "ইতিহাস" + +#: contrib/admin/templates/admin/object_history.html:18 +msgid "Date/time" +msgstr "তারিখ/সময়" + +#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47 +msgid "User" +msgstr "ব্যবহারকারী" + +#: contrib/admin/templates/admin/object_history.html:20 +msgid "Action" +msgstr "কাজ" + +#: contrib/admin/templates/admin/object_history.html:26 +msgid "DATE_WITH_TIME_FULL" +msgstr "N j, Y, P" + +#: contrib/admin/templates/admin/object_history.html:36 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"এই বস্তুটি একটি পরিবর্তন ইতিহাস নেই। এইটি এই অ্যাডমিন স্থান দ্বারা সম্ভবত যোগ করা " +"হয় নি।" + +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "জ্যাঙ্গো স্থান অ্যাডমিন" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "জ্যাঙ্গো পরিচালনা" + +#: contrib/admin/templates/admin/500.html:4 +msgid "Server error" +msgstr "সার্ভার ত্রুটি" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "সার্ভার ত্রুটি (৫০০)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "সার্ভার ত্রুটি(৫০০)" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"একটি ত্রুটি আছে। এইটি স্থান পরিচালককে ই-মেল দ্বারা প্রতিবেদন করা হয়েছে এবং খুব " +"তাড়াতাড়ি মেরামত করা হবে। আপনার ধৈর্য্যের জন্য ধন্যবাদ।" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "পাতা খুঁজে পাওয়া গেল না" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "আমরা দুঃখিত, কিন্তু আবেদনকৃত পাতা খুঁজে পাওয়া গেল না।" + +#: contrib/admin/templates/admin/index.html:27 +msgid "Add" +msgstr "যোগ করুন" + +#: contrib/admin/templates/admin/index.html:33 +msgid "Change" +msgstr "পরিবর্তন" + +#: contrib/admin/templates/admin/index.html:43 +msgid "You don't have permission to edit anything." +msgstr "আপনার কোন কিছু সম্পাদনা করতে অনুমতি নেই।" + +#: contrib/admin/templates/admin/index.html:51 +msgid "Recent Actions" +msgstr "সাম্প্রতিক কাজ" + +#: contrib/admin/templates/admin/index.html:52 +msgid "My Actions" +msgstr "আমার কাজ" + +#: contrib/admin/templates/admin/index.html:56 +msgid "None available" +msgstr "কিছুই পাওয়া যাচ্ছে না" + +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "ব্যবহারকারীর নাম:" + +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "পাসওয়ার্ড:" + +#: contrib/admin/templates/admin/login.html:20 +msgid "Have you forgotten your password?" +msgstr "আপনি কি আপনার পাসওয়ার্ড ভুলে গেছেন?" + +#: contrib/admin/templates/admin/login.html:24 +msgid "Log in" +msgstr "প্রবেশ করুন" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "স্বাগত," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "পাসওয়ার্ড পরিবর্তন করুন" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "বাইরে যান" + +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"%(object_name)s '%(object)s' মুছে ফেললে তা সম্পর্কিত বস্তুও মুছে ফেলা হবে কিন্তু " +"আপনার অ্যাকাউন্টে বস্তুর নিম্নলিখিত ধরন মুছে ফেলার অনুমতি নেই:" + +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"%(object_name)s\" %(object)s\" মুছে ফেলতে আপনি কি নিশ্চিত? নিম্নলিখিত সম্পর্কিত " +"বস্তুর সব মুছে ফেলা হবে:" + +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "হ্যাঁ, আমি নিশ্চিত" + +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_change_form.html:6 +#: contrib/admin/templates/registration/password_change_form.html:10 +msgid "Password change" +msgstr "পাসওয়ার্ড পরিবর্তন" + +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_done.html:10 +msgid "Password change successful" +msgstr "পাসওয়ার্ড পরিবর্তন সফল" + +#: contrib/admin/templates/registration/password_change_done.html:12 +msgid "Your password was changed." +msgstr "আপনার পাসওয়ার্ড পরিবর্তন করা হয়েছিল।" + +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "পাসওয়ার্ড রিসেট" + +#: contrib/admin/templates/registration/password_reset_form.html:12 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll reset " +"your password and e-mail the new one to you." +msgstr "" +"আপনি কি আপনার পাসওয়ার্ড ভুলে গেছেন? আপনার ই-মেল ঠিকানা নিচে দিন এবং আমরা আপনার " +"পাসওয়ার্ড রিসেট করে এবং আপনাকে নতুন এক পাসওয়ার্ড ই-মেল করে দেব।" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "ই-মেল ঠিকানা:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "আমার পাসওয়ার্ড রিসেট করুন" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "এই ওয়েব স্থানে আপনার কিছু সময় খরচ করার জন্য ধন্যবাদ।" + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "আবার প্রবেশ করুন" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "পাসওয়ার্ড রিসেট সফল" + +#: contrib/admin/templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"আমরা আপনাকে একটি নতুন পাসওয়ার্ড আপনার দেওয়া ই-মেল ঠিকানায় পাঠিয়ে দিয়েছি। আপনার " +"তা খুব তাড়াতাড়ি পাওয়া উচিত।" + +#: contrib/admin/templates/registration/password_change_form.html:12 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"দয়া করে আপনার পুরনো পাসওয়ার্ড ঢোকান, নিরাপত্তার জন্য, এবংএর জন্য তারপর আপনার নতুন " +"পাসওয়ার্ড দুবার ঢোকান যাতে আমরা সঠিকভাবেতে তার বৈধতা পরীক্ষণ করতে পারি।" + +#: contrib/admin/templates/registration/password_change_form.html:17 +msgid "Old password:" +msgstr "পুরনো পাসওয়ার্ড:" + +#: contrib/admin/templates/registration/password_change_form.html:19 +msgid "New password:" +msgstr "নতুন পাসওয়ার্ড:" + +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Confirm password:" +msgstr "পাসওয়ার্ড দৃঢ়তরভাবে প্রতিপন্ন করুন:" + +#: contrib/admin/templates/registration/password_change_form.html:23 +msgid "Change my password" +msgstr "আমার পাসওয়ার্ড পরিবর্তন করুন" + +#: contrib/admin/templates/registration/password_reset_email.html:2 +msgid "You're receiving this e-mail because you requested a password reset" +msgstr "আপনি এই ই-মেলটি পাচ্ছেন কারণ আপনি একটি পাসওয়ার্ড রিসেট অনুরোধ করেছেন" + +#: contrib/admin/templates/registration/password_reset_email.html:3 +#, python-format +msgid "for your user account at %(site_name)s" +msgstr "%(site_name)s আপনার ব্যবহারকারী অ্যাকাউন্টের জন্য" + +#: contrib/admin/templates/registration/password_reset_email.html:5 +#, python-format +msgid "Your new password is: %(new_password)s" +msgstr "আপনার নতুন পাসওয়ার্ড: %(new_password)s" + +#: contrib/admin/templates/registration/password_reset_email.html:7 +msgid "Feel free to change this password by going to this page:" +msgstr "এই পাতাটিতে গিয়ে এই পাসওয়ার্ডটি পরিবর্তন করতে মুক্ত অনুভব করুন:" + +#: contrib/admin/templates/registration/password_reset_email.html:11 +msgid "Your username, in case you've forgotten:" +msgstr "আপনার ব্যবহারকারীর নাম, যদি আপনি ভুলে গিয়ে থাকেন:" + +#: contrib/admin/templates/registration/password_reset_email.html:13 +msgid "Thanks for using our site!" +msgstr "আমাদের স্থান ব্যবহার করার জন্য ধন্যবাদ!" + +#: contrib/admin/templates/registration/password_reset_email.html:15 +#, python-format +msgid "The %(site_name)s team" +msgstr "%(site_name)s দল" + +#: utils/dates.py:6 +msgid "Monday" +msgstr "সোমবার" + +#: utils/dates.py:6 +msgid "Tuesday" +msgstr "মঙ্গলবার" + +#: utils/dates.py:6 +msgid "Wednesday" +msgstr "বুধবার" + +#: utils/dates.py:6 +msgid "Thursday" +msgstr "বৃহস্পতিবার" + +#: utils/dates.py:6 +msgid "Friday" +msgstr "শুক্রবার" + +#: utils/dates.py:7 +msgid "Saturday" +msgstr "শনিবার" + +#: utils/dates.py:7 +msgid "Sunday" +msgstr "রবিবার" + +#: utils/dates.py:14 +msgid "January" +msgstr "জানুয়ারী" + +#: utils/dates.py:14 +msgid "February" +msgstr "ফেব্রুয়ারী" + +#: utils/dates.py:14 utils/dates.py:27 +msgid "March" +msgstr "মার্চ" + +#: utils/dates.py:14 utils/dates.py:27 +msgid "April" +msgstr "এপ্রিল" + +#: utils/dates.py:14 utils/dates.py:27 +msgid "May" +msgstr "মে" + +#: utils/dates.py:14 utils/dates.py:27 +msgid "June" +msgstr "জুন" + +#: utils/dates.py:15 utils/dates.py:27 +msgid "July" +msgstr "জুলাই" + +#: utils/dates.py:15 +msgid "August" +msgstr "অগাস্ট" + +#: utils/dates.py:15 +msgid "September" +msgstr "সেপ্টেম্বর" + +#: utils/dates.py:15 +msgid "October" +msgstr "অক্টোবর" + +#: utils/dates.py:15 +msgid "November" +msgstr "নভেম্বর" + +#: utils/dates.py:16 +msgid "December" +msgstr "ডিসেম্বর" + +#: utils/dates.py:27 +msgid "Jan." +msgstr "জানু." + +#: utils/dates.py:27 +msgid "Feb." +msgstr "ফেব্রু" + +#: utils/dates.py:28 +msgid "Aug." +msgstr "অগা." + +#: utils/dates.py:28 +msgid "Sept." +msgstr "সেপ্টে." + +#: utils/dates.py:28 +msgid "Oct." +msgstr "অক্টো." + +#: utils/dates.py:28 +msgid "Nov." +msgstr "নভে." + +#: utils/dates.py:28 +msgid "Dec." +msgstr "ডিসে." + +#: models/core.py:7 +msgid "domain name" +msgstr "ক্ষেত্র নাম" + +#: models/core.py:8 +msgid "display name" +msgstr "প্রদর্শিত নাম" + +#: models/core.py:10 +msgid "site" +msgstr "স্থান" + +#: models/core.py:11 +msgid "sites" +msgstr "স্থান" + +#: models/core.py:28 +msgid "label" +msgstr "লেবেল" + +#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19 +msgid "name" +msgstr "নাম" + +#: models/core.py:31 +msgid "package" +msgstr "প্যাকেজ" + +#: models/core.py:32 +msgid "packages" +msgstr "প্যাকেজ" + +#: models/core.py:42 +msgid "python module name" +msgstr "পাইথন মডিউলের নাম" + +#: models/core.py:44 +msgid "content type" +msgstr "অভ্যন্তরস্থ বস্তু ধরন" + +#: models/core.py:45 +msgid "content types" +msgstr "অভ্যন্তরস্থ বস্তু ধরন" + +#: models/core.py:68 +msgid "redirect from" +msgstr "রিডাইরেক্ট করা" + +#: models/core.py:69 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"এইটি একটি পরম পাথ হওয়া উচিত, ক্ষেত্র নাম বাদ দিয়ে। উদাহরণ: '/events/search / '।" + +#: models/core.py:70 +msgid "redirect to" +msgstr "রিডাইরেক্ট কর" + +#: models/core.py:71 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"এইটি হয় একটি পরম পাথ হতে পারে (যেমন উপরে) অথবা 'http:// এর সঙ্গে শুরু হওয়া " +"একটি পূর্ণ ইউ.আর.এল ।" + +#: models/core.py:73 +msgid "redirect" +msgstr "রিডাইরেক্ট" + +#: models/core.py:74 +msgid "redirects" +msgstr "রিডাইরেক্ট করে" + +#: models/core.py:87 +msgid "URL" +msgstr "ইউ.আর.এল" + +#: models/core.py:88 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"উদাহরণ: '/about/contact / '। প্রধান এবং অনুসরণ করা স্ল্যাশ যেন নিশ্চিত ভাবে থাকে।" + +#: models/core.py:89 +msgid "title" +msgstr "শিরোনাম" + +#: models/core.py:90 +msgid "content" +msgstr "অভ্যন্তরস্থ বস্তু" + +#: models/core.py:91 +msgid "enable comments" +msgstr "মন্তব্য সক্রিয় করুন" + +#: models/core.py:92 +msgid "template name" +msgstr "ছাঁদ নাম" + +#: models/core.py:93 +msgid "" +"Example: 'flatfiles/contact_page'. If this isn't provided, the system will " +"use 'flatfiles/default'." +msgstr "" +"উদাহরণ: 'flatfiles/contact_page '। যদি এইটি দেওয়া না থাকে তাহলে সিস্টেম " +"'flatfiles/default ব্যবহার করবে।" + +#: models/core.py:94 +msgid "registration required" +msgstr "নিবন্ধন প্রয়োজনীয়" + +#: models/core.py:94 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"যদি এইটি টিক্ করা থাকে তাহলে শুধুমাত্র প্রবেশ করা ব্যবহারকারী পাতা দেখতে সক্ষম হবে।" + +#: models/core.py:98 +msgid "flat page" +msgstr "চ্যাপ্টা পাতা" + +#: models/core.py:99 +msgid "flat pages" +msgstr "চ্যাপ্টা পাতাগুলো" + +#: models/core.py:117 +msgid "session key" +msgstr "অধিবেশন চাবি" + +#: models/core.py:118 +msgid "session data" +msgstr "অধিবেশন তথ্য" + +#: models/core.py:119 +msgid "expire date" +msgstr "শেষ তারিখ" + +#: models/core.py:121 +msgid "session" +msgstr "অধিবেশন" + +#: models/core.py:122 +msgid "sessions" +msgstr "সেশন" + +#: models/auth.py:8 +msgid "codename" +msgstr "ছদ্বনাম" + +#: models/auth.py:10 +msgid "Permission" +msgstr "অনুমতি" + +#: models/auth.py:11 models/auth.py:58 +msgid "Permissions" +msgstr "অনুমতি" + +#: models/auth.py:22 +msgid "Group" +msgstr "গ্রুপ" + +#: models/auth.py:23 models/auth.py:60 +msgid "Groups" +msgstr "দল" + +#: models/auth.py:33 +msgid "username" +msgstr "ব্যবহারকারীর নাম" + +#: models/auth.py:34 +msgid "first name" +msgstr "প্রথম নাম" + +#: models/auth.py:35 +msgid "last name" +msgstr "শেষ নাম" + +#: models/auth.py:36 +msgid "e-mail address" +msgstr "ই-মেল ঠিকানা" + +#: models/auth.py:37 +msgid "password" +msgstr "পাসওয়ার্ড" + +#: models/auth.py:37 +msgid "Use an MD5 hash -- not the raw password." +msgstr "একটি MD5 হ্যাশ ব্যাবহার করুন -- পরিস্কার পাসওয়ার্ড না যেন।" + +#: models/auth.py:38 +msgid "staff status" +msgstr " অবস্থা" + +#: models/auth.py:38 +msgid "Designates whether the user can log into this admin site." +msgstr "নিশ্চয় করে যে ব্যবহারকারী এই অ্যাডমিন স্থানে প্রবেশ করতে পারে কিনা।" + +#: models/auth.py:39 +msgid "active" +msgstr "সক্রিয়" + +#: models/auth.py:40 +msgid "superuser status" +msgstr "সুপারইউজার অবস্থা" + +#: models/auth.py:41 +msgid "last login" +msgstr "শেষ প্রবেশ" + +#: models/auth.py:42 +msgid "date joined" +msgstr "যোগাদান করার তারিখ " + +#: models/auth.py:44 +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"নিজ হাতে বরাদ্দকৃতে অনুমতি ছাড়া এই ব্যবহারকারীটি যে সব গ্রুপে আছে তার অনুমতিও পাবে।" + +#: models/auth.py:48 +msgid "Users" +msgstr "ব্যবহারকারী" + +#: models/auth.py:57 +msgid "Personal info" +msgstr "ব্যক্তিগত তথ্য" + +#: models/auth.py:59 +msgid "Important dates" +msgstr "গুরুত্বপূর্ণ তারিখ" + +#: models/auth.py:182 +msgid "Message" +msgstr "বার্তা" + +#: conf/global_settings.py:36 +msgid "Bengali" +msgstr "" + +#: conf/global_settings.py:37 +msgid "Czech" +msgstr "চেক" + +#: conf/global_settings.py:38 +msgid "Welsh" +msgstr "ওয়েল্শ" + +#: conf/global_settings.py:39 +msgid "German" +msgstr "জার্মান" + +#: conf/global_settings.py:40 +msgid "English" +msgstr "ইংরেজী" + +#: conf/global_settings.py:41 +msgid "Spanish" +msgstr "স্পেনিয়" + +#: conf/global_settings.py:42 +msgid "French" +msgstr "ফরাসী" + +#: conf/global_settings.py:43 +msgid "Galician" +msgstr "গ্যালিসিয়" + +#: conf/global_settings.py:44 +msgid "Italian" +msgstr "ইতালিয়" + +#: conf/global_settings.py:45 +msgid "Norwegian" +msgstr "নরওয়েজিয়" + +#: conf/global_settings.py:46 +msgid "Brazilian" +msgstr "ব্রাজিলীয়" + +#: conf/global_settings.py:47 +msgid "Romanian" +msgstr "রোমানীয়" + +#: conf/global_settings.py:48 +msgid "Russian" +msgstr "রুশ" + +#: conf/global_settings.py:49 +msgid "Slovak" +msgstr "স্লোভাক" + +#: conf/global_settings.py:50 +msgid "Serbian" +msgstr "সার্বিয়ান" + +#: conf/global_settings.py:51 +msgid "Simplified Chinese" +msgstr "সরলীকৃত চীনা" + +#: core/validators.py:59 +msgid "This value must contain only letters, numbers and underscores." +msgstr "এই মানটি শুধু মাত্র অক্ষর, অংক, এবং আন্ডারস্কোর (_) হতে পারবে।" + +#: core/validators.py:63 +msgid "This value must contain only letters, numbers, underscores and slashes." +msgstr "এই মানটি শুধু মাত্র অক্ষর, অংক, আন্ডারস্কোর (_) এবং স্ল্যাশ হতে পারবে।" + +#: core/validators.py:71 +msgid "Uppercase letters are not allowed here." +msgstr "বড় হাতের অক্ষর এখানে ঢোকাতে পারবেন না।" + +#: core/validators.py:75 +msgid "Lowercase letters are not allowed here." +msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।" + +#: core/validators.py:82 +msgid "Enter only digits separated by commas." +msgstr "কমা দ্বারা আলাদা করে শুধু মাত্র অংক ঢোকান।" + +#: core/validators.py:94 +msgid "Enter valid e-mail addresses separated by commas." +msgstr "কমা দ্বারা আলাদা করে বৈধ ই-মেল ঠিকানা ঢোকান।" + +#: core/validators.py:98 +msgid "Please enter a valid IP address." +msgstr "দয়া করে একটি বৈধ IP ঠিকানা ঢোকান।" + +#: core/validators.py:102 +msgid "Empty values are not allowed here." +msgstr "ফাঁকা মান এখানে ঢোকাতে পারবেন না।" + +#: core/validators.py:106 +msgid "Non-numeric characters aren't allowed here." +msgstr "অংক বিহীন অক্ষর এখানে ঢোকাতে পারবেন না।" + +#: core/validators.py:110 +msgid "This value can't be comprised solely of digits." +msgstr "এই মানটি শুধু মাত্র অংকের দ্বারা গঠিত হতে পারে না।" + +#: core/validators.py:115 +msgid "Enter a whole number." +msgstr "একটি গোটা সংখ্যা ঢোকান।" + +#: core/validators.py:119 +msgid "Only alphabetical characters are allowed here." +msgstr "এখানে শুধু মাত্র অক্ষর ঢোকাতে পারবেন ।" + +#: core/validators.py:123 +msgid "Enter a valid date in YYYY-MM-DD format." +msgstr "YYYY-MM-DD ফরম্যাটে একটি বৈধ তারিখ ঢোকান।" + +#: core/validators.py:127 +msgid "Enter a valid time in HH:MM format." +msgstr "HH:MM ফরম্যাটে একটি বৈধ সময় ঢোকান।" + +#: core/validators.py:131 +msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." +msgstr "YYYY-MM-DD.HH:MM ফরম্যাটে একটি বৈধ তারিখ/সময় ঢোকান।" + +#: core/validators.py:135 +msgid "Enter a valid e-mail address." +msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।" + +#: core/validators.py:147 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"একটি বৈধ চিত্র আপলোড করুন। যে ফাইল আপনি আপলোড করলেন তা হয় একটি চিত্র নয় অথবা " +"একটি খারাপ চিত্র।" + +#: core/validators.py:154 +#, python-format +msgid "The URL %s does not point to a valid image." +msgstr "%s ইউ.আর.এল-এ একটি বৈধ চিত্র নেই।" + +#: core/validators.py:158 +#, python-format +msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." +msgstr "ফোন নম্বর XXX-XXX-XXXX ফরম্যাটে অবশ্যই হতে হবে। \"%s\" অবৈধ।" + +#: core/validators.py:166 +#, python-format +msgid "The URL %s does not point to a valid QuickTime video." +msgstr "%s ইউ.আর.এল-এ একটি বৈধ QuickTime ভিডিও পাওয়া গেল না।" + +#: core/validators.py:170 +msgid "A valid URL is required." +msgstr "একটি বৈধ ইউ.আর.এল জরুরি।" + +#: core/validators.py:184 +#, python-format +msgid "" +"Valid HTML is required. Specific errors are:\n" +"%s" +msgstr "" +"বৈধ এইচটিএমএল প্রয়োজনীয়। ত্রুটিগুল হল:\n" +"%s" + +#: core/validators.py:191 +#, python-format +msgid "Badly formed XML: %s" +msgstr "খারাপভাবে গঠিত এক্সএমএল: %s" + +#: core/validators.py:201 +#, python-format +msgid "Invalid URL: %s" +msgstr "অবৈধ ইউ.আর.এল: %s" + +#: core/validators.py:203 +#, python-format +msgid "The URL %s is a broken link." +msgstr "ইউ.আর.এল %s একটি ভাঙা সংযোগ।" + +#: core/validators.py:209 +msgid "Enter a valid U.S. state abbreviation." +msgstr "একটি বৈধ U S. রাজ্য abbreviation ঢোকান।" + +#: core/validators.py:224 +#, fuzzy, python-format +msgid "Watch your mouth! The word %s is not allowed here." +msgid_plural "Watch your mouth! The words %s are not allowed here." +msgstr[0] "মুখ সামলে! %s এখানে ব্যাবহার করতে পারবেন না।" +msgstr[1] "মুখ সামলে! %s এখানে ব্যাবহার করতে পারবেন না।" + +#: core/validators.py:231 +#, python-format +msgid "This field must match the '%s' field." +msgstr "এই ক্ষেত্রটি '%s' ক্ষেত্রের সঙ্গে অবশ্যই মিলতে হবে।" + +#: core/validators.py:250 +msgid "Please enter something for at least one field." +msgstr "দয়া করে অন্তত এক ক্ষেত্রেতে কিছু জিনিষ ঢোকান।" + +#: core/validators.py:259 core/validators.py:270 +msgid "Please enter both fields or leave them both empty." +msgstr "দয়া করে উভয় ক্ষেত্রে ঢোকান অথবা তাদেরকে উভয় ফাঁকা ছেড়ে চলে যান।" + +#: core/validators.py:277 +#, python-format +msgid "This field must be given if %(field)s is %(value)s" +msgstr "এই ক্ষেত্রেটি অবশ্যই দেওয়া হবে যদি %(field)s %(value)s হয়" + +#: core/validators.py:289 +#, python-format +msgid "This field must be given if %(field)s is not %(value)s" +msgstr "এই ক্ষেত্রেটি অবশ্যই দেওয়া হবে যদি %(field)s %(value)s না হয়" + +#: core/validators.py:308 +msgid "Duplicate values are not allowed." +msgstr "নকল মান অনুমতি দেওয়া হল না।" + +#: core/validators.py:331 +#, python-format +msgid "This value must be a power of %s." +msgstr "এই মানটি %sএর একটি গুন অবশ্যই হতে হবে।" + +#: core/validators.py:342 +msgid "Please enter a valid decimal number." +msgstr "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান।" + +#: core/validators.py:344 +#, fuzzy, python-format +msgid "Please enter a valid decimal number with at most %s total digit." +msgid_plural "" +"Please enter a valid decimal number with at most %s total digits." +msgstr[0] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" +msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" + +#: core/validators.py:347 +#, fuzzy, python-format +msgid "Please enter a valid decimal number with at most %s decimal place." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." +msgstr[0] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" +msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" + +#: core/validators.py:357 +#, python-format +msgid "Make sure your uploaded file is at least %s bytes big." +msgstr "আাপনার আপলোড করা ফাইল যেন অন্তত %s বাইট বড় হয় তা নিশ্চিত করুন।" + +#: core/validators.py:358 +#, python-format +msgid "Make sure your uploaded file is at most %s bytes big." +msgstr "আাপনার আপলোড করা ফাইল যেন %s বাইটের থেকে বড় না হয় তা নিশ্চিত করুন।" + +#: core/validators.py:371 +msgid "The format for this field is wrong." +msgstr "এই ক্ষেত্রের জন্য ফরম্যাটটি ভূল।" + +#: core/validators.py:386 +msgid "This field is invalid." +msgstr "এই ক্ষেত্রেটি অবৈধ।" + +#: core/validators.py:421 +#, python-format +msgid "Could not retrieve anything from %s." +msgstr "%s থেকে কোন কিছু গ্রহন করতে পারলাম না।" + +#: core/validators.py:424 +#, python-format +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgstr "" +"ইউ.আর.এল %(url)s অবৈধ Content-Type শিরোনাম নিয়ে '%(contenttype)s ফিরে আসল।" + +#: core/validators.py:457 +#, python-format +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"দয়া করে লাইন %(line)s থেকে খোলা %(tag)s বন্ধ করুন। (\"%(start)s\"এর সঙ্গে লাইন " +"আরম্ভ।)" + +#: core/validators.py:461 +#, python-format +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"লাইন %(line)s এই প্রসঙ্গে কিছু শব্দ লেখার অনুমতি দেওয়া গেল না। (\"%(start)s\"এর " +"সঙ্গে লাইন আরম্ভ।)" + +#: core/validators.py:466 +#, python-format +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"লাইন %(line)s\"%(attr)s\"একটি অবৈধ বৈশিষ্ট্য। (\"%(start)s\"এর সঙ্গে লাইন আরম্ভ।)" + +#: core/validators.py:471 +#, python-format +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +" %(line)s লাইনে \"<%(tag)s>\" একটি অবৈধ ট্যাগ। (\"%(start)s\"এর সঙ্গে লাইন " +"আরম্ভ।)" + +#: core/validators.py:475 +#, python-format +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"লাইন %(line)s একটি ট্যাগে এক অথবা আরও বেশি প্রয়োজনীয় বিশিষ্ট্যাবলী নেই। (\"%" +"(start)s\"এর সঙ্গে লাইন আরম্ভ।)" + +#: core/validators.py:480 +#, python-format +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"\"%(attr)s\"বৈশিষ্ট্যয় লাইন %(line)s একটি অবৈধ মান আছে । (\"%(start)s\"এর সঙ্গে " +"লাইন আরম্ভ।)" + +#: core/meta/fields.py:111 +msgid " Separate multiple IDs with commas." +msgstr "একাধিক আই.ডি.কমার দ্বারা আলাদা করুন।" + +#: core/meta/fields.py:114 +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +"একের চেয়ে বেশি নির্বাচন করতে \"Control\" অথবা ম্যাক-এ \"Command\" চেপে ধরে " +"রাখুন।" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index 44b89d6348..7831e1d768 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -942,6 +942,10 @@ msgstr "Důležitá data" msgid "Message" msgstr "Zpráva" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "Česky" @@ -950,40 +954,40 @@ msgstr "Česky" msgid "Welsh" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Německy" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Anglicky" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Španělsky" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Francouzsky" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 #, fuzzy msgid "Galician" msgstr "Galicijský" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Italsky" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "Norsky" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Brazilsky" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Russian" msgstr "Rusky" diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo index a12b20cf26..2fbf905d15 100644 Binary files a/django/conf/locale/cy/LC_MESSAGES/django.mo and b/django/conf/locale/cy/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po index 2a9b6a00f8..3ab82d7a3a 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.po +++ b/django/conf/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-09 04:27-0600\n" +"POT-Creation-Date: 2005-11-10 05:53-0600\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies \n" "Language-Team: Cymraeg \n" @@ -653,62 +653,66 @@ msgid "Message" msgstr "Neges" #: conf/global_settings.py:36 +msgid "Bengali" +msgstr "" + +#: conf/global_settings.py:37 msgid "Czech" msgstr "Tsieceg" -#: conf/global_settings.py:37 +#: conf/global_settings.py:38 msgid "Welsh" msgstr "Cymraeg" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Almaeneg" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Saesneg" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Spaeneg" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Ffrangeg" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "Galisieg" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Eidaleg" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "Norwyeg" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Brasileg" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Romanian" msgstr "" -#: conf/global_settings.py:47 +#: conf/global_settings.py:48 msgid "Russian" msgstr "Rwsieg" -#: conf/global_settings.py:48 +#: conf/global_settings.py:49 msgid "Slovak" msgstr "" -#: conf/global_settings.py:49 +#: conf/global_settings.py:50 msgid "Serbian" msgstr "Serbeg" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Simplified Chinese" msgstr "Tsieinëeg Symledig" @@ -979,11 +983,11 @@ msgstr "" "Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell " "yn ddechrau â \"%(start)s\".)" -#: core/meta/fields.py:95 +#: core/meta/fields.py:111 msgid " Separate multiple IDs with commas." msgstr " Gwahanwch mwy nag un ID gyda atalnodau." -#: core/meta/fields.py:98 +#: core/meta/fields.py:114 msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 613e2a54e6..2112ca1ee3 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -932,6 +932,10 @@ msgstr "Wichtige Daten" msgid "Message" msgstr "Mitteilung" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "Bengali" + #: conf/global_settings.py:37 msgid "Czech" msgstr "Tschechisch" @@ -940,39 +944,39 @@ msgstr "Tschechisch" msgid "Welsh" msgstr "Walisisch" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Deutsch" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Englisch" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Spanisch" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Franzsisch" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "Galicisch" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Italienisch" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "Norwegisch" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Brasilianisch" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Russian" msgstr "Russisch" diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index ffb491e714..2ac25176a5 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -900,6 +900,10 @@ msgstr "" msgid "Message" msgstr "" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "" @@ -952,11 +956,11 @@ msgstr "" msgid "Slovak" msgstr "" -#: conf/global_settings.py:49 +#: conf/global_settings.py:50 msgid "Serbian" msgstr "" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index 55800992fa..d32664601f 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -937,6 +937,10 @@ msgstr "" msgid "Message" msgstr "" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "" @@ -989,11 +993,11 @@ msgstr "" msgid "Slovak" msgstr "" -#: conf/global_settings.py:49 +#: conf/global_settings.py:50 msgid "Serbian" msgstr "" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index 3b7e77ba2b..f8e39e8bbf 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -948,6 +948,10 @@ msgstr "Dates importantes" msgid "Message" msgstr "Message" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "Tchque" @@ -956,40 +960,40 @@ msgstr "Tch msgid "Welsh" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Allemand" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Anglais" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Espagnol" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Franais" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "Galicien" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 #, fuzzy msgid "Italian" msgstr "Italien" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Brsilien" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Russian" msgstr "Russe" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index 5c752126b0..1a3ae99e1b 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -935,6 +935,10 @@ msgstr "" msgid "Message" msgstr "" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "" diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index a0754431c2..a32fb8e259 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -940,6 +940,10 @@ msgstr "Date importanti" msgid "Message" msgstr "Messaggio" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "" @@ -948,39 +952,39 @@ msgstr "" msgid "Welsh" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Tedesco" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Inglese" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Spagnolo" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Francese" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "Galiziano" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Italiano" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Brasiliano" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Russian" msgstr "Russo" diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po index 117d05cf22..b94c4ab306 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.po +++ b/django/conf/locale/no/LC_MESSAGES/django.po @@ -940,6 +940,10 @@ msgstr "Viktige datoer" msgid "Message" msgstr "Meldinger" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "Tsjekkisk" @@ -948,39 +952,39 @@ msgstr "Tsjekkisk" msgid "Welsh" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Tysk" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Engelsk" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Spansk" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Fransk" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "Galisisk" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Italiensk" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "Norsk" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Brasiliansk" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Russian" msgstr "Russisk" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 8f5f433205..19c8b69138 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -944,6 +944,10 @@ msgstr "Datas importantes" msgid "Message" msgstr "Mensagem" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "Tcheco" @@ -952,39 +956,39 @@ msgstr "Tcheco" msgid "Welsh" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Alemão" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Inglês" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Espanhol" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Francês" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "Galiciano" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Italiano" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Brazileiro" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Russian" msgstr "Russo" diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo index 5097074d71..5dfecf2ab8 100644 Binary files a/django/conf/locale/ro/LC_MESSAGES/django.mo and b/django/conf/locale/ro/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po index fbe47da0a5..7bb80beaf9 100644 --- a/django/conf/locale/ro/LC_MESSAGES/django.po +++ b/django/conf/locale/ro/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-09 11:26+0100\n" +"POT-Creation-Date: 2005-11-10 12:53+0100\n" "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n" "Last-Translator: Tiberiu Micu \n" "Language-Team: Romanian \n" @@ -655,62 +655,66 @@ msgid "Message" msgstr "Mesaj" #: conf/global_settings.py:36 +msgid "Bengali" +msgstr "" + +#: conf/global_settings.py:37 msgid "Czech" msgstr "Cehă" -#: conf/global_settings.py:37 +#: conf/global_settings.py:38 msgid "Welsh" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Germană" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Engleză" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Spaniolă" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Franceză" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "Galiciană" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Italiană" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "Norvegiană" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Braziliană" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Romanian" msgstr "" -#: conf/global_settings.py:47 +#: conf/global_settings.py:48 msgid "Russian" msgstr "Rusă" -#: conf/global_settings.py:48 +#: conf/global_settings.py:49 msgid "Slovak" msgstr "" -#: conf/global_settings.py:49 +#: conf/global_settings.py:50 msgid "Serbian" msgstr "Sîrbă" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Simplified Chinese" msgstr "Chineză simplificată" @@ -982,11 +986,11 @@ msgstr "" "Atributul \"%(attr)s\" din linia %(line)s are o valoare invalidă. ( Linia " "începe cu \"%(start)s\".)" -#: core/meta/fields.py:95 +#: core/meta/fields.py:111 msgid " Separate multiple IDs with commas." msgstr "Separă ID-urile multiple cu virgulă." -#: core/meta/fields.py:98 +#: core/meta/fields.py:114 msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index c17a6089d8..f7f9632b3e 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -933,6 +933,10 @@ msgstr "" msgid "Message" msgstr "" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "" @@ -985,11 +989,11 @@ msgstr "" msgid "Slovak" msgstr "" -#: conf/global_settings.py:49 +#: conf/global_settings.py:50 msgid "Serbian" msgstr "" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index 8ccf043612..fe6c382f77 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.po +++ b/django/conf/locale/sk/LC_MESSAGES/django.po @@ -941,6 +941,10 @@ msgstr "Dôležité údaje" msgid "Message" msgstr "Zpráva" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "Český" @@ -949,39 +953,39 @@ msgstr "Český" msgid "Welsh" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Nemecký" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Anglický" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Španielsky" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Francúzsky" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "Galicijský" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Taliansky" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "Nórsky" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Brazílsky" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Russian" msgstr "Ruský" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index aae569248f..2e52d5b7c7 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -944,6 +944,10 @@ msgstr "Važni datumi" msgid "Message" msgstr "Poruka" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "Češki" @@ -952,39 +956,39 @@ msgstr "Češki" msgid "Welsh" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "Nemački" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "Engleski" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "Španski" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "Francuski" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "Italijanski" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "Brazilski" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Russian" msgstr "Ruski" diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index 5878746565..74e10461ad 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -929,6 +929,10 @@ msgstr "重要日期" msgid "Message" msgstr "消息" +#: conf/global_settings.py:37 +msgid "Bengali" +msgstr "" + #: conf/global_settings.py:37 msgid "Czech" msgstr "捷克语" @@ -937,39 +941,39 @@ msgstr "捷克语" msgid "Welsh" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:39 msgid "German" msgstr "德语" -#: conf/global_settings.py:39 +#: conf/global_settings.py:40 msgid "English" msgstr "英语" -#: conf/global_settings.py:40 +#: conf/global_settings.py:41 msgid "Spanish" msgstr "西斑牙语" -#: conf/global_settings.py:41 +#: conf/global_settings.py:42 msgid "French" msgstr "法语" -#: conf/global_settings.py:42 +#: conf/global_settings.py:43 msgid "Galician" msgstr "加利西亚语" -#: conf/global_settings.py:43 +#: conf/global_settings.py:44 msgid "Italian" msgstr "意大利语" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Norwegian" msgstr "" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Brazilian" msgstr "巴西语" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Russian" msgstr "俄语" diff --git a/django/core/cache.py b/django/core/cache.py index a479d16dc3..a619dd3fbf 100644 --- a/django/core/cache.py +++ b/django/core/cache.py @@ -303,7 +303,7 @@ class _FileCache(_SimpleCache): os.remove(fname) else: return pickle.load(f) - except (IOError, pickle.PickleError): + except (IOError, OSError, pickle.PickleError): pass return default diff --git a/django/core/meta/__init__.py b/django/core/meta/__init__.py index 049aea76ee..0d2805e748 100644 --- a/django/core/meta/__init__.py +++ b/django/core/meta/__init__.py @@ -746,8 +746,8 @@ class ModelBase(type): # for all DateFields and DateTimeFields that cannot be null. # EXAMPLES: Poll.get_next_by_pub_date(), Poll.get_previous_by_pub_date() if not f.null: - setattr(new_class, 'get_next_by_%s' % f.name, curry(method_get_next_or_previous, new_mod.get_object, f, True)) - setattr(new_class, 'get_previous_by_%s' % f.name, curry(method_get_next_or_previous, new_mod.get_object, f, False)) + setattr(new_class, 'get_next_by_%s' % f.name, curry(method_get_next_or_previous, new_mod.get_object, opts, f, True)) + setattr(new_class, 'get_previous_by_%s' % f.name, curry(method_get_next_or_previous, new_mod.get_object, opts, f, False)) # Add "get_thingie_list" for all DateFields and DateTimeFields. # EXAMPLE: polls.get_pub_date_list() func = curry(function_get_date_list, opts, f) @@ -1131,10 +1131,13 @@ def method_get_order(ordered_obj, self): # DATE-RELATED METHODS ##################### -def method_get_next_or_previous(get_object_func, field, is_next, self, **kwargs): - kwargs.setdefault('where', []).append('%s %s %%s' % (field.column, (is_next and '>' or '<'))) - kwargs.setdefault('params', []).append(str(getattr(self, field.attname))) - kwargs['order_by'] = [(not is_next and '-' or '') + field.name] +def method_get_next_or_previous(get_object_func, opts, field, is_next, self, **kwargs): + op = is_next and '>' or '<' + kwargs.setdefault('where', []).append('(%s %s %%s OR (%s = %%s AND %s %s %%s))' % \ + (field.column, op, field.column, opts.pk.column, op)) + param = str(getattr(self, field.attname)) + kwargs.setdefault('params', []).extend([param, param, getattr(self, opts.pk.attname)]) + kwargs['order_by'] = [(not is_next and '-' or '') + field.name, (not is_next and '-' or '') + opts.pk.name] kwargs['limit'] = 1 return get_object_func(**kwargs) diff --git a/docs/db-api.txt b/docs/db-api.txt index 01aacf49b1..30dece6482 100644 --- a/docs/db-api.txt +++ b/docs/db-api.txt @@ -515,6 +515,12 @@ previous object with respect to the date field, raising the appropriate Both methods accept optional keyword arguments, which should be in the format described in "Field lookups" above. +Note that in the case of identical date values, these methods will use the ID +as a fallback check. This guarantees that no records are skipped or duplicated. +For a full example, see the `lookup API sample model_`. + +.. _lookup API sample model: http://www.djangoproject.com/documentation/models/lookup/ + get_FOO_filename() ------------------ diff --git a/tests/testapp/models/lookup.py b/tests/testapp/models/lookup.py index deb5d807ef..6d8ede1905 100644 --- a/tests/testapp/models/lookup.py +++ b/tests/testapp/models/lookup.py @@ -30,6 +30,8 @@ API_TESTS = """ >>> a5.save() >>> a6 = articles.Article(headline='Article 6', pub_date=datetime(2005, 8, 1, 8, 0)) >>> a6.save() +>>> a7 = articles.Article(headline='Article 7', pub_date=datetime(2005, 7, 27)) +>>> a7.save() # get_iterator() is just like get_list(), but it's a generator. >>> for a in articles.get_iterator(): @@ -39,6 +41,7 @@ Article 6 Article 4 Article 2 Article 3 +Article 7 Article 1 # get_iterator() takes the same lookup arguments as get_list(). @@ -48,9 +51,9 @@ Article 4 # get_count() returns the number of objects matching search criteria. >>> articles.get_count() -6L +7L >>> articles.get_count(pub_date__exact=datetime(2005, 7, 27)) -2L +3L >>> articles.get_count(headline__startswith='Blah blah') 0L @@ -67,10 +70,10 @@ Article 4 # dictionaries instead of object instances -- and you can specify which fields # you want to retrieve. >>> articles.get_values(fields=['headline']) -[{'headline': 'Article 5'}, {'headline': 'Article 6'}, {'headline': 'Article 4'}, {'headline': 'Article 2'}, {'headline': 'Article 3'}, {'headline': 'Article 1'}] +[{'headline': 'Article 5'}, {'headline': 'Article 6'}, {'headline': 'Article 4'}, {'headline': 'Article 2'}, {'headline': 'Article 3'}, {'headline': 'Article 7'}, {'headline': 'Article 1'}] >>> articles.get_values(pub_date__exact=datetime(2005, 7, 27), fields=['id']) -[{'id': 2}, {'id': 3}] ->>> articles.get_values(fields=['id', 'headline']) == [{'id': 5, 'headline': 'Article 5'}, {'id': 6, 'headline': 'Article 6'}, {'id': 4, 'headline': 'Article 4'}, {'id': 2, 'headline': 'Article 2'}, {'id': 3, 'headline': 'Article 3'}, {'id': 1, 'headline': 'Article 1'}] +[{'id': 2}, {'id': 3}, {'id': 7}] +>>> articles.get_values(fields=['id', 'headline']) == [{'id': 5, 'headline': 'Article 5'}, {'id': 6, 'headline': 'Article 6'}, {'id': 4, 'headline': 'Article 4'}, {'id': 2, 'headline': 'Article 2'}, {'id': 3, 'headline': 'Article 3'}, {'id': 7, 'headline': 'Article 7'}, {'id': 1, 'headline': 'Article 1'}] True # get_values_iterator() is just like get_values(), but it's a generator. @@ -83,24 +86,40 @@ True [('headline', 'Article 4'), ('id', 4)] [('headline', 'Article 2'), ('id', 2)] [('headline', 'Article 3'), ('id', 3)] +[('headline', 'Article 7'), ('id', 7)] [('headline', 'Article 1'), ('id', 1)] # Every DateField and DateTimeField creates get_next_by_FOO() and # get_previous_by_FOO() methods. +# In the case of identical date values, these methods will use the ID as a +# fallback check. This guarantees that no records are skipped or duplicated. +>>> a1.get_next_by_pub_date() +Article 2 +>>> a2.get_next_by_pub_date() +Article 3 >>> a3.get_next_by_pub_date() -Article 4 ->>> a2.get_previous_by_pub_date() -Article 1 - -# get_next_by_FOO() and get_previous_by_FOO() take the time into account. +Article 7 >>> a4.get_next_by_pub_date() Article 6 >>> a5.get_next_by_pub_date() Traceback (most recent call last): ... ArticleDoesNotExist: Article does not exist for ... +>>> a6.get_next_by_pub_date() +Article 5 +>>> a7.get_next_by_pub_date() +Article 4 + +>>> a7.get_previous_by_pub_date() +Article 3 >>> a6.get_previous_by_pub_date() Article 4 >>> a5.get_previous_by_pub_date() Article 6 +>>> a4.get_previous_by_pub_date() +Article 7 +>>> a3.get_previous_by_pub_date() +Article 2 +>>> a2.get_previous_by_pub_date() +Article 1 """