diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index 243e8b63df..48fb6af581 100644 Binary files a/django/conf/locale/bn/LC_MESSAGES/django.mo and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po index ed24a7f1c7..be47a86bc8 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.po +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:46+0100\n" +"POT-Creation-Date: 2005-12-14 17:21+0100\n" "PO-Revision-Date: 2005-11-12 20:05+0530\n" "Last-Translator: Baishampayan Ghose \n" "Language-Team: Ankur Bangla \n" @@ -16,6 +16,37 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "রিডাইরেক্ট করা" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"এইটি একটি পরম পাথ হওয়া উচিত, ক্ষেত্র নাম বাদ দিয়ে। উদাহরণ: '/events/search / '।" + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "রিডাইরেক্ট কর" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"এইটি হয় একটি পরম পাথ হতে পারে (যেমন উপরে) অথবা 'http:// এর সঙ্গে শুরু হওয়া " +"একটি পূর্ণ ইউ.আর.এল ।" + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "রিডাইরেক্ট" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "রিডাইরেক্ট করে" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 #, fuzzy @@ -278,6 +309,57 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "ইউ.আর.এল" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"উদাহরণ: '/about/contact / '। প্রধান এবং অনুসরণ করা স্ল্যাশ যেন নিশ্চিত ভাবে থাকে।" + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "শিরোনাম" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "অভ্যন্তরস্থ বস্তু" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "মন্তব্য সক্রিয় করুন" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "ছাঁদ নাম" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"উদাহরণ: 'flatfiles/contact_page '। যদি এইটি দেওয়া না থাকে তাহলে সিস্টেম " +"'flatfiles/default ব্যবহার করবে।" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "নিবন্ধন প্রয়োজনীয়" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"যদি এইটি টিক্ করা থাকে তাহলে শুধুমাত্র প্রবেশ করা ব্যবহারকারী পাতা দেখতে সক্ষম হবে।" + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "চ্যাপ্টা পাতা" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "চ্যাপ্টা পাতাগুলো" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -548,10 +630,6 @@ msgstr "" msgid "Time" msgstr "" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "ইউ.আর.এল" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "" @@ -560,11 +638,19 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -580,9 +666,9 @@ msgstr "পাসওয়ার্ড পরিবর্তন করুন" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -597,10 +683,10 @@ msgid "Log out" msgstr "বাইরে যান" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -639,13 +725,15 @@ msgstr "" "এই বস্তুটি একটি পরিবর্তন ইতিহাস নেই। এইটি এই অ্যাডমিন স্থান দ্বারা সম্ভবত যোগ করা " "হয় নি।" -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "জ্যাঙ্গো স্থান অ্যাডমিন" +#: contrib/admin/templates/admin/change_list.html:10 +#, fuzzy, python-format +msgid "Add %(name)s" +msgstr "যোগ করুন" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "জ্যাঙ্গো পরিচালনা" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -667,14 +755,17 @@ msgstr "" "একটি ত্রুটি আছে। এইটি স্থান পরিচালককে ই-মেল দ্বারা প্রতিবেদন করা হয়েছে এবং খুব " "তাড়াতাড়ি মেরামত করা হবে। আপনার ধৈর্য্যের জন্য ধন্যবাদ।" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "পাতা খুঁজে পাওয়া গেল না" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +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/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/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -701,10 +792,14 @@ msgstr "আমার কাজ" msgid "None available" msgstr "কিছুই পাওয়া যাচ্ছে না" -#: contrib/admin/templates/admin/change_list.html:10 -#, fuzzy, python-format -msgid "Add %(name)s" -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/login.html:15 msgid "Username:" @@ -718,6 +813,24 @@ msgstr "পাসওয়ার্ড:" msgid "Have you forgotten your password?" msgstr "আপনি কি আপনার পাসওয়ার্ড ভুলে গেছেন?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "স্বাগত," @@ -745,33 +858,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "হ্যাঁ, আমি নিশ্চিত" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "" @@ -968,92 +1054,6 @@ msgstr "" msgid "As above, but opens the admin page in a new window." msgstr "" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "রিডাইরেক্ট করা" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"এইটি একটি পরম পাথ হওয়া উচিত, ক্ষেত্র নাম বাদ দিয়ে। উদাহরণ: '/events/search / '।" - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "রিডাইরেক্ট কর" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"এইটি হয় একটি পরম পাথ হতে পারে (যেমন উপরে) অথবা 'http:// এর সঙ্গে শুরু হওয়া " -"একটি পূর্ণ ইউ.আর.এল ।" - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "রিডাইরেক্ট" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "রিডাইরেক্ট করে" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"উদাহরণ: '/about/contact / '। প্রধান এবং অনুসরণ করা স্ল্যাশ যেন নিশ্চিত ভাবে থাকে।" - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "শিরোনাম" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "অভ্যন্তরস্থ বস্তু" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "মন্তব্য সক্রিয় করুন" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "ছাঁদ নাম" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"উদাহরণ: 'flatfiles/contact_page '। যদি এইটি দেওয়া না থাকে তাহলে সিস্টেম " -"'flatfiles/default ব্যবহার করবে।" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "নিবন্ধন প্রয়োজনীয়" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"যদি এইটি টিক্ করা থাকে তাহলে শুধুমাত্র প্রবেশ করা ব্যবহারকারী পাতা দেখতে সক্ষম হবে।" - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "চ্যাপ্টা পাতা" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "চ্যাপ্টা পাতাগুলো" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1440,38 +1440,38 @@ msgstr "সরলীকৃত চীনা" msgid "This field is required." msgstr "এই ক্ষেত্রেটি অবৈধ।" -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 #, fuzzy msgid "Line breaks are not allowed here." msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।" -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "" -#: core/formfields.py:655 +#: core/formfields.py:657 #, fuzzy msgid "Enter a whole number between -32,768 and 32,767." msgstr "একটি গোটা সংখ্যা ঢোকান।" -#: core/formfields.py:664 +#: core/formfields.py:666 #, fuzzy msgid "Enter a positive number." msgstr "একটি গোটা সংখ্যা ঢোকান।" -#: core/formfields.py:673 +#: core/formfields.py:675 #, fuzzy msgid "Enter a whole number between 0 and 32,767." msgstr "একটি গোটা সংখ্যা ঢোকান।" @@ -1737,6 +1737,11 @@ msgstr "" "\"%(attr)s\"বৈশিষ্ট্যয় লাইন %(line)s একটি অবৈধ মান আছে । (\"%(start)s\"এর সঙ্গে " "লাইন আরম্ভ।)" +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, fuzzy, python-format msgid "Please enter a valid %s." @@ -1763,7 +1768,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।" -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 9114a453d4..b456deaf76 100644 Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index 9572941914..3dd233d082 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Czech translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:45+0100\n" +"POT-Creation-Date: 2005-12-14 17:22+0100\n" "PO-Revision-Date: 2005-11-28 12:00+0100\n" "Last-Translator: Radek Svarz \n" "Language-Team: Czech\n" @@ -19,6 +19,37 @@ msgstr "" "X-Poedit-Language: Czech\n" "X-Poedit-Country: CZECH REPUBLIC\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "přesměrovat z" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Toto by měla být absolutní cesta, bez domény. Např. '/udalosti/hledat/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "přesměrovat na" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "přesměrovat" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "přesměrování" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -295,6 +326,58 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Formulář komentáře neobsahoval buď 'preview' nebo 'post'" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Příklad: '/o/kontakt/'. Ujistěte se, že máte počáteční a konečná lomítka." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "titulek" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "obsah" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "povolit komentáře" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "jméno šablony" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém " +"použije 'flatfiles/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "nutná registrace" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Pokud je zaškrtnuto, pouze přihlášení uživatelé budou moci prohlížet tuto " +"stránku." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "statická stránka" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "statické stránky" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -565,10 +648,6 @@ msgstr "Text" msgid "Time" msgstr "Čas" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "Stát US (2 velké znaky)" @@ -577,11 +656,20 @@ msgstr "Stát US (2 velké znaky)" msgid "XML text" msgstr "text XML" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +#, fuzzy +msgid "Time:" +msgstr "Čas" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -597,9 +685,9 @@ msgstr "Změnit heslo" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -614,10 +702,10 @@ msgid "Log out" msgstr "Odhlásit se" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -656,13 +744,15 @@ msgstr "" "Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes " "administrátorské rozhraní." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django správa webu" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "%(name)s: přidat" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django správa" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "Od %(title)s" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -684,14 +774,17 @@ msgstr "" "Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a " "měla by být brzy odstraněna. Děkujeme za trpělivost." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Stránka nenalezena" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "Provést" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django správa webu" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Django správa" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -718,10 +811,14 @@ msgstr "Mé akce" msgid "None available" msgstr "Nic" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "%(name)s: přidat" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Stránka nenalezena" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -735,6 +832,25 @@ msgstr "Heslo:" msgid "Have you forgotten your password?" msgstr "Zapomněl(a) jste své heslo?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Pohled na stránku" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Prosíme, odstraňte chybu uvedenou níže." +msgstr[1] "Prosíme, odstraňte chyby uvedené níže." +msgstr[2] "Prosíme, odstraňte chyby uvedené níže." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Objednávání" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Objednávka:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Vítejte," @@ -762,34 +878,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ano, jsem si jist" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "Od %(title)s" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "Provést" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Pohled na stránku" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Prosíme, odstraňte chybu uvedenou níže." -msgstr[1] "Prosíme, odstraňte chyby uvedené níže." -msgstr[2] "Prosíme, odstraňte chyby uvedené níže." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Objednávání" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Objednávka:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Smazat" @@ -998,94 +1086,6 @@ msgstr "Upravit tento objekt (ve novém okně)" msgid "As above, but opens the admin page in a new window." msgstr "Jako výše, ale otevře admin stránky v novém okně." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -#, fuzzy -msgid "Time:" -msgstr "Čas" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "přesměrovat z" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Toto by měla být absolutní cesta, bez domény. Např. '/udalosti/hledat/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "přesměrovat na" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "přesměrovat" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "přesměrování" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Příklad: '/o/kontakt/'. Ujistěte se, že máte počáteční a konečná lomítka." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "titulek" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "obsah" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "povolit komentáře" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "jméno šablony" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém " -"použije 'flatfiles/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "nutná registrace" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Pokud je zaškrtnuto, pouze přihlášení uživatelé budou moci prohlížet tuto " -"stránku." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "statická stránka" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "statické stránky" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "j.n.Y" @@ -1474,7 +1474,7 @@ msgstr "Jednoduchá čínština" msgid "This field is required." msgstr "Toto pole je povinné." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." @@ -1482,28 +1482,28 @@ msgstr[0] "Ujistěte se, že Váš text má méně než %s znak." msgstr[1] "Ujistěte se, že Váš text má méně než %s znaky." msgstr[2] "Ujistěte se, že Váš text má méně než %s znaků." -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "Zalomení řádky zde nenjsou povolená." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Vyberte platnou volbu. '%(data)s' není mezi %(choices)s." -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "Odevzdaný soubor je prázdný." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Vložte celé číslo mezi -32,768 a 32,767." -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "Vložte celé kladné číslo." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "Vložte celé číslo mezi 0 a 32,767." @@ -1777,6 +1777,11 @@ msgstr "" "Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s " "\"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, fuzzy, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "%(optname)s s tímto %(fieldname)s již existuje." + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1802,7 +1807,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Vložte platný název souboru." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo index 8fa71ab397..4db6e57fac 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 a5011e2b01..39bc7a0c50 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-12-09 11:46+0100\n" +"POT-Creation-Date: 2005-12-14 17:22+0100\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies \n" "Language-Team: Cymraeg \n" @@ -16,6 +16,38 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "ailgyfeirio o" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Ddylai hon bod yn lwybr hollol, heb y parth-enw. Er enghraifft: '/" +"digwyddiadau/chwilio/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "ailgyfeirio i" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Gellir fod naill ai llwybr hollol (fel uwch) neu URL hollol yn ddechrau â " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "ailgyfeiriad" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "ailgyfeiriadau" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -268,6 +300,59 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Er enghraifft: '/amdan/cyswllt/'. Sicrhewch gennych slaesau arweiniol ac " +"trywyddiol." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "teitl" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "cynnwys" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "galluogi sylwadau" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "enw'r templed" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Er enghraifft: 'flatpages/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r " +"system 'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "cofrestriad gofynnol" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Os wedi dewis, dim ond defnyddwyr a mewngofnodwyd bydd yn gallu gweld y " +"tudalen." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "tudalen fflat" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "tudalennau fflat" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -530,10 +615,6 @@ msgstr "Testun" msgid "Time" msgstr "Amser" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "Talaith U.D. (dwy briflythyren)" @@ -542,11 +623,19 @@ msgstr "Talaith U.D. (dwy briflythyren)" msgid "XML text" msgstr "Testun XML" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Dyddiad:" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Amser:" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -562,9 +651,9 @@ msgstr "Newid cyfrinair" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -579,10 +668,10 @@ msgid "Log out" msgstr "Allgofnodi" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -621,13 +710,15 @@ msgstr "" "Does dim hanes newid gan y gwrthrych yma. Mae'n debyg ni ychwanegwyd drwy'r " "safle gweinydd yma." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Gweinyddiad safle Django" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "Ychwanegu %(name)s" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Gweinyddiad Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr " Gan %(title)s" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -649,14 +740,17 @@ msgstr "" "Mae gwall wedi digwydd. Adroddwyd i weinyddwyr y safle drwy e-bost ac ddylai " "cael ei drwsio cyn bo hir." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Tudalen heb ei ddarganfod" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "Ewch" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Mae'n ddrwg gennym, ond nid darganfwyd y dudalen a dymunwyd" +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Gweinyddiad safle Django" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Gweinyddiad Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -683,10 +777,14 @@ msgstr "Fy Ngweithredau" msgid "None available" msgstr "Dim ar gael" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "Ychwanegu %(name)s" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Tudalen heb ei ddarganfod" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Mae'n ddrwg gennym, ond nid darganfwyd y dudalen a dymunwyd" #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -700,6 +798,24 @@ msgstr "Cyfrinair:" msgid "Have you forgotten your password?" msgstr "Ydych wedi anghofio eich cyfrinair?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Gweld ar safle" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Trefnu" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Trefn:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Croeso," @@ -727,33 +843,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Yndw, rwy'n sicr" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr " Gan %(title)s" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "Ewch" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Gweld ar safle" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Trefnu" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Trefn:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Dileu" @@ -950,95 +1039,6 @@ msgstr "Golygu'r gwrthrych yma (ffenestr newydd)" msgid "As above, but opens the admin page in a new window." msgstr "Fel uwchben, ond yn agor y dudalen weinyddiad mewn ffenestr newydd." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "Dyddiad:" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "Amser:" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "ailgyfeirio o" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Ddylai hon bod yn lwybr hollol, heb y parth-enw. Er enghraifft: '/" -"digwyddiadau/chwilio/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "ailgyfeirio i" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Gellir fod naill ai llwybr hollol (fel uwch) neu URL hollol yn ddechrau â " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "ailgyfeiriad" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "ailgyfeiriadau" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Er enghraifft: '/amdan/cyswllt/'. Sicrhewch gennych slaesau arweiniol ac " -"trywyddiol." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "teitl" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "cynnwys" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "galluogi sylwadau" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "enw'r templed" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Er enghraifft: 'flatpages/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r " -"system 'flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "cofrestriad gofynnol" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Os wedi dewis, dim ond defnyddwyr a mewngofnodwyd bydd yn gallu gweld y " -"tudalen." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "tudalen fflat" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "tudalennau fflat" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1422,35 +1422,35 @@ msgstr "Tsieinëeg Symledig" msgid "This field is required." msgstr "Mae angen y faes yma." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "Ni chaniateir toriadau llinell yma." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Dewisiwch dewis dilys; dydy '%(data)s' dim mewn %(choices)s." -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "Mae'r ffeil yn wag." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Rhowch rhif cyfan rhwng -32,768 a 32,767." -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "Rhowch rhif positif." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "Rhowch rhif cyfan rhwng 0 a 32,767." @@ -1720,6 +1720,11 @@ msgstr "" "Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell " "yn ddechrau â \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1744,7 +1749,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Rhowch enw ffeil dilys." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo index 871aa4d6a5..3091202a17 100644 Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po index 00633884f6..540feb799c 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.po +++ b/django/conf/locale/da/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-12-09 11:47+0100\n" +"POT-Creation-Date: 2005-12-14 17:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Morten Bagai \n" "Language-Team: Danish\n" @@ -16,6 +16,38 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "omadresser fra" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Dette skal være en absolut sti uden domænenavnet. For eksempel: '/nyheder/" +"find/" + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "omadresser til" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Dette kan enten være en absolut sti (som over), eller en komplet URL " +"startende med 'http://'" + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "omadressering" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "omaddresseringer" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 #, fuzzy @@ -278,6 +310,60 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "Internetadresse" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstreg foran og og " +"bagefter." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "titel" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "indhold" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "tillad kommentarer" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "skabelonnavn" + +#: contrib/flatpages/models/flatpages.py:12 +#, fuzzy +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Eksempel: 'fladesider/kontakt_side'. Vist denne ikke denne er gitt, vill " +"'flatfiles/default' bli brukt." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "registrering kreves" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Hvis denne box er krydset af, vil kun brugere, der er logget ind, kunne se " +"siden." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "flad side" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "flade sider" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -548,10 +634,6 @@ msgstr "" msgid "Time" msgstr "" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "Internetadresse" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "" @@ -560,11 +642,19 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -580,9 +670,9 @@ msgstr "Ændre adgangskode" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -597,10 +687,10 @@ msgid "Log out" msgstr "Log ud" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -639,13 +729,15 @@ msgstr "" "Dette objekt har ingen ændringshistorik. Det blev formentlig ikke tilføjet " "via dette administrations-site" -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django site administration" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administration" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -667,14 +759,17 @@ msgstr "" "Der opstod en fejl. Fejlen er rapporteret til site-administratoren via e-" "mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Siden blev ikke fundet" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Vi Beklager, men den ønskede side kunne ikke findes" +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django site administration" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Django administration" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -701,10 +796,14 @@ msgstr "Mine handlinger" msgid "None available" msgstr "Ingen tilgængelige" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Siden blev ikke fundet" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Vi Beklager, men den ønskede side kunne ikke findes" #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -718,6 +817,24 @@ msgstr "Adgangskode:" msgid "Have you forgotten your password?" msgstr "Har du glemt din adgangskode?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Velkommen" @@ -745,33 +862,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ja, jeg er sikker" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "" @@ -970,96 +1060,6 @@ msgstr "" msgid "As above, but opens the admin page in a new window." msgstr "" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "omadresser fra" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Dette skal være en absolut sti uden domænenavnet. For eksempel: '/nyheder/" -"find/" - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "omadresser til" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Dette kan enten være en absolut sti (som over), eller en komplet URL " -"startende med 'http://'" - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "omadressering" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "omaddresseringer" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstreg foran og og " -"bagefter." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "titel" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "indhold" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "tillad kommentarer" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "skabelonnavn" - -#: contrib/flatpages/models/flatpages.py:12 -#, fuzzy -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Eksempel: 'fladesider/kontakt_side'. Vist denne ikke denne er gitt, vill " -"'flatfiles/default' bli brukt." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "registrering kreves" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Hvis denne box er krydset af, vil kun brugere, der er logget ind, kunne se " -"siden." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "flad side" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "flade sider" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1447,38 +1447,38 @@ msgstr "Simpel Kinesisk" msgid "This field is required." msgstr "Dette felt er ugyldigt." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 #, fuzzy msgid "Line breaks are not allowed here." msgstr "Små bogstaver er ikke tilladt her" -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "" -#: core/formfields.py:655 +#: core/formfields.py:657 #, fuzzy msgid "Enter a whole number between -32,768 and 32,767." msgstr "Indtast et heltal." -#: core/formfields.py:664 +#: core/formfields.py:666 #, fuzzy msgid "Enter a positive number." msgstr "Indtast et heltal." -#: core/formfields.py:673 +#: core/formfields.py:675 #, fuzzy msgid "Enter a whole number between 0 and 32,767." msgstr "Indtast et heltal." @@ -1746,6 +1746,11 @@ msgstr "" "\"%(attr)s\" attributten på linje $(line)s har en ugyldig værdi. (Linjen " "starter med \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, fuzzy, python-format msgid "Please enter a valid %s." @@ -1771,7 +1776,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Indtast en gyldig email-adresse." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index a1682ec199..c0d22a8fc6 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 8403db5cef..319010a5aa 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,13 +7,45 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:46+0100\n" +"POT-Creation-Date: 2005-12-14 17:21+0100\n" "PO-Revision-Date: 2005-10-08 00:03+0200\n" "Last-Translator: Georg Bauer \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "Umleitung von" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/" +"events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "Umleitung zu" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Hier muss entweder ein absoluter Pfad oder eine komplette URL mit http:// am " +"Anfang stehen." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "Umleitung" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "Umleitungen" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -288,6 +320,57 @@ msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Beispiel: '/about/contact/'. Wichtig: vorne und hinten muss ein / stehen." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "Titel" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "Inhalt" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "Kommentare aktivieren" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "Name der Vorlage" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Beispiel: 'flatpages/contact_page'. Wenn dieses Feld nicht gefllt ist, wird " +"'flatpages/default' als Standard gewhlt." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "Registrierung erforderlich" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Wenn hier ein Haken ist, knnen nur angemeldete Benutzer diese Seite sehen." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "Webseite" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "Webseiten" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -560,10 +643,6 @@ msgstr "Text" msgid "Time" msgstr "Zeit" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)" @@ -572,11 +651,19 @@ msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)" msgid "XML text" msgstr "XML Text" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Zeit:" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -592,9 +679,9 @@ msgstr "Passwort #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -609,10 +696,10 @@ msgid "Log out" msgstr "Abmelden" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -651,13 +738,15 @@ msgstr "" "Dieses Objekt hat keine nderungsgeschichte. Es wurde mglicherweise nicht " "ber diese Verwaltungsseiten angelegt." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django Systemverwaltung" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "%(name)s zufgen" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django Verwaltung" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr " Nach %(title)s " #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -680,15 +769,17 @@ msgstr "" "eMail weitergegeben und sollte bald behoben sein. Vielen Dank fr Ihr " "Verstndnis." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Seite nicht gefunden" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "Los" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "" -"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django Systemverwaltung" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Django Verwaltung" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -715,10 +806,15 @@ msgstr "Meine Aktionen" msgid "None available" msgstr "Keine vorhanden" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "%(name)s zufgen" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Seite nicht gefunden" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "" +"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -732,6 +828,24 @@ msgstr "Passwort:" msgid "Have you forgotten your password?" msgstr "Haben Sie ihr Passwort vergessen?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Im Web Anzeigen" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Bitte den Fehler korrigieren." +msgstr[1] "Bitte die Fehler korrigieren." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Sortierung" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Reihenfolge:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Willkommen," @@ -760,33 +874,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ja, ich bin sicher" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr " Nach %(title)s " - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "Los" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Im Web Anzeigen" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Bitte den Fehler korrigieren." -msgstr[1] "Bitte die Fehler korrigieren." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Sortierung" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Reihenfolge:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Lschen" @@ -998,93 +1085,6 @@ msgid "As above, but opens the admin page in a new window." msgstr "" "Wie zuvor, aber ffnent die Administrationsseite in einem neuen Fenster." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "Datum:" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "Zeit:" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "Umleitung von" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/" -"events/search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "Umleitung zu" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Hier muss entweder ein absoluter Pfad oder eine komplette URL mit http:// am " -"Anfang stehen." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "Umleitung" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "Umleitungen" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Beispiel: '/about/contact/'. Wichtig: vorne und hinten muss ein / stehen." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "Titel" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "Inhalt" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "Kommentare aktivieren" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "Name der Vorlage" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Beispiel: 'flatpages/contact_page'. Wenn dieses Feld nicht gefllt ist, wird " -"'flatpages/default' als Standard gewhlt." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "Registrierung erforderlich" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Wenn hier ein Haken ist, knnen nur angemeldete Benutzer diese Seite sehen." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "Webseite" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "Webseiten" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "j. N Y" @@ -1469,36 +1469,36 @@ msgstr "Vereinfachtes Chinesisch" msgid "This field is required." msgstr "Dieses Feld ist zwingend." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "Bitte sicherstellen, das der Text weniger als %s Zeichen hat." msgstr[1] "Bitte sicherstellen, das der Text weniger als %s Zeichen hat." -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "Zeilenumbrche sind hier nicht erlaubt." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" "Bitte eine gltige Auswahl treffen; '%(data)s' ist nicht in %(choices)s." -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "Die ausgewhlte Datei ist leer." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Bitte eine ganze Zahl zwischen -32.768 und 32.767 eingeben." -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "Bitte eine ganze, positive Zahl eingeben." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben." @@ -1775,6 +1775,13 @@ msgstr "" "Das Attribut %(attr)s in Zeile %(line)s hat einen ungltigen Wert. Die Zeile " "beginnt mit \"%(start)s\"." +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" +"Ein '%(object)s' in dieser '%(type)s' existiert bereits fr dieses '%(field)" +"s'." + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1800,7 +1807,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Bitte einen gltigen Dateinamen eingeben" -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo index ccc4204353..d7f41a9a3c 100644 Binary files a/django/conf/locale/en/LC_MESSAGES/django.mo and b/django/conf/locale/en/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 9a0393e522..856aa98a0e 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/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-12-09 11:44+0100\n" +"POT-Creation-Date: 2005-12-14 17:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,34 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -263,6 +291,53 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -525,10 +600,6 @@ msgstr "" msgid "Time" msgstr "" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "" @@ -537,11 +608,19 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -557,9 +636,9 @@ msgstr "" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -574,10 +653,10 @@ msgid "Log out" msgstr "" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -614,12 +693,14 @@ msgid "" "admin site." msgstr "" -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" msgstr "" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " msgstr "" #: contrib/admin/templates/admin/500.html:4 @@ -640,13 +721,16 @@ msgid "" "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" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" msgstr "" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." +#: 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/index.html:27 @@ -674,9 +758,13 @@ msgstr "" msgid "None available" msgstr "" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" +#: 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/login.html:15 @@ -691,6 +779,24 @@ msgstr "" msgid "Have you forgotten your password?" msgstr "" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "" @@ -714,33 +820,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "" @@ -929,85 +1008,6 @@ msgstr "" msgid "As above, but opens the admin page in a new window." msgstr "" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "N j, Y" @@ -1389,35 +1389,35 @@ msgstr "" msgid "This field is required." msgstr "" -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "" -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "" -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "" -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "" -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "" @@ -1666,6 +1666,11 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1689,7 +1694,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "" -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index f5c37ecd48..c71299ac5c 100644 Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index 3b5ed09b4d..05b67e4f94 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:45+0100\n" +"POT-Creation-Date: 2005-12-14 17:22+0100\n" "PO-Revision-Date: 2005-11-28 15:28+0000\n" "Last-Translator: Ricardo Javier Cardenes Medina \n" @@ -20,6 +20,38 @@ msgstr "" "X-Generator: KBabel 1.10.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "redirigir desde" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Esta ruta debera ser absoluta, excluyendo el nombre de dominio. Ejeplo: '/" +"events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "redirigir a" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Esto puede ser bien una ruta absoluta (como antes) o una URL completa que " +"empiece con 'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "redireccin" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "redirecciones" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -107,7 +139,7 @@ msgstr "Comentarios" #: contrib/comments/models/comments.py:85 #: contrib/comments/models/comments.py:204 msgid "Content object" -msgstr "Objeto continente" +msgstr "Objeto contenido" #: contrib/comments/models/comments.py:113 #, python-format @@ -189,7 +221,7 @@ msgid "" "\n" "%(text)s" msgstr "" -"Este comentario lo ha marcado %(user)s:\n" +"Este comentario fue marcado por %(user)s:\n" "\n" "%(text)s" @@ -220,7 +252,7 @@ msgstr "ID de comentario no v #: contrib/comments/views/karma.py:24 msgid "No voting for yourself" -msgstr "No te votes t mismo" +msgstr "No puedes votarte t mismo" #: contrib/comments/views/comments.py:25 msgid "" @@ -287,7 +319,58 @@ msgstr "" #: contrib/comments/views/comments.py:254 #: contrib/comments/views/comments.py:318 msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "El formulario de comentario no proporciona 'preview' ni 'post'" +msgstr "El formulario de comentario no proporcion 'previsualizar' ni 'enviar'" + +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Ejemplo: '/about/contact/'. Asegrese de que pone barras al principio y al " +"final." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "ttulo" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "contenido" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "admitir comentarios" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "nombre de plantilla" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Ejemplo: 'flatpages/contact_page'. Si no lo proporciona, el sistema usar " +"'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "debe estar registrado" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "Si est marcado, slo los usuarios registrados podrn ver la pgina." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "pgina esttica" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "pginas estticas" #: contrib/admin/filterspecs.py:40 #, python-format @@ -370,14 +453,14 @@ msgstr "Todas las fechas" #: contrib/admin/views/decorators.py:22 #: contrib/admin/templates/admin/login.html:24 msgid "Log in" -msgstr "Registrarse" +msgstr "Identificarse" #: contrib/admin/views/decorators.py:56 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." msgstr "" -"Por favor, regstrese de nuevo, porque su sesin ha caducado. No se " +"Por favor, identifquese de nuevo, porque su sesin ha caducado. No se " "preocupe: se ha guardado su envo." #: contrib/admin/views/decorators.py:63 @@ -386,7 +469,7 @@ msgid "" "cookies, reload this page, and try again." msgstr "" "Parece que su navegador no est configurado para aceptar cookies. Actvelas " -"por favor, recarge esta pgina, e intntelo de nuevo." +"por favor, recargue esta pgina, e intntelo de nuevo." #: contrib/admin/views/decorators.py:77 msgid "Usernames cannot contain the '@' character." @@ -420,12 +503,12 @@ msgstr "Se a #: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491 msgid "You may edit it again below." -msgstr "Puede editarlo de nuevo debajo." +msgstr "Puede editarlo de nuevo abajo." #: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500 #, python-format msgid "You may add another %s below." -msgstr "Puede agregar otro %s debajo." +msgstr "Puede agregar otro %s abajo." #: contrib/admin/views/main.py:440 #, python-format @@ -454,7 +537,7 @@ msgstr "Borrado %s." #: contrib/admin/views/main.py:463 msgid "No fields changed." -msgstr "No cambi ningn campo." +msgstr "No ha cambiado ningn campo." #: contrib/admin/views/main.py:488 #, python-format @@ -466,7 +549,7 @@ msgstr "Se modific msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -"Se agreg con xito el %(name)s \"%(obj)s. Puede editarlo de nuevo debajo." +"Se agreg con xito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo." #: contrib/admin/views/main.py:535 #, python-format @@ -526,11 +609,11 @@ msgstr "Fecha (con hora)" #: contrib/admin/views/doc.py:250 msgid "E-mail address" -msgstr "Direccin de correo" +msgstr "Direccin de correo electrnico" #: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254 msgid "File path" -msgstr "Ruta al fichero" +msgstr "Ruta de fichero" #: contrib/admin/views/doc.py:252 msgid "Decimal number" @@ -538,11 +621,11 @@ msgstr "N #: contrib/admin/views/doc.py:258 msgid "Boolean (Either True, False or None)" -msgstr "Booleano (Verdadero, Falso o None)" +msgstr "Booleano (Verdadero, Falso o Nulo)" #: contrib/admin/views/doc.py:259 msgid "Relation to parent model" -msgstr "" +msgstr "Relacin con el modelo padre" #: contrib/admin/views/doc.py:260 msgid "Phone number" @@ -560,10 +643,6 @@ msgstr "Texto" msgid "Time" msgstr "Hora" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "Estado de los EEUU (dos letras maysculas)" @@ -572,11 +651,20 @@ msgstr "Estado de los EEUU (dos letras may msgid "XML text" msgstr "Texto XML" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Fecha:" + +#: contrib/admin/templates/widget/date_time.html:4 +#, fuzzy +msgid "Time:" +msgstr "Hora" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -592,9 +680,9 @@ msgstr "Cambiar clave" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -606,13 +694,13 @@ msgstr "Cambiar clave" #: contrib/admin/templates/admin_doc/index.html:4 #: contrib/admin/templates/admin_doc/model_index.html:5 msgid "Log out" -msgstr "Terminar" +msgstr "Terminar sesin" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -651,13 +739,15 @@ msgstr "" "Este objeto no tiene histrico de cambios. Probablemente no fue aadido " "usando este sitio de administracin." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Sitio de administracin de Django" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "Agregar %(name)s" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administracin de Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr " Por %(title)s " #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -680,14 +770,17 @@ msgstr "" "mediante correo electrnico y debera arreglarse en breve. Gracias por su " "paciencia" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Pgina no encontrada" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "Buscar" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Lo sentimos, pero no se encuentra la pgina solicitada." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Sitio de administracin de Django" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administracin de Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -714,10 +807,14 @@ msgstr "Mis acciones" msgid "None available" msgstr "Ninguno disponible" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "Agregar %(name)s" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Pgina no encontrada" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Lo sentimos, pero no se encuentra la pgina solicitada." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -731,6 +828,24 @@ msgstr "Clave:" msgid "Have you forgotten your password?" msgstr "Ha olvidado su clave?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Ver en el sitio" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Por favor, corrija el siguiente error." +msgstr[1] "Por favor, corrija los siguientes errores." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Ordenacin" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Orden:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Bienvenido," @@ -759,33 +874,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "S, estoy seguro" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr " Por %(title)s " - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Ver en el sitio" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Por favor, corrija el siguiente error." -msgstr[1] "Por favor, corrija los siguientes errores." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Ordenacin" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Orden:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Eliminar" @@ -816,11 +904,11 @@ msgstr "Cambio de clave" #: contrib/admin/templates/registration/password_change_done.html:6 #: contrib/admin/templates/registration/password_change_done.html:10 msgid "Password change successful" -msgstr "Cambio de clave con xito" +msgstr "Cambio de clave exitoso" #: contrib/admin/templates/registration/password_change_done.html:12 msgid "Your password was changed." -msgstr "Su clave ha cambiado." +msgstr "Su clave ha sido cambiada." #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/registration/password_reset_form.html:6 @@ -834,12 +922,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 "" -"Ha olvidado su clave? Introduzca su direccin de correo, y crearemos una " -"nueva que le enviaremos por correo." +"Ha olvidado su clave? Introduzca su direccin de correo electrnico, y " +"crearemos una nueva que le enviaremos por correo." #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" -msgstr "Direccin de correo:" +msgstr "Direccin de correo electrnico:" #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "Reset my password" @@ -851,12 +939,12 @@ msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy." #: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" -msgstr "Registrarse de nuevo" +msgstr "Identificarse de nuevo" #: contrib/admin/templates/registration/password_reset_done.html:6 #: contrib/admin/templates/registration/password_reset_done.html:10 msgid "Password reset successful" -msgstr "Recuperacin de clave con xito" +msgstr "Recuperacin de clave exitosa" #: contrib/admin/templates/registration/password_reset_done.html:12 msgid "" @@ -892,7 +980,7 @@ msgstr "Cambiar mi clave" #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" -msgstr "Recibe este mensaje debido a que solicit recuperar la clave" +msgstr "Est recibiendo este mensaje debido a que solicit recuperar la clave" #: contrib/admin/templates/registration/password_reset_email.html:3 #, python-format @@ -995,94 +1083,6 @@ msgid "As above, but opens the admin page in a new window." msgstr "" "Como antes, pero abre la pgina de administracin en una nueva ventana." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -#, fuzzy -msgid "Time:" -msgstr "Hora" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "redirigir desde" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Esta ruta debera ser absoluta, excluyendo el nombre de dominio. Ejeplo: '/" -"events/search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "redirigir a" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Esto puede ser bien una ruta absoluta (como antes) o una URL completa que " -"empiece con 'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "redireccin" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "redirecciones" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Ejemplo: '/about/contact/'. Asegrese de que pone barras al principio y al " -"final." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "ttulo" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "contenido" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "admitir comentarios" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "nombre de plantilla" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Ejemplo: 'flatpages/contact_page'. Si no lo proporciona, el sistema usar " -"'flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "se precisa regustro" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "Si est marcado, slo los usuarios registrados podrn ver la pgina." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "pgina simple" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "pginas simples" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1335,7 +1335,7 @@ msgstr "clave" #: models/auth.py:37 msgid "Use '[algo]$[salt]$[hexdigest]'" -msgstr "Uso '[algo]$[salt]$[hexdigest]'" +msgstr "Use '[algo]$[salt]$[hexdigest]'" #: models/auth.py:38 msgid "staff status" @@ -1466,41 +1466,41 @@ msgstr "Chino simplificado" msgid "This field is required." msgstr "Este campo es obligatorio." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "Asegrese de que su texto es menor de %s carcter." -msgstr[1] "Asegrese de que su texto es menor de %s caracteres." +msgstr[0] "Asegrese de que su texto tiene menos de %s carcter." +msgstr[1] "Asegrese de que su texto tiene menos de %s caracteres." -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "No se permiten saltos de lnea." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Escoja una opcin vlida; '%(data)s' no est en %(choices)s." -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "El fichero enviado est vaco." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Introduzca un nmero entero entre -32,768 y 32,767." -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "Introduzca un nmero positivo." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "Introduzca un nmero entero entre 0 y 32,767." #: core/validators.py:62 msgid "This value must contain only letters, numbers and underscores." -msgstr "Este valor debe contener slo letras, nmeros y guin bajo." +msgstr "Este valor debe contener slo letras, nmeros y guiones bajos." #: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." @@ -1525,15 +1525,15 @@ msgstr "Introduzca direcciones de correo v #: core/validators.py:101 msgid "Please enter a valid IP address." -msgstr "Por favor introduzca una IP vlida." +msgstr "Por favor introduzca una direccin IP vlida." #: core/validators.py:105 msgid "Empty values are not allowed here." -msgstr "Aqu no se admiten valores vacos." +msgstr "No se admiten valores vacos." #: core/validators.py:109 msgid "Non-numeric characters aren't allowed here." -msgstr "Aqu no se admiten caracteres no numricos." +msgstr "No se admiten caracteres no numricos." #: core/validators.py:113 msgid "This value can't be comprised solely of digits." @@ -1545,7 +1545,7 @@ msgstr "Introduzca un n #: core/validators.py:122 msgid "Only alphabetical characters are allowed here." -msgstr "Aqu slo se admiten caracteres alfabticos." +msgstr "Slo se admiten caracteres alfabticos." #: core/validators.py:126 msgid "Enter a valid date in YYYY-MM-DD format." @@ -1561,15 +1561,15 @@ msgstr "Introduzca una fecha/hora v #: core/validators.py:138 msgid "Enter a valid e-mail address." -msgstr "Introduzca una direccin de correo vlida" +msgstr "Introduzca una direccin de correo electrnico vlida" #: core/validators.py:150 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -"Enve una imagen vlida. El fichero que ha enviado era una imagen corrupta, " -"o no era una imagen." +"Enve una imagen vlida. El fichero que ha enviado no era una imagen o se " +"trataba de una imagen corrupta." #: core/validators.py:157 #, python-format @@ -1624,13 +1624,13 @@ msgstr "Introduzca una abreviatura v #, 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] "Vigila tu boca! Aqu no admitimos las palabras %s." -msgstr[1] "" +msgstr[0] "Vigila tu boca! Aqu no admitimos la palabra %s." +msgstr[1] "Vigila tu boca! Aqu no admitimos las palabras %s." #: core/validators.py:238 #, python-format msgid "This field must match the '%s' field." -msgstr "Este campo debe ajustarse al '%s'." +msgstr "Este campo debe concordar con el campo '%s'." #: core/validators.py:257 msgid "Please enter something for at least one field." @@ -1638,17 +1638,17 @@ msgstr "Por favor, introduzca algo en al menos un campo." #: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." -msgstr "Por favor, rellene ambos campos o djelos los dos vacos." +msgstr "Por favor, rellene ambos campos o deje ambos vacos." #: core/validators.py:284 #, python-format msgid "This field must be given if %(field)s is %(value)s" -msgstr "Se debe dar este campo si %(field)s es %(value)s" +msgstr "Se debe proporcionar este campo si %(field)s es %(value)s" #: core/validators.py:296 #, python-format msgid "This field must be given if %(field)s is not %(value)s" -msgstr "Se debe dar este campo si %(field)s no es %(value)s" +msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s" #: core/validators.py:315 msgid "Duplicate values are not allowed." @@ -1669,9 +1669,9 @@ 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] "" -"Por favor, introduzca un nmero decimal vlido con al menos %s dtigo total." +"Por favor, introduzca un nmero decimal vlido con al menos %s dgito total." msgstr[1] "" -"Por favor, introduzca un nmero decimal vlido con al menos %s dtigos " +"Por favor, introduzca un nmero decimal vlido con al menos %s dgitos " "totales." #: core/validators.py:354 @@ -1680,21 +1680,21 @@ 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] "" -"Por favor, introduzca un nmero decimal vlido con al menos %s dtigo " +"Por favor, introduzca un nmero decimal vlido con al menos %s dgito " "decimal." msgstr[1] "" -"Por favor, introduzca un nmero decimal vlido con al menos %s dtigos " +"Por favor, introduzca un nmero decimal vlido con al menos %s dgitos " "decimales." #: core/validators.py:364 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." -msgstr "Asegrese de que el fichero que enva mide al menos %s bytes." +msgstr "Asegrese de que el fichero que enva tiene al menos %s bytes." #: core/validators.py:365 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." -msgstr "Asegrese de que el fichero que enva mide como mximo %s bytes." +msgstr "Asegrese de que el fichero que enva tiene como mximo %s bytes." #: core/validators.py:378 msgid "The format for this field is wrong." @@ -1714,8 +1714,8 @@ msgstr "No pude obtener nada de %s." msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" -"La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s'.que no es " -"vlida." +"La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s', que no " +"es vlida." #: core/validators.py:464 #, python-format @@ -1771,6 +1771,11 @@ msgstr "" "El atributo \"%(attr)s\" de la lnea %(line)s tiene un valor que no es " "vlido. (La lnea empieza por \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, fuzzy, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "Ya existe %(optname)s con este %(fieldname)s." + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1783,7 +1788,7 @@ msgstr "Ya existe %(optname)s con este %(fieldname)s." #: core/meta/fields.py:129 msgid " Separate multiple IDs with commas." -msgstr " Separe mltiples ID con comas." +msgstr " Separe mltiples IDs con comas." #: core/meta/fields.py:132 msgid "" @@ -1794,7 +1799,7 @@ msgstr "Pulse \"Control\" o \"Command\" en un Mac para escoger m msgid "Enter a valid filename." msgstr "Introduzca un nombre de fichero vlido" -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -1808,4 +1813,4 @@ msgstr[1] "" #: core/template/defaultfilters.py:354 msgid "yes,no,maybe" -msgstr "" +msgstr "s,no,tal vez" diff --git a/django/conf/locale/es/LC_MESSAGES/djangojs.mo b/django/conf/locale/es/LC_MESSAGES/djangojs.mo index e16afe5546..701443cace 100644 Binary files a/django/conf/locale/es/LC_MESSAGES/djangojs.mo and b/django/conf/locale/es/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/es/LC_MESSAGES/djangojs.po b/django/conf/locale/es/LC_MESSAGES/djangojs.po index e8cc6176c2..99856cec36 100644 --- a/django/conf/locale/es/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/es/LC_MESSAGES/djangojs.po @@ -11,7 +11,7 @@ msgstr "" "PO-Revision-Date: 2005-12-06 21:32+0100\n" "Last-Translator: Jorge Gajon \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" #: contrib/admin/media/js/SelectFilter2.js:33 @@ -56,7 +56,7 @@ msgstr "" #: contrib/admin/media/js/dateparse.js:27 msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday" -msgstr "Domingo Lunes Martes Miércoles Jueves Viernes Sábado" +msgstr "Domingo Lunes Martes Mircoles Jueves Viernes Sbado" #: contrib/admin/media/js/calendar.js:25 msgid "S M T W T F S" @@ -85,7 +85,7 @@ msgstr "6 a.m." #: contrib/admin/media/js/admin/DateTimeShortcuts.js:83 msgid "Noon" -msgstr "Mediodía" +msgstr "Medioda" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:87 #: contrib/admin/media/js/admin/DateTimeShortcuts.js:168 @@ -107,4 +107,4 @@ msgstr "Ayer" #: contrib/admin/media/js/admin/DateTimeShortcuts.js:164 msgid "Tomorrow" -msgstr "Mañana" +msgstr "Maana" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 90a54a2b5f..0447d83e52 100644 Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index 7c930fa6f7..9061eec533 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:46+0100\n" +"POT-Creation-Date: 2005-12-14 17:22+0100\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Laurent Rahuel \n" "Language-Team: franais \n" @@ -15,6 +15,38 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "redirig depuis" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Ceci doit tre un chemin absolu, sans nom de domaine. Par exemple: '/events/" +"search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "redirig vers" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Ceci peut tre soit un chemin absolu (voir ci-dessus) soit une URL complte " +"dbutant par 'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "redirection" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "redirections" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 #, fuzzy @@ -277,6 +309,60 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Par exemple : '/about/contact/'. Vrifiez la prsence du caractre '/' en " +"dbut et en fin de chaine." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "titre" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "contenu" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "autoriser les commentaires" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "nom du template" + +#: contrib/flatpages/models/flatpages.py:12 +#, fuzzy +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Par exemple: 'flatfiles/contact_page'. Sans dfinition, le systme utilisera " +"'flatfiles/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "enregistrement requis" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Si coch, seuls les utilisateurs connects auront la possibilit de voir " +"cette page." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "page plat" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "pages plat" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -547,10 +633,6 @@ msgstr "" msgid "Time" msgstr "" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "" @@ -559,11 +641,19 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -579,9 +669,9 @@ msgstr "Modifier votre mot de passe" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -596,10 +686,10 @@ msgid "Log out" msgstr "Dconnection" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -638,13 +728,15 @@ msgstr "" "Cet objet n'a pas d'historique de modification. Il n'a probablement pas t " "ajout au moyen de ce site d'administration." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Site d'administration de Django" +#: contrib/admin/templates/admin/change_list.html:10 +#, fuzzy, python-format +msgid "Add %(name)s" +msgstr "Ajouter" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administration de Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "" #: contrib/admin/templates/admin/500.html:4 #, fuzzy @@ -668,14 +760,17 @@ msgstr "" "administrateurs du site et sera corrige dans les meilleurs dlais. Merci " "pour votre patience." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Cette page n'a pas t trouve" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Nous sommes dsols, mais la page demande est introuvable." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Site d'administration de Django" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administration de Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -702,10 +797,14 @@ msgstr "Mes actions" msgid "None available" msgstr "Aucun(e) disponible" -#: contrib/admin/templates/admin/change_list.html:10 -#, fuzzy, python-format -msgid "Add %(name)s" -msgstr "Ajouter" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Cette page n'a pas t trouve" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Nous sommes dsols, mais la page demande est introuvable." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -719,6 +818,24 @@ msgstr "Mot de passe" msgid "Have you forgotten your password?" msgstr "Avez vous perdu votre mot de passe?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Bienvenue," @@ -747,33 +864,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Oui, je suis certain" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "" @@ -973,96 +1063,6 @@ msgstr "" msgid "As above, but opens the admin page in a new window." msgstr "" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "redirig depuis" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Ceci doit tre un chemin absolu, sans nom de domaine. Par exemple: '/events/" -"search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "redirig vers" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Ceci peut tre soit un chemin absolu (voir ci-dessus) soit une URL complte " -"dbutant par 'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "redirection" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "redirections" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Par exemple : '/about/contact/'. Vrifiez la prsence du caractre '/' en " -"dbut et en fin de chaine." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "titre" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "contenu" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "autoriser les commentaires" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "nom du template" - -#: contrib/flatpages/models/flatpages.py:12 -#, fuzzy -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Par exemple: 'flatfiles/contact_page'. Sans dfinition, le systme utilisera " -"'flatfiles/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "enregistrement requis" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Si coch, seuls les utilisateurs connects auront la possibilit de voir " -"cette page." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "page plat" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "pages plat" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1454,38 +1454,38 @@ msgstr "" msgid "This field is required." msgstr "Ce champ est invalide." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 #, fuzzy msgid "Line breaks are not allowed here." msgstr "Les lettres minuscules ne sont pas autorises ici." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "" -#: core/formfields.py:655 +#: core/formfields.py:657 #, fuzzy msgid "Enter a whole number between -32,768 and 32,767." msgstr "Entrez un nombre entier." -#: core/formfields.py:664 +#: core/formfields.py:666 #, fuzzy msgid "Enter a positive number." msgstr "Entrez un nombre entier." -#: core/formfields.py:673 +#: core/formfields.py:675 #, fuzzy msgid "Enter a whole number between 0 and 32,767." msgstr "Entrez un nombre entier." @@ -1764,6 +1764,11 @@ msgstr "" "La valeur de l'attribut \"%(attr)s\" de la ligne %(line)s n'est pas valide. " "(Ligne dbutant par \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, fuzzy, python-format msgid "Please enter a valid %s." @@ -1790,7 +1795,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Entrez une adresse de courriel valide." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index a98ea5433c..f2322b7056 100644 Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index 85800a6ba9..1f422c2528 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:45+0100\n" +"POT-Creation-Date: 2005-12-14 17:21+0100\n" "PO-Revision-Date: 2005-12-08 15:03+0100\n" "Last-Translator: Afonso Fernández Nogueira \n" "Language-Team: Galego\n" @@ -17,6 +17,38 @@ msgstr "" "X-Poedit-Language: Galician\n" "X-Poedit-SourceCharset: utf-8\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "orixe da redirección" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Debe ser unha ruta absoluta, sen o nome de dominio. Exemplo: '/events/" +"search/'" + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "destino da redirección" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Pode ser unha ruta absoluta (coma a de enriba) ou un URL completo que empece " +"por 'http://'" + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "redirección" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "redireccións" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -284,6 +316,56 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "O formulario de comentario non proporciona 'preview' ou 'post'" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Exemplo: '/about/contact/'. Lembre incluír as barras ao principio e ao final." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "título" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "contido" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "activar comentarios" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "nome da plantilla" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Exemplo: 'flatpages/contact_page'. Se non se especifica, o sistema usará " +"'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "require rexistro" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "Se se marca, só poderán ver a páxina os usuarios identificados." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "páxina simple" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "páxinas simples" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -556,10 +638,6 @@ msgstr "Texto" msgid "Time" msgstr "Hora" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "Estado dos Estados Unidos (dúas letras maíusculas)" @@ -568,11 +646,19 @@ msgstr "Estado dos Estados Unidos (dúas letras maíusculas)" msgid "XML text" msgstr "Texto XML" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Hora" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -588,9 +674,9 @@ msgstr "Cambiar contrasinal" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -605,10 +691,10 @@ msgid "Log out" msgstr "Saír" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -647,13 +733,15 @@ msgstr "" "Este obxecto non ten histórico de cambios. Posibelmente non se creou usando " "este sitio de administración." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Administración de sitio Django" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "Engadir %(name)s" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administración de Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr " Por %(title)s " #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -675,14 +763,17 @@ msgstr "" "Houbo un erro. Xa se informou aos administradores do sitio por correo " "electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Páxina non atopada" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "Ir" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Sentímolo, pero non se atopou a páxina solicitada." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Administración de sitio Django" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administración de Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -709,10 +800,14 @@ msgstr "As miñas accións" msgid "None available" msgstr "Ningunha dispoñíbel" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "Engadir %(name)s" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Páxina non atopada" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Sentímolo, pero non se atopou a páxina solicitada." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -726,6 +821,24 @@ msgstr "Contrasinal:" msgid "Have you forgotten your password?" msgstr "Esqueceu o contrasinal?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Ver na web" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Por favor, corrixa o erro de embaixo." +msgstr[1] "Por favor, corrixa os erros de embaixo." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Orde" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Orde:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Benvido," @@ -754,33 +867,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Si, estou seguro" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr " Por %(title)s " - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "Ir" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Ver na web" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Por favor, corrixa o erro de embaixo." -msgstr[1] "Por favor, corrixa os erros de embaixo." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Orde" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Orde:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Eliminar" @@ -987,92 +1073,6 @@ msgstr "Editar este obxecto (nunha nova fiestra)" msgid "As above, but opens the admin page in a new window." msgstr "Como enriba, pero abre a páxina de administración nunha nova fiestra." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "Data:" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "Hora" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "orixe da redirección" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Debe ser unha ruta absoluta, sen o nome de dominio. Exemplo: '/events/" -"search/'" - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "destino da redirección" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Pode ser unha ruta absoluta (coma a de enriba) ou un URL completo que empece " -"por 'http://'" - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "redirección" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "redireccións" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Exemplo: '/about/contact/'. Lembre incluír as barras ao principio e ao final." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "título" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "contido" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "activar comentarios" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "nome da plantilla" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Exemplo: 'flatpages/contact_page'. Se non se especifica, o sistema usará " -"'flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "require rexistro" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "Se se marca, só poderán ver a páxina os usuarios identificados." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "páxina simple" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "páxinas simples" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "d-m-Y" @@ -1456,35 +1456,35 @@ msgstr "chinés simplificado" msgid "This field is required." msgstr "Requírese este campo." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "Asegúrese de que o seu texto contén menos de %s carácter." msgstr[1] "Asegúrese de que o seu texto contén menos de %s caracteres." -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "Aquí non se permiten saltos de liña." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Elixa unha opción válida; '%(data)s' non está en %(choices)s." -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "O ficheiro enviado está baleiro." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Insira un número enteiro entre -32.768 e 32.767." -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "Insira un número positivo." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "Insira un número enteiro entre 0 e 32.767." @@ -1754,6 +1754,11 @@ msgstr "" "O atributo \"%(attr)s\" na liña %(line)s contén un valor non válido. (A liña " "comeza con \"%(start)s\")." +#: core/meta/__init__.py:1946 +#, fuzzy, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "Xa existe un/ha %(optname)s con este/a %(fieldname)s." + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1779,7 +1784,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Introduza un nome de ficheiro válido." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo index 3d768bd798..5ceffcfa31 100644 Binary files a/django/conf/locale/is/LC_MESSAGES/django.mo and b/django/conf/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po index 3a702be408..f6ec883235 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.po +++ b/django/conf/locale/is/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:47+0100\n" +"POT-Creation-Date: 2005-12-14 17:22+0100\n" "PO-Revision-Date: 2005-11-13 18:08-0000\n" "Last-Translator: Dagur Páll Ammendrup \n" "Language-Team: \n" @@ -18,6 +18,36 @@ msgstr "" "X-Poedit-Country: ICELAND\n" "Plural-Forms: nplurals=2; plural=n != 1\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "beina frá" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "Þetta þarf að vera full slóð án lénsins. Dæmi: '/events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "beina til" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Þetta getur verið full slóð (eins og hér að ofan) eða veffang með 'http://' " +"fremst." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "beining" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "beiningar" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 #, fuzzy @@ -280,6 +310,56 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "veffang" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "Dænu: '/about/contact/'. Passaðu að hafa skástrik fremst og aftast." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "titill" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "innihald" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "virkja athugasemdir" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "nafn sniðmáts" + +#: contrib/flatpages/models/flatpages.py:12 +#, fuzzy +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Dæmi: 'flatfiles/contact_page'. Ef ekkert er gefið upp mun kerfið nota " +"'flatfiles/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "skráning nauðsynleg" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "Ef þetta er valið fá bara innskráðir notendur að sjá síðuna." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "flöt síða" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "flatar síður" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -550,10 +630,6 @@ msgstr "" msgid "Time" msgstr "" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "veffang" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "" @@ -562,11 +638,19 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -582,9 +666,9 @@ msgstr "Breyta lykilorði" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -599,10 +683,10 @@ msgid "Log out" msgstr "Skrá út" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -641,13 +725,15 @@ msgstr "" "Þessi hlutur hefur enga breytingasögu. Hann var líklega ekki búinn til á " "þessari stjórnunarsíðu." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django vefstjóri" +#: contrib/admin/templates/admin/change_list.html:10 +#, fuzzy, python-format +msgid "Add %(name)s" +msgstr "Bæta við" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django vefstjórn" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -669,14 +755,17 @@ msgstr "" "Villa hefur komið upp. Hún hefur verið tilkynnt vefstjórunum með tölvupósti " "og ætti að verða lagað fljótlega. Þökkum þolinmæðina." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Síða fannst ekki" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Því miður fannst umbeðin síða ekki." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django vefstjóri" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Django vefstjórn" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -703,10 +792,14 @@ msgstr "Aðgerðir mínar" msgid "None available" msgstr "Engin fáanleg" -#: contrib/admin/templates/admin/change_list.html:10 -#, fuzzy, python-format -msgid "Add %(name)s" -msgstr "Bæta við" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Síða fannst ekki" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Því miður fannst umbeðin síða ekki." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -720,6 +813,24 @@ msgstr "Lykilorð:" msgid "Have you forgotten your password?" msgstr "Gleymdir þú lykilorðinu þínu?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Velkomin(n)," @@ -747,33 +858,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Já ég er viss." -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "" @@ -973,90 +1057,6 @@ msgstr "" msgid "As above, but opens the admin page in a new window." msgstr "" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "beina frá" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "Þetta þarf að vera full slóð án lénsins. Dæmi: '/events/search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "beina til" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Þetta getur verið full slóð (eins og hér að ofan) eða veffang með 'http://' " -"fremst." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "beining" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "beiningar" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "Dænu: '/about/contact/'. Passaðu að hafa skástrik fremst og aftast." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "titill" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "innihald" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "virkja athugasemdir" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "nafn sniðmáts" - -#: contrib/flatpages/models/flatpages.py:12 -#, fuzzy -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Dæmi: 'flatfiles/contact_page'. Ef ekkert er gefið upp mun kerfið nota " -"'flatfiles/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "skráning nauðsynleg" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "Ef þetta er valið fá bara innskráðir notendur að sjá síðuna." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "flöt síða" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "flatar síður" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1445,38 +1445,38 @@ msgstr "Einfölduð Kínverska " msgid "This field is required." msgstr "Þessi reitur er ótækur." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 #, fuzzy msgid "Line breaks are not allowed here." msgstr "Lágstafir eru ekki leyfðir hér." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "" -#: core/formfields.py:655 +#: core/formfields.py:657 #, fuzzy msgid "Enter a whole number between -32,768 and 32,767." msgstr "Settu inn heila tölu." -#: core/formfields.py:664 +#: core/formfields.py:666 #, fuzzy msgid "Enter a positive number." msgstr "Settu inn heila tölu." -#: core/formfields.py:673 +#: core/formfields.py:675 #, fuzzy msgid "Enter a whole number between 0 and 32,767." msgstr "Settu inn heila tölu." @@ -1743,6 +1743,11 @@ msgstr "" "\"%(attr)s\" eigindið á línu %(line)s hefur ótækt gildi (línan hefst á \"%" "(start)s\")." +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, fuzzy, python-format msgid "Please enter a valid %s." @@ -1769,7 +1774,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Skrifaðu gilt tölvupóstfang." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index a936c33bb9..28139c993a 100644 Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 3e147e0178..1893996b69 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/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-12-09 11:46+0100\n" +"POT-Creation-Date: 2005-12-14 17:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,6 +16,37 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "redirigi da" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Un percorso assoluto, senza nome a dominio. Esempio: '/events/search/'.Un " +"percorso assoluto, senza nome a dominio. Esempio: '/events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "redirigi verso" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Un percorso assoluto (come sopra) o un URL completa che inizi con 'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "redirigi" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "redirezioni" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 #, fuzzy @@ -278,6 +309,57 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Esempio: '/about/contact/'. Attenzione alla barra ('/') iniziale e finale." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "titolo" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "contenuto" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "abilita commenti" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "nome modello" + +#: contrib/flatpages/models/flatpages.py:12 +#, fuzzy +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Esempio: 'flatfiles/contact_page'. Se non specificato, il sistema user " +"'flatfiles/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "registrazione obbligatoria" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "Se selezionata, solo gli utenti registrati potranno vedere la pagina." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "pagina statica" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "pagine statiche" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -548,10 +630,6 @@ msgstr "" msgid "Time" msgstr "" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "" @@ -560,11 +638,19 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -580,9 +666,9 @@ msgstr "Cambia la password" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -597,10 +683,10 @@ msgid "Log out" msgstr "Esci" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -639,13 +725,15 @@ msgstr "" "Questo oggetto non ha cambiamenti storicizzati. Probabilmente non stato " "creato con questo sito di amministrazione." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Amministrazione sito Django" +#: contrib/admin/templates/admin/change_list.html:10 +#, fuzzy, python-format +msgid "Add %(name)s" +msgstr "Aggiungi" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Amministrazione Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "" #: contrib/admin/templates/admin/500.html:4 #, fuzzy @@ -668,14 +756,17 @@ msgstr "" "C' stato un errore. E' stato riportato agli amministratori del sito via e-" "mail e verr risolto a breve. Grazie per la pazienza." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Pagina non trovata" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Spiacente, ma la pagina richiesta non esiste." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Amministrazione sito Django" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Amministrazione Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -702,10 +793,14 @@ msgstr "Azioni Proprie" msgid "None available" msgstr "Nessuna disponibile" -#: contrib/admin/templates/admin/change_list.html:10 -#, fuzzy, python-format -msgid "Add %(name)s" -msgstr "Aggiungi" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Pagina non trovata" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Spiacente, ma la pagina richiesta non esiste." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -719,6 +814,24 @@ msgstr "Password:" msgid "Have you forgotten your password?" msgstr "Hai dimenticato la tua password?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Benvenuto," @@ -747,33 +860,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "S, sono sicuro" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "" @@ -971,92 +1057,6 @@ msgstr "" msgid "As above, but opens the admin page in a new window." msgstr "" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "redirigi da" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Un percorso assoluto, senza nome a dominio. Esempio: '/events/search/'.Un " -"percorso assoluto, senza nome a dominio. Esempio: '/events/search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "redirigi verso" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Un percorso assoluto (come sopra) o un URL completa che inizi con 'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "redirigi" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "redirezioni" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Esempio: '/about/contact/'. Attenzione alla barra ('/') iniziale e finale." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "titolo" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "contenuto" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "abilita commenti" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "nome modello" - -#: contrib/flatpages/models/flatpages.py:12 -#, fuzzy -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Esempio: 'flatfiles/contact_page'. Se non specificato, il sistema user " -"'flatfiles/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "registrazione obbligatoria" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "Se selezionata, solo gli utenti registrati potranno vedere la pagina." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "pagina statica" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "pagine statiche" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1445,38 +1445,38 @@ msgstr "" msgid "This field is required." msgstr "Il campo non valido." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 #, fuzzy msgid "Line breaks are not allowed here." msgstr "Non sono ammesse lettere minuscole." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "" -#: core/formfields.py:655 +#: core/formfields.py:657 #, fuzzy msgid "Enter a whole number between -32,768 and 32,767." msgstr "Inserire un numero." -#: core/formfields.py:664 +#: core/formfields.py:666 #, fuzzy msgid "Enter a positive number." msgstr "Inserire un numero." -#: core/formfields.py:673 +#: core/formfields.py:675 #, fuzzy msgid "Enter a whole number between 0 and 32,767." msgstr "Inserire un numero." @@ -1745,6 +1745,11 @@ msgstr "" "L'attributo \"%(attr)s\" alla linea %(line)s ha un valore non valido. (La " "linea comincia con \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, fuzzy, python-format msgid "Please enter a valid %s." @@ -1769,7 +1774,7 @@ msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi msgid "Enter a valid filename." msgstr "Inserire un indirizzo e-mail valido." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo index 89d0e2ac8f..b055a022d7 100644 Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po index 546be65797..06b8d6ae98 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.po +++ b/django/conf/locale/no/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-12-09 11:47+0100\n" +"POT-Creation-Date: 2005-12-14 17:23+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Espen Grndhaug \n" "Language-Team: Norwegian\n" @@ -16,6 +16,38 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "omadresser fra" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Denne burde vær en fullstendig sti, uten domene navnet. Foreksempel: '/" +"nyheter/les/" + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "omadresser til" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Denne kan enten være en fullstendig sti (som over), eller en hel " +"internettadresse som starter med 'http://'" + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "omadressering" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "omadresserelser" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 #, fuzzy @@ -292,6 +324,58 @@ msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" "Kommentar skjemaet returnerte ikke et 'forhåndsvisning' eller 'post' objekt" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "Internettadresse" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstrek forran og bak." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "tittel" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "innhold" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "tillat kommentarer" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "mal navn" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Eksempel: 'flatfiler/kontakt_side'. Vist denne ikke denne er gitt, vill " +"'flatfiles/default' bli brukt." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "registrering kreves" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Vist denne er krysset av er det bare brukere som er logget inn som kan se " +"siden." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "flatside" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "flatsider" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -567,10 +651,6 @@ msgstr "Tekst" msgid "Time" msgstr "Tid" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "Internettadresse" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "Stat (i USA, to store bokstaver)" @@ -579,11 +659,20 @@ msgstr "Stat (i USA, to store bokstaver)" msgid "XML text" msgstr "XML tekst" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +#, fuzzy +msgid "Time:" +msgstr "Tid" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -599,9 +688,9 @@ msgstr "Endre passord" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -616,10 +705,10 @@ msgid "Log out" msgstr "Log ut" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -658,13 +747,15 @@ msgstr "" "Dette objektet har ingen endrings historie. Den var sannsynligvis ikke laget " "via denne siden" -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django administrasjonsside" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "Legg til %(name)s" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administrasjon" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "Av %(title)s " #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -686,14 +777,17 @@ msgstr "" "Det har vært en feil. Feilen er blitt rapportert til administrator via e-" "mail, og vill bli fikset snart. Takk for din tålmodighet." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Fant ikke siden" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Beklager, men siden du spør etter finnest ikke." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django administrasjonsside" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Django administrasjon" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -720,10 +814,14 @@ msgstr "Mine handlinger" msgid "None available" msgstr "Ingen tilgjengelige" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "Legg til %(name)s" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Fant ikke siden" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Beklager, men siden du spør etter finnest ikke." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -737,6 +835,24 @@ msgstr "Passord:" msgid "Have you forgotten your password?" msgstr "Har du glemt passordet ditt?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Vis på siden" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Vennligst fiks feilen under." +msgstr[1] "Vennligst fiks feilene under." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Rekkefølge" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Rekkefølge:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Velkommen" @@ -764,33 +880,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ja, jeg er sikker" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "Av %(title)s " - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Vis på siden" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Vennligst fiks feilen under." -msgstr[1] "Vennligst fiks feilene under." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Rekkefølge" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Rekkefølge:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Slett" @@ -992,95 +1081,6 @@ msgstr "Endre dette objektet (åpnes i et nytt vindu)" msgid "As above, but opens the admin page in a new window." msgstr "Samme som over, men åpner administrasjonsiden i et nytt vindu." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -#, fuzzy -msgid "Time:" -msgstr "Tid" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "omadresser fra" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Denne burde vær en fullstendig sti, uten domene navnet. Foreksempel: '/" -"nyheter/les/" - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "omadresser til" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Denne kan enten være en fullstendig sti (som over), eller en hel " -"internettadresse som starter med 'http://'" - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "omadressering" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "omadresserelser" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstrek forran og bak." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "tittel" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "innhold" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "tillat kommentarer" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "mal navn" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Eksempel: 'flatfiler/kontakt_side'. Vist denne ikke denne er gitt, vill " -"'flatfiles/default' bli brukt." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "registrering kreves" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Vist denne er krysset av er det bare brukere som er logget inn som kan se " -"siden." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "flatside" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "flatsider" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "j. M U" @@ -1466,35 +1466,35 @@ msgstr "Simplifisert Kinesisk" msgid "This field is required." msgstr "Dette feltet er påkrevd." -#: core/formfields.py:336 +#: core/formfields.py:338 #, fuzzy, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "Sjekk at teksten er kortere enn %s bokstaver" msgstr[1] "Sjekk at teksten er kortere enn %s bokstaver" -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "Det er ikke tillatt med flere linjer her." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Velg et av valga; '%(data)s' er ikke i %(choices)s." -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "Filen er tom." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Skriv inn et heltall mellom -31768 og 32767." -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "Skriv inn et positivt heltall." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "Skriv inn et heltall mellom 0 og 32767." @@ -1766,6 +1766,11 @@ msgstr "" "\"%(attr)s\" tillegg på linje $(line)s har en ikke godkjent verdi. (Linja " "starter med \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, fuzzy, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "$(optname)s med %(fieldname)s finnes allerede." + #: core/meta/fields.py:46 #, fuzzy, python-format msgid "Please enter a valid %s." @@ -1791,7 +1796,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Skriv inn en godkjent e-post adresse." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index ecbc6544de..d3533b2555 100644 Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 096dc11fec..efeb67110b 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:45+0100\n" +"POT-Creation-Date: 2005-12-14 17:22+0100\n" "PO-Revision-Date: 2005-10-11 09:12GMT-3\n" "Last-Translator: João Paulo Farias \n" "Language-Team: Português do Brasil \n" @@ -16,6 +16,38 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "redirecionar de" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Deve conter um caminho absoluto, excluindo o nome de domínio. Exemplo: '/" +"eventos/busca/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "redirecionar para" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Deve conter um caminho absoluto (como acima) ou uma URL completa, começando " +"com 'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "redirecionar" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "redirecionamentos" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 #, fuzzy @@ -278,6 +310,56 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "Exemplo: '/sobre/contato/'. Lembre-se das barras no começo e no final." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "título" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "conteúdo" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "habilitar comentários" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "nome do modelo" + +#: contrib/flatpages/models/flatpages.py:12 +#, fuzzy +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Exemplo: 'flatfiles/contact_page'. Se não for informado, será utilizado " +"'flatfiles/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "é obrigatório registrar" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "Se estiver marcado, apenas usuários conectados poderão ver a página." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "página plana" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "páginas planas" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -548,10 +630,6 @@ msgstr "" msgid "Time" msgstr "" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "" @@ -560,11 +638,19 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -580,9 +666,9 @@ msgstr "Alterar senha" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -597,10 +683,10 @@ msgid "Log out" msgstr "Encerrar sessão" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -639,13 +725,15 @@ msgstr "" "Este objeto não tem um histórico de alterações. Ele provavelmente não foi " "adicionado por este site de administração." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Site de administração do Django" +#: contrib/admin/templates/admin/change_list.html:10 +#, fuzzy, python-format +msgid "Add %(name)s" +msgstr "Adicionar" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administração do Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "" #: contrib/admin/templates/admin/500.html:4 #, fuzzy @@ -668,14 +756,17 @@ msgstr "" "Houve um erro. Este foi reportado aos administradores do site através d e-" "mail e deve ser consertado em breve. Obrigado pela compreensão." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Página não encontrada" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Desculpe, mas a página requisitada não pode ser encontrada." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Site de administração do Django" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administração do Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -702,10 +793,14 @@ msgstr "Minhas Ações" msgid "None available" msgstr "Nenhuma disponível" -#: contrib/admin/templates/admin/change_list.html:10 -#, fuzzy, python-format -msgid "Add %(name)s" -msgstr "Adicionar" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Página não encontrada" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Desculpe, mas a página requisitada não pode ser encontrada." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -719,6 +814,24 @@ msgstr "Senha:" msgid "Have you forgotten your password?" msgstr "Você ?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Bem vindo," @@ -747,33 +860,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Sim, tenho certeza" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "" @@ -970,92 +1056,6 @@ msgstr "" msgid "As above, but opens the admin page in a new window." msgstr "" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "redirecionar de" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Deve conter um caminho absoluto, excluindo o nome de domínio. Exemplo: '/" -"eventos/busca/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "redirecionar para" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Deve conter um caminho absoluto (como acima) ou uma URL completa, começando " -"com 'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "redirecionar" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "redirecionamentos" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "Exemplo: '/sobre/contato/'. Lembre-se das barras no começo e no final." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "título" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "conteúdo" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "habilitar comentários" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "nome do modelo" - -#: contrib/flatpages/models/flatpages.py:12 -#, fuzzy -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Exemplo: 'flatfiles/contact_page'. Se não for informado, será utilizado " -"'flatfiles/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "é obrigatório registrar" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "Se estiver marcado, apenas usuários conectados poderão ver a página." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "página plana" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "páginas planas" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1449,38 +1449,38 @@ msgstr "" msgid "This field is required." msgstr "Este campo é inválido." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 #, fuzzy msgid "Line breaks are not allowed here." msgstr "Letras em minúsculo não são permitidas aqui." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "" -#: core/formfields.py:655 +#: core/formfields.py:657 #, fuzzy msgid "Enter a whole number between -32,768 and 32,767." msgstr "Informe um número inteiro." -#: core/formfields.py:664 +#: core/formfields.py:666 #, fuzzy msgid "Enter a positive number." msgstr "Informe um número inteiro." -#: core/formfields.py:673 +#: core/formfields.py:675 #, fuzzy msgid "Enter a whole number between 0 and 32,767." msgstr "Informe um número inteiro." @@ -1749,6 +1749,11 @@ msgstr "" "O atributo \"%(attr)s\" na linha %(line)s tem um valor inválido. (Linha " "começa com \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, fuzzy, python-format msgid "Please enter a valid %s." @@ -1775,7 +1780,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Informe um endereço de email válido." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo index 0fdd56436f..5d64f84d4f 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 19ce2bd8dc..1147cdd035 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-12-09 11:46+0100\n" +"POT-Creation-Date: 2005-12-14 17:20+0100\n" "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n" "Last-Translator: Tiberiu Micu \n" "Language-Team: Romanian \n" @@ -16,6 +16,38 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "redirectat de la " + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Aceasta ar trebui să fie o cale absolută, excluzînd numele de domeniu. " +"Exemplu: '/evenimente/cautare/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "redirectat la" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Aceasta poate fi o cale absolută (ca mai sus) sau un URL începînd cu " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "redirectare" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "redictări" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 #, fuzzy @@ -278,6 +310,59 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Exemplu: '/about/contact'. Asiguraţi-vă că aveţi slash-uri la început şi la " +"sfîrşit." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "titlu" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "conţinut" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "permite comentarii" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "nume şablon" + +#: contrib/flatpages/models/flatpages.py:12 +#, fuzzy +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Exemplu: 'flatfiles/pagina_contact'. Dacă aceasta nu există, sistemul va " +"folosi 'flatfiles/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "necesită înregistrare" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Dacă aceasta este bifată, numai utilizatorii logaţi vor putea vedea pagina." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "pagina plată" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "pagini plate" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -548,10 +633,6 @@ msgstr "" msgid "Time" msgstr "" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "" @@ -560,11 +641,19 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -580,9 +669,9 @@ msgstr "Schimbă parola" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -597,10 +686,10 @@ msgid "Log out" msgstr "Deautentificare" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -639,13 +728,15 @@ msgstr "" "Acest obiect nu are un istoric al schimbărilor. Probabil nu a fost adăugat " "prinintermediul acestui sit de administrare." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Administrare sit Django" +#: contrib/admin/templates/admin/change_list.html:10 +#, fuzzy, python-format +msgid "Add %(name)s" +msgstr "Adaugă" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administrare Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -667,14 +758,17 @@ msgstr "" "A apărut o eroare. Este raportată către administrator via emailşi va fi " "fixată în scurt timp. Mulţumim pentru înţelegere." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Pagină inexistentă" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Ne pare rău, dar pagina cerută nu există." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Administrare sit Django" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administrare Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -701,10 +795,14 @@ msgstr "Acţiunile Mele" msgid "None available" msgstr "Indisponibil" -#: contrib/admin/templates/admin/change_list.html:10 -#, fuzzy, python-format -msgid "Add %(name)s" -msgstr "Adaugă" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Pagină inexistentă" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Ne pare rău, dar pagina cerută nu există." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -718,6 +816,24 @@ msgstr "Parola:" msgid "Have you forgotten your password?" msgstr "Ai uitat parola?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Bine ai venit," @@ -746,33 +862,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Da, sînt sigur" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "" @@ -969,95 +1058,6 @@ msgstr "" msgid "As above, but opens the admin page in a new window." msgstr "" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "redirectat de la " - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Aceasta ar trebui să fie o cale absolută, excluzînd numele de domeniu. " -"Exemplu: '/evenimente/cautare/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "redirectat la" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Aceasta poate fi o cale absolută (ca mai sus) sau un URL începînd cu " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "redirectare" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "redictări" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Exemplu: '/about/contact'. Asiguraţi-vă că aveţi slash-uri la început şi la " -"sfîrşit." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "titlu" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "conţinut" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "permite comentarii" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "nume şablon" - -#: contrib/flatpages/models/flatpages.py:12 -#, fuzzy -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Exemplu: 'flatfiles/pagina_contact'. Dacă aceasta nu există, sistemul va " -"folosi 'flatfiles/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "necesită înregistrare" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Dacă aceasta este bifată, numai utilizatorii logaţi vor putea vedea pagina." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "pagina plată" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "pagini plate" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1445,38 +1445,38 @@ msgstr "Chineză simplificată" msgid "This field is required." msgstr "Cîmpul este invalid." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 #, fuzzy msgid "Line breaks are not allowed here." msgstr "Literele mici nu sînt permise aici." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "" -#: core/formfields.py:655 +#: core/formfields.py:657 #, fuzzy msgid "Enter a whole number between -32,768 and 32,767." msgstr "Introduceţi un număr întreg." -#: core/formfields.py:664 +#: core/formfields.py:666 #, fuzzy msgid "Enter a positive number." msgstr "Introduceţi un număr întreg." -#: core/formfields.py:673 +#: core/formfields.py:675 #, fuzzy msgid "Enter a whole number between 0 and 32,767." msgstr "Introduceţi un număr întreg." @@ -1749,6 +1749,11 @@ msgstr "" "Atributul \"%(attr)s\" din linia %(line)s are o valoare invalidă. ( Linia " "începe cu \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, fuzzy, python-format msgid "Please enter a valid %s." @@ -1775,7 +1780,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Introduceţi o adresă de email validă." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index 2d7b27e5b4..0d523e22b8 100644 Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index a2ada0bd82..5e14cedf3e 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:45+0100\n" +"POT-Creation-Date: 2005-12-14 17:20+0100\n" "PO-Revision-Date: 2005-11-26 00:00\n" "Last-Translator: Dmitry Sorokin \n" "Language-Team: LANGUAGE \n" @@ -15,6 +15,38 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr " " + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +" , . : '/events/" +"search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr " " + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +" , ( ) URL " +" 'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -269,6 +301,54 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +": '/about/contact/'. , ." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr " " + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr " " + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr " " + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr " , " + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr " " + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr " " + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -535,10 +615,6 @@ msgstr " msgid "Time" msgstr "" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr " ( )" @@ -547,11 +623,20 @@ msgstr " msgid "XML text" msgstr "XML " +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +#, fuzzy +msgid "Time:" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -567,9 +652,9 @@ msgstr " #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -584,10 +669,10 @@ msgid "Log out" msgstr "" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -626,13 +711,15 @@ msgstr "" " . " " ." -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr " Django" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr " %(name)s" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr " Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr "" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -654,14 +741,17 @@ msgstr "" " . e-mail " " . ." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr " " +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +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/base_site.html:4 +msgid "Django site admin" +msgstr " Django" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr " Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -688,10 +778,14 @@ msgstr " msgid "None available" msgstr "" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr " %(name)s" +#: 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/login.html:15 msgid "Username:" @@ -705,6 +799,24 @@ msgstr " msgid "Have you forgotten your password?" msgstr " ?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] " ." +msgstr[1] " ." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr ":" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr " ," @@ -733,33 +845,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr ", " -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] " ." -msgstr[1] " ." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr ":" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "" @@ -954,91 +1039,6 @@ msgstr " msgid "As above, but opens the admin page in a new window." msgstr " , " -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -#, fuzzy -msgid "Time:" -msgstr "" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr " " - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -" , . : '/events/" -"search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr " " - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -" , ( ) URL " -" 'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -": '/about/contact/'. , ." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr " " - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr " " - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr " " - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr " , " - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr " " - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr " " - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1422,35 +1422,35 @@ msgstr "" msgid "This field is required." msgstr " ." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "" msgstr[1] "" -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr " ." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr " - ." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "" -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr " ." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr " 0 32767." @@ -1712,6 +1712,11 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/__init__.py:1946 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "" + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1737,7 +1742,7 @@ msgstr "" msgid "Enter a valid filename." msgstr " ." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index 138aab9827..04d08f4426 100644 Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index c8f0fedcf9..095dd52059 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.po +++ b/django/conf/locale/sk/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-12-09 11:47+0100\n" +"POT-Creation-Date: 2005-12-14 17:23+0100\n" "PO-Revision-Date: 2005-11-10 23:22-0500\n" "Last-Translator: Vladimir Labath \n" "Language-Team: Slovak \n" @@ -16,6 +16,37 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "presmerovaný z" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "presmerovaný na " + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "presmerovanie" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "presmerovania" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -286,6 +317,58 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Formulár komentára neposkytuje odpoveď buď 'prezri' alebo 'pošli'" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " +"záverečné lomítka." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "názov" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "obsah" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "povolené komentáre" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "meno predlohy" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " +"'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "musíte byť zaregistrovaný" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "plochá stránka" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "ploché stránky" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -556,10 +639,6 @@ msgstr "Text" msgid "Time" msgstr "Čas" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "U.S. štát (dve veľké písmena)" @@ -568,11 +647,19 @@ msgstr "U.S. štát (dve veľké písmena)" msgid "XML text" msgstr "XML text" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Čas" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -588,9 +675,9 @@ msgstr "Zmena hesla" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -605,10 +692,10 @@ msgid "Log out" msgstr "Odhlásenie" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -647,13 +734,15 @@ msgstr "" "Tento object nemá históriu zmien. Možno nebol pridaný prostredníctvom tohoto " "web admina" -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django web admin" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administrácia Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr " Od %(title)s " #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -675,14 +764,17 @@ msgstr "" "Vznikla chyba. Prostredníctvom e-mailu bol o nej informovaný správca a " "chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Stránka nebola nájdená" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "Choď" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django web admin" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administrácia Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -709,10 +801,14 @@ msgstr "Moje udalosti" msgid "None available" msgstr "Nepovolené" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Stránka nebola nájdená" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -726,6 +822,24 @@ msgstr "Heslo:" msgid "Have you forgotten your password?" msgstr "Zabudli ste vaše heslo?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Pozri na webe" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Opravte chybu, čo je nižšie, prosím." +msgstr[1] "Opravte chyby, čo sú nižšie, prosím." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Určenie" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Poradie:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Vítajte," @@ -754,33 +868,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ano, som si istý" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr " Od %(title)s " - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "Choď" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Pozri na webe" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Opravte chybu, čo je nižšie, prosím." -msgstr[1] "Opravte chyby, čo sú nižšie, prosím." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Určenie" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Poradie:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Vymazať" @@ -989,93 +1076,6 @@ msgstr "Editujte tento objekt (nové okno)" msgid "As above, but opens the admin page in a new window." msgstr "Ako vyššie, ale stranka admina sa otvorí v novom okne." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "Čas" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "presmerovaný z" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "presmerovaný na " - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "presmerovanie" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "presmerovania" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " -"záverečné lomítka." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "názov" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "obsah" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "povolené komentáre" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "meno predlohy" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " -"'flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "musíte byť zaregistrovaný" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "plochá stránka" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "ploché stránky" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1459,35 +1459,35 @@ msgstr "Zjednodušená činština " msgid "This field is required." msgstr "Toto pole je nevyhnutné." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "Zabezpečte aby váš text bol menší ako %s znak." msgstr[1] "Zabezpečte aby váš text bol menší ako %s znakov." -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "Nový riadok tu nieje povolený." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Vyberte si platnú voľbu; '%(data)s' nie je v %(choices)s." -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "Poslaný súbor je prázdný." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Vložte celé číslo s hodnotou medzi -32768 a 32767." -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "Vložte celé kladné číslo." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "Vložte celé číslo s hodnotou medzi 0 a 32767." @@ -1757,6 +1757,11 @@ msgstr "" "Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína " "s \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, fuzzy, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "%(optname)s s %(fieldname)s už existuje." + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1782,7 +1787,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Vložte platné meno súboru." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index dd5e68553b..9928c5aa54 100644 Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index 6b0274db70..bce5122c6f 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:45+0100\n" +"POT-Creation-Date: 2005-12-14 17:20+0100\n" "PO-Revision-Date: 2005-12-05 15:00+0100\n" "Last-Translator: Nebojša Đorđević \n" "Language-Team: Nesh & Petar forgotten your password?" msgstr "Da li ste zaboravili Vašu lozinku??" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Pogledaj na sajtu" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Ispravite dole navedenu grešku." +msgstr[1] "Ispravite dole navedene greške." +msgstr[2] "Ispravite dole navedene greške." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Redosled" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Red:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Dobrodošli," @@ -760,34 +877,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Da, siguran sam" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr "Po %(title)s " - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "Uradi" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Pogledaj na sajtu" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Ispravite dole navedenu grešku." -msgstr[1] "Ispravite dole navedene greške." -msgstr[2] "Ispravite dole navedene greške." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Redosled" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Red:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Obriši" @@ -993,95 +1082,6 @@ msgstr "Izmeni objekt (novi prozor)" msgid "As above, but opens the admin page in a new window." msgstr "Kao iznad, samo otvara admin stranu u novom prozoru." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "Datum:" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "Vreme:" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "redirekcija od" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/" -"search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "redirekcija na" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "redirekcija" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "redirekcije" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu " -"crtu." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "naslov" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "sadržaj" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "omogućite komentare" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "ime templejta" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti " -"flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "samo za registrovane korisnike" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj " -"strani." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "statična strana" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "statične strane" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "D, d.m.Y." @@ -1469,7 +1469,7 @@ msgstr "Kineski (pojednostavljen)" msgid "This field is required." msgstr "Obavezno polje." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." @@ -1477,28 +1477,28 @@ msgstr[0] "Tekst mora imati manje od %s slova." msgstr[1] "Tekst mora imati manje od %s slova." msgstr[2] "Tekst mora imati manje od %s slova." -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "Novi redovi ovde nisu dozvoljeni." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Izaberite validnu opciju: '%(data)s' nije u %(choices)s." -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "Poslati fajl je prazan." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Unesite celi broj između -32,768 i 32,767." -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "Unesite pozitivan broj." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "Unesite celi broj između 0 i 32,767." @@ -1771,6 +1771,11 @@ msgstr "" "Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje " "sa \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, fuzzy, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "%(optname)s sa ovim %(fieldname)s već postoji." + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1796,7 +1801,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Unesite ispravno ime fajla." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo index c52cd562d8..3c4673016d 100644 Binary files a/django/conf/locale/sv/LC_MESSAGES/django.mo and b/django/conf/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po index 02bd7585ea..86290912e2 100644 --- a/django/conf/locale/sv/LC_MESSAGES/django.po +++ b/django/conf/locale/sv/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-09 11:47+0100\n" +"POT-Creation-Date: 2005-12-14 17:21+0100\n" "PO-Revision-Date: 2005-12-04 16:20+0100\n" "Last-Translator: Robin Sonefors \n" "Language-Team: Django translators \n" @@ -18,6 +18,38 @@ msgstr "" "X-Poedit-Language: Swedish\n" "X-Poedit-Country: SWEDEN\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "vidarebefodra från" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Det här bör vara en absolut sökväg, förutom domännamnet. Exempel: '/" +"handelser/sok/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "vidarebefodra till" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Det här kan vara antingen en absolut sökväg (som ovan), eller en komplett " +"adress som börjar med 'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "vidarebefodra" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "vidarebefodringar" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -288,6 +320,57 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Kommenteringsformuläret skickade varken 'förhandsgranska' eller 'post'" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Exempel: '/om/kontakt/'. Se till att ha inledande och avslutande snedsträck." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "titel" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "innehåll" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "aktivera kommentarer" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "mallnamn" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Exempel: 'flatpages/kontaktsida'. Om det här inte fylls i kommer systemet " +"att använda 'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "registrering krävs" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Om det här bockas i kommer endast inloggade användare att kunna visa sidan" + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "flatsida" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "flatsidor" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -556,10 +639,6 @@ msgstr "Text" msgid "Time" msgstr "Tid" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "Stat i USA (två stora bokstäver)" @@ -568,11 +647,19 @@ msgstr "Stat i USA (två stora bokstäver)" msgid "XML text" msgstr "XML-text" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Tid:" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -588,9 +675,9 @@ msgstr "Ändra lösenord" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -605,10 +692,10 @@ msgid "Log out" msgstr "Logga ut" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -647,13 +734,15 @@ msgstr "" "Det här objektet har ingen ändringshistorik. Det lades antagligen inte till " "i den här admin-sidan" -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Djangos sidadministration" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "Lägg till %(name)s" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administration för Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr " Efter %(title)s " #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -675,14 +764,17 @@ msgstr "" "Ett fel har uppstått. Sidadministratören har meddelats via e-post och felet " "bör åtgärdas snart. Tack för ditt tålamod." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Sidan kunde inte hittas" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +msgstr "Utför" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Vi är ledsna, men den efterfrågade sidan kunde inte hittas." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Djangos sidadministration" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administration för Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -709,10 +801,14 @@ msgstr "Mina händelser" msgid "None available" msgstr "Inga tillgängliga" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "Lägg till %(name)s" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Sidan kunde inte hittas" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Vi är ledsna, men den efterfrågade sidan kunde inte hittas." #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -726,6 +822,24 @@ msgstr "Lösenord:" msgid "Have you forgotten your password?" msgstr "Har du glömt ditt lösenord?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Visa på hemsidan" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Rätta till felet nedan." +msgstr[1] "Rätta till felen nedan." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Sortering" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Sortera:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Välkommen," @@ -754,33 +868,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ja, jag är säker" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr " Efter %(title)s " - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "Utför" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Visa på hemsidan" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Rätta till felet nedan." -msgstr[1] "Rätta till felen nedan." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Sortering" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Sortera:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Ta bort" @@ -989,93 +1076,6 @@ msgstr "Redigera det här objektet (nytt fönster)" msgid "As above, but opens the admin page in a new window." msgstr "Som ovan, men öppnaradministrationssidan i ett nytt fönster." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "Datum:" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "Tid:" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "vidarebefodra från" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Det här bör vara en absolut sökväg, förutom domännamnet. Exempel: '/" -"handelser/sok/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "vidarebefodra till" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Det här kan vara antingen en absolut sökväg (som ovan), eller en komplett " -"adress som börjar med 'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "vidarebefodra" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "vidarebefodringar" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Exempel: '/om/kontakt/'. Se till att ha inledande och avslutande snedsträck." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "titel" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "innehåll" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "aktivera kommentarer" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "mallnamn" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Exempel: 'flatpages/kontaktsida'. Om det här inte fylls i kommer systemet " -"att använda 'flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "registrering krävs" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Om det här bockas i kommer endast inloggade användare att kunna visa sidan" - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "flatsida" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "flatsidor" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "Y-m-d" @@ -1459,35 +1459,35 @@ msgstr "Förenklad kinesiska" msgid "This field is required." msgstr "Det här fältet är obligatoriskt." -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "Se till att din text är kortare än %s tecken." msgstr[1] "Se till att din text är kortare än %s tecken." -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "Radbrytningar är inte tillåtna här." -#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Välj ett giltigt alternativ. '%(data)s' finns inte bland %(choices)s" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "Den insända filen är tom." -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "Fyll i ett heltal mellan -32 768 och 32 767." -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "Fyll i ett positivt heltal." -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "Fyll i ett heltal mellan 0 och 32 767." @@ -1757,6 +1757,11 @@ msgstr "" "Attributet \"%(attr)s\" på rad %(line)s har ett ogiltigt värde. (Raden " "börjar med \"%(start)s\".)" +#: core/meta/__init__.py:1946 +#, fuzzy, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "%(optname)s med det här %(fieldname)s finns redan." + #: core/meta/fields.py:46 #, python-format msgid "Please enter a valid %s." @@ -1781,7 +1786,7 @@ msgstr "" msgid "Enter a valid filename." msgstr "Fyll i ett giltigt filnamn." -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo index 13a4ab2241..eeebe3d5b2 100644 Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index 43d1ae92b5..a9fcc6c80d 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-04 14:55+0100\n" +"POT-Creation-Date: 2005-12-14 17:21+0100\n" "PO-Revision-Date: 2005-12-10 22:08+0800\n" "Last-Translator: Hiweed Leng \n" "Language-Team: Simplified Chinese \n" @@ -19,6 +19,34 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=1; plural=0;\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "重定向自" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "应该是一个绝对路径，不包括域名。例如：'/events/search/'。" + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "重定向到" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。" + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "重定向" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "重定向" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -79,8 +107,7 @@ msgstr "日期/时间已提交" msgid "is public" msgstr "公开" -#: contrib/comments/models/comments.py:26 -#: contrib/admin/views/doc.py:256 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256 msgid "IP address" msgstr "IP地址" @@ -89,8 +116,11 @@ msgid "is removed" msgstr "被删除" #: contrib/comments/models/comments.py:27 -msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead." -msgstr "如果评论不适合选中这个检查框。评论将被一条\"此评论已经被删除\"的消息所替换。" +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"如果评论不适合选中这个检查框。评论将被一条\"此评论已经被删除\"的消息所替换。" #: contrib/comments/models/comments.py:31 msgid "Comment" @@ -219,17 +249,20 @@ msgid "No voting for yourself" msgstr "不能给自已投票" #: contrib/comments/views/comments.py:25 -msgid "This rating is required because you've entered at least one other rating." +msgid "" +"This rating is required because you've entered at least one other rating." msgstr "要求此等级，因为你已经输入了至少一个等级。" #: contrib/comments/views/comments.py:109 #, python-format msgid "" -"This comment was posted by a user who has posted fewer than %(count)s comment:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comment:\n" "\n" "%(text)s" msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s comments:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comments:\n" "\n" "%(text)s" msgstr[0] "" @@ -265,7 +298,9 @@ msgstr "有人篡改了评论表格(安全侵害)" #: contrib/comments/views/comments.py:204 #: contrib/comments/views/comments.py:289 -msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid" +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" msgstr "评论表格有一个无效的 'target' 参数 -- 对象 ID 无效" #: contrib/comments/views/comments.py:254 @@ -273,6 +308,54 @@ msgstr "评论表格有一个无效的 'target' 参数 -- 对象 ID 无效" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "评论表格无法提供 '预览' 或 '张贴' 功能" +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "例如：'/about/contact/'。请确保前导和结尾的除号。" + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "标题" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "内容" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "允许评论" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "模板名称" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"例如：'flatfiles/contact_page'。如果未提供，系统将使用'flatfiles/default'。" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "请先注册" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "如果被选中，仅登录用户才可以查看此页。" + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "简单页面" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "简单页面" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -282,8 +365,7 @@ msgstr "" "

由 %s:

\n" "
    \n" -#: contrib/admin/filterspecs.py:70 -#: contrib/admin/filterspecs.py:88 +#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 #: contrib/admin/filterspecs.py:143 msgid "All" msgstr "全部" @@ -358,12 +440,18 @@ msgid "Log in" msgstr "登录" #: contrib/admin/views/decorators.py:56 -msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved." +msgid "" +"Please log in again, because your session has expired. Don't worry: Your " +"submission has been saved." msgstr "请重新登录，因为你的会话已经过期。不用担心：你的提交已经被保存。" #: contrib/admin/views/decorators.py:63 -msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again." -msgstr "看上去你的浏览器没有配置成接受 cookie 。请允许 cookie，重新装入本页面，再试一次。" +msgid "" +"Looks like your browser isn't configured to accept cookies. Please enable " +"cookies, reload this page, and try again." +msgstr "" +"看上去你的浏览器没有配置成接受 cookie 。请允许 cookie，重新装入本页面，再试一" +"次。" #: contrib/admin/views/decorators.py:77 msgid "Usernames cannot contain the '@' character." @@ -374,111 +462,106 @@ msgstr "用户名不能包含 '@' 字符。" msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "你的邮箱地址不是你的用户名。换 '%s' 试试。" -#: contrib/admin/views/main.py:49 +#: contrib/admin/views/main.py:52 msgid "Site administration" msgstr "站点管理员" -#: contrib/admin/views/main.py:64 +#: contrib/admin/views/main.py:67 #, python-format msgid "Select %s" msgstr "选择 %s" -#: contrib/admin/views/main.py:65 +#: contrib/admin/views/main.py:68 #, python-format msgid "Select %s to change" msgstr "选择 %s 来修改" -#: contrib/admin/views/main.py:407 +#: contrib/admin/views/main.py:410 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" 添加成功。" -#: contrib/admin/views/main.py:412 -#: contrib/admin/views/main.py:488 +#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491 msgid "You may edit it again below." msgstr "你可以在下面再次编辑它。" -#: contrib/admin/views/main.py:420 -#: contrib/admin/views/main.py:497 +#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500 #, python-format msgid "You may add another %s below." msgstr "你可以在下面增加另一个 %s 。" -#: contrib/admin/views/main.py:437 +#: contrib/admin/views/main.py:440 #, python-format msgid "Add %s" msgstr "增加 %s" -#: contrib/admin/views/main.py:453 +#: contrib/admin/views/main.py:456 #, python-format msgid "Added %s." msgstr "%s 已增加。" -#: contrib/admin/views/main.py:453 -#: contrib/admin/views/main.py:455 -#: contrib/admin/views/main.py:457 +#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458 +#: contrib/admin/views/main.py:460 msgid "and" msgstr "和" -#: contrib/admin/views/main.py:455 +#: contrib/admin/views/main.py:458 #, python-format msgid "Changed %s." msgstr "已修改 %s 。" -#: contrib/admin/views/main.py:457 +#: contrib/admin/views/main.py:460 #, python-format msgid "Deleted %s." msgstr "%s 已删除。" -#: contrib/admin/views/main.py:460 +#: contrib/admin/views/main.py:463 msgid "No fields changed." msgstr "没有字段被修改。" -#: contrib/admin/views/main.py:485 +#: contrib/admin/views/main.py:488 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" 修改成功。" -#: contrib/admin/views/main.py:494 +#: contrib/admin/views/main.py:497 #, python-format -msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。" -#: contrib/admin/views/main.py:532 +#: contrib/admin/views/main.py:535 #, python-format msgid "Change %s" msgstr "修改 %s" -#: contrib/admin/views/main.py:610 +#: contrib/admin/views/main.py:613 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "一个或多个 %(fieldname)s 在 %(name)s 中: %(obj)s" -#: contrib/admin/views/main.py:615 +#: contrib/admin/views/main.py:618 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "一个或多个 %(fieldname)s 在 %(name)s 中:" -#: contrib/admin/views/main.py:644 +#: contrib/admin/views/main.py:647 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 删除成功。" -#: contrib/admin/views/main.py:647 +#: contrib/admin/views/main.py:650 msgid "Are you sure?" msgstr "你确信吗？" -#: contrib/admin/views/main.py:662 +#: contrib/admin/views/main.py:665 #, python-format msgid "Change history: %s" msgstr "修改历史： %s" -#: contrib/admin/views/doc.py:244 -#: contrib/admin/views/doc.py:253 -#: contrib/admin/views/doc.py:255 -#: contrib/admin/views/doc.py:261 -#: contrib/admin/views/doc.py:262 -#: contrib/admin/views/doc.py:264 +#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253 +#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261 +#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264 msgid "Integer" msgstr "整数" @@ -507,8 +590,7 @@ msgstr "日期(带时间)" msgid "E-mail address" msgstr "邮箱地址" -#: contrib/admin/views/doc.py:251 -#: contrib/admin/views/doc.py:254 +#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254 msgid "File path" msgstr "文件路径" @@ -540,11 +622,6 @@ msgstr "文本" msgid "Time" msgstr "时间" -#: contrib/admin/views/doc.py:267 -#: contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "美国州名(两个大写字母)" @@ -553,11 +630,19 @@ msgstr "美国州名(两个大写字母)" msgid "XML text" msgstr "XML文本" +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "日期：" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "时间：" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -573,9 +658,9 @@ msgstr "修改口令" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -590,10 +675,10 @@ msgid "Log out" msgstr "注销" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: 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 @@ -612,8 +697,7 @@ msgstr "历史" msgid "Date/time" msgstr "日期/时间" -#: contrib/admin/templates/admin/object_history.html:19 -#: models/auth.py:47 +#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47 msgid "User" msgstr "用户" @@ -626,16 +710,20 @@ 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." +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 "Django管理站点" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "增加 %(name)s" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django管理员" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr " 由 %(title)s" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -650,17 +738,24 @@ msgid "Server Error (500)" msgstr "服务器错误 (500)" #: contrib/admin/templates/admin/500.html:10 -msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." -msgstr "存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢谢你的关心。" +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢" +"谢你的关心。" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "页面没有找到" +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Go" +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/base_site.html:4 +msgid "Django site admin" +msgstr "Django管理站点" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Django管理员" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -687,10 +782,14 @@ msgstr "我的动作" msgid "None available" msgstr "无可用的" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "增加 %(name)s" +#: 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/login.html:15 msgid "Username:" @@ -704,33 +803,6 @@ msgstr "口令：" msgid "Have you forgotten your password?" msgstr "忘记你的密码？" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "欢迎，" - -#: contrib/admin/templates/admin/delete_confirmation.html:6 -#, 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:13 -#, 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:17 -msgid "Yes, I'm sure" -msgstr "是的，我确定" - -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr " 由 %(title)s" - -#: contrib/admin/templates/admin/search_form.html:7 -msgid "Go" -msgstr "去" - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "在站点上查看" @@ -748,6 +820,32 @@ msgstr "排序中" msgid "Order:" msgstr "排序：" +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "欢迎，" + +#: contrib/admin/templates/admin/delete_confirmation.html:6 +#, 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:13 +#, 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:17 +msgid "Yes, I'm sure" +msgstr "是的，我确定" + #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "删除" @@ -792,8 +890,12 @@ 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 "忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮件发送给你。" +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:" @@ -817,12 +919,19 @@ 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 "我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。" +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 "请输入你的旧口令，为了安全起见，接着要输入你的新口令两遍，这样我们可以校验你输入的是否正确。" +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:" @@ -906,7 +1015,9 @@ msgid "Documentation for this page" msgstr "本页面的文档" #: contrib/admin/templates/admin_doc/bookmarklets.html:20 -msgid "Jumps you from any page to the documentation for the view that generates that page." +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." msgstr "对于任何页面跳转到生成这个页面的view所在的文件。" #: contrib/admin/templates/admin_doc/bookmarklets.html:22 @@ -914,7 +1025,9 @@ msgid "Show object ID" msgstr "显示对象ID" #: contrib/admin/templates/admin_doc/bookmarklets.html:23 -msgid "Shows the content-type and unique ID for pages that represent a single object." +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." msgstr "用于那些表现单个对象的页面显示 content-type 和唯一ID。" #: contrib/admin/templates/admin_doc/bookmarklets.html:25 @@ -933,87 +1046,15 @@ msgstr "编辑本对象(新窗口)" msgid "As above, but opens the admin page in a new window." msgstr "同上，但在新窗口中打开管理页面。" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "日期：" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "时间：" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "重定向自" - -#: contrib/redirects/models/redirects.py:8 -msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'." -msgstr "应该是一个绝对路径，不包括域名。例如：'/events/search/'。" - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "重定向到" - -#: contrib/redirects/models/redirects.py:10 -msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." -msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。" - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "重定向" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "重定向" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "例如：'/about/contact/'。请确保前导和结尾的除号。" - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "标题" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "内容" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "允许评论" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "模板名称" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'." -msgstr "例如：'flatfiles/contact_page'。如果未提供，系统将使用'flatfiles/default'。" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "请先注册" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "如果被选中，仅登录用户才可以查看此页。" - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "简单页面" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "简单页面" - -#: 这里不要翻译！Hiweed Leng. +#: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "DATE_FORMAT" -#: 这一行不要翻译！Hiweed Leng. +#: utils/translation.py:351 msgid "DATETIME_FORMAT" msgstr "DATETIME_FORMAT" -#: 这一行也不要翻译！Hiweed Leng. +#: utils/translation.py:352 msgid "TIME_FORMAT" msgstr "TIME_FORMAT" @@ -1053,28 +1094,23 @@ msgstr "一月" msgid "February" msgstr "二月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "March" msgstr "三月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "April" msgstr "四月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "May" msgstr "五月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "June" msgstr "六月" -#: utils/dates.py:15 -#: utils/dates.py:27 +#: utils/dates.py:15 utils/dates.py:27 msgid "July" msgstr "七月" @@ -1171,10 +1207,7 @@ msgstr "站点" msgid "label" msgstr "标签" -#: models/core.py:29 -#: models/core.py:40 -#: models/auth.py:6 -#: models/auth.py:19 +#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19 msgid "name" msgstr "名称" @@ -1226,8 +1259,7 @@ msgstr "代码名称" msgid "Permission" msgstr "许可" -#: models/auth.py:11 -#: models/auth.py:58 +#: models/auth.py:11 models/auth.py:58 msgid "Permissions" msgstr "许可" @@ -1235,8 +1267,7 @@ msgstr "许可" msgid "Group" msgstr "组" -#: models/auth.py:23 -#: models/auth.py:60 +#: models/auth.py:23 models/auth.py:60 msgid "Groups" msgstr "组" @@ -1289,8 +1320,11 @@ 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 "除了手动设置权限以外，用户也会从他(她)所在的小组获得所赋组小组的所有权限。" +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" @@ -1384,43 +1418,39 @@ msgstr "瑞典语" msgid "Simplified Chinese" msgstr "简体中文" -#: core/formfields.py:59 -#: core/meta/fields.py:285 -#: core/meta/fields.py:488 +#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488 #: core/meta/fields.py:499 msgid "This field is required." msgstr "这个字段是必输项。" -#: core/formfields.py:336 +#: core/formfields.py:338 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." msgstr[0] "确定你输入的文本少于 %s 个字符。" -#: core/formfields.py:341 +#: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "这里不允许换行符。" -#: core/formfields.py:436 -#: core/formfields.py:507 -#: core/formfields.py:545 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "选择一个有效的选项： '%(data)s' 不在 %(choices)s 中。" -#: core/formfields.py:601 +#: core/formfields.py:603 msgid "The submitted file is empty." msgstr "所提交的文件为空。" -#: core/formfields.py:655 +#: core/formfields.py:657 msgid "Enter a whole number between -32,768 and 32,767." msgstr "输入在 -32,768 到 32,767 之间的一个整数。" -#: core/formfields.py:664 +#: core/formfields.py:666 msgid "Enter a positive number." msgstr "输入正整数。" -#: core/formfields.py:673 +#: core/formfields.py:675 msgid "Enter a whole number between 0 and 32,767." msgstr "输入在 0 到 32,767 之间的一个整数。" @@ -1489,7 +1519,9 @@ msgid "Enter a valid e-mail address." msgstr "输入一个有效的邮件地址。" #: core/validators.py:150 -msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." msgstr "上传一个有效的图片。您所上传的文件或者不是图片或是一个破坏的图片。" #: core/validators.py:157 @@ -1530,8 +1562,7 @@ msgstr "格式错误的 XML: %s" msgid "Invalid URL: %s" msgstr "无效 URL: %s" -#: core/validators.py:208 -#: core/validators.py:210 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "URL %s 是一个断开的链接。" @@ -1555,8 +1586,7 @@ msgstr "这个字段必须与 '%s' 字段相匹配。" msgid "Please enter something for at least one field." msgstr "请至少在一个字段上输入些什么。" -#: core/validators.py:266 -#: core/validators.py:277 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "请要么两个字段都输入或者两个字段都空着。" @@ -1586,13 +1616,15 @@ msgstr "请输入一个有效的小数。" #: core/validators.py:351 #, 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." +msgid_plural "" +"Please enter a valid decimal number with at most %s total digits." msgstr[0] "请输入一个有效的小数，最多 %s 个数字。 " #: core/validators.py:354 #, 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." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." msgstr[0] "请输入一个有效的小数，最多 %s 个小数位。 " #: core/validators.py:364 @@ -1620,38 +1652,62 @@ msgstr "不能从 %s 得到任何东西。" #: core/validators.py:431 #, python-format -msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "URL %(url)s 返回了无效的 Content-Type 头 '%(contenttype)s'。" #: core/validators.py:464 #, python-format -msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)" -msgstr "请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)" +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)" #: core/validators.py:468 #, 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\"。)" +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:473 #, 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\"。)" +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:478 #, 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\"。)" +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:482 #, 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\"。)" +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:487 #, python-format -msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)" -msgstr "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" + +#: core/meta/__init__.py:1946 +#, fuzzy, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "%(optname)s 带有 %(fieldname)s 已经存在。" #: core/meta/fields.py:46 #, python-format @@ -1668,17 +1724,19 @@ msgid " Separate multiple IDs with commas." msgstr " 用逗号分隔多个ID。" #: core/meta/fields.py:132 -msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr " 按下 \"Control\"，或者在Mac上按 \"Command\" 来选择一个或多个值。" #: core/meta/fields.py:508 msgid "Enter a valid filename." msgstr "输入一个有效的文件名。" -#: core/meta/fields.py:777 +#: core/meta/fields.py:782 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgid_plural "" +"Please enter valid %(self)s IDs. The values %(value)r are invalid." msgstr[0] "请输入有效的 %(self)s ID。值 %(value)r 无效。" #: core/template/defaultfilters.py:354 @@ -1688,4 +1746,3 @@ msgstr "是、否、也许" #, fuzzy #~ msgid "count" #~ msgstr "内容" - diff --git a/django/conf/project_template/manage.py b/django/conf/project_template/manage.py old mode 100644 new mode 100755 index 48a9a516a4..008aeeb72b --- a/django/conf/project_template/manage.py +++ b/django/conf/project_template/manage.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python from django.core.management import execute_manager try: import settings # Assumed to be in the same directory. diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py index e1c3367e8b..10c3b35add 100644 --- a/django/db/models/__init__.py +++ b/django/db/models/__init__.py @@ -1730,8 +1730,8 @@ def manipulator_validator_unique_together(field_name_list, opts, self, field_dat if hasattr(self, 'original_object') and getattr(self.original_object, opts.pk.attname) == getattr(old_obj, opts.pk.attname): pass else: - raise validators.ValidationError, "%s with this %s already exists for the given %s." % \ - (capfirst(opts.verbose_name), field_list[0].verbose_name, get_text_list(field_name_list[1:], 'and')) + raise validators.ValidationError, _("%(object)s with this %(type)s already exists for the given %(field)s.") % \ + {'object': capfirst(opts.verbose_name), 'type': field_list[0].verbose_name, 'field': get_text_list(field_name_list[1:], 'and')} def manipulator_validator_unique_for_date(from_field, date_field, opts, lookup_type, self, field_data, all_data): date_str = all_data.get(date_field.get_manipulator_field_names('')[0], None)