summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Bauer <gb@hugo.westfalen.de>2005-12-17 21:27:54 +0000
committerGeorg Bauer <gb@hugo.westfalen.de>2005-12-17 21:27:54 +0000
commit787dea30c1f2081e6f831b4b33036644fa93d2a6 (patch)
treedef155286f34931996ae62e22a78464d80bea31f
parent3235f0298ae1c92f625c76922e66b9a0ad5aa3b1 (diff)
added missing translations to the file widget
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1719 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/locale/bn/LC_MESSAGES/django.mobin26898 -> 26898 bytes
-rw-r--r--django/conf/locale/bn/LC_MESSAGES/django.po291
-rw-r--r--django/conf/locale/cs/LC_MESSAGES/django.mobin31229 -> 31229 bytes
-rw-r--r--django/conf/locale/cs/LC_MESSAGES/django.po297
-rw-r--r--django/conf/locale/cy/LC_MESSAGES/django.mobin24115 -> 24115 bytes
-rw-r--r--django/conf/locale/cy/LC_MESSAGES/django.po297
-rw-r--r--django/conf/locale/da/LC_MESSAGES/django.mobin16807 -> 16807 bytes
-rw-r--r--django/conf/locale/da/LC_MESSAGES/django.po299
-rw-r--r--django/conf/locale/de/LC_MESSAGES/django.mobin31029 -> 31113 bytes
-rw-r--r--django/conf/locale/de/LC_MESSAGES/django.po294
-rw-r--r--django/conf/locale/en/LC_MESSAGES/django.mobin536 -> 536 bytes
-rw-r--r--django/conf/locale/en/LC_MESSAGES/django.po266
-rw-r--r--django/conf/locale/es/LC_MESSAGES/django.mobin30249 -> 30249 bytes
-rw-r--r--django/conf/locale/es/LC_MESSAGES/django.po295
-rw-r--r--django/conf/locale/fr/LC_MESSAGES/django.mobin17427 -> 17427 bytes
-rw-r--r--django/conf/locale/fr/LC_MESSAGES/django.po299
-rw-r--r--django/conf/locale/gl/LC_MESSAGES/django.mobin30171 -> 30171 bytes
-rw-r--r--django/conf/locale/gl/LC_MESSAGES/django.po291
-rw-r--r--django/conf/locale/is/LC_MESSAGES/django.mobin17726 -> 17726 bytes
-rw-r--r--django/conf/locale/is/LC_MESSAGES/django.po287
-rw-r--r--django/conf/locale/it/LC_MESSAGES/django.mobin16501 -> 16501 bytes
-rw-r--r--django/conf/locale/it/LC_MESSAGES/django.po291
-rw-r--r--django/conf/locale/no/LC_MESSAGES/django.mobin24054 -> 24054 bytes
-rw-r--r--django/conf/locale/no/LC_MESSAGES/django.po297
-rw-r--r--django/conf/locale/pt_BR/LC_MESSAGES/django.mobin16330 -> 16330 bytes
-rw-r--r--django/conf/locale/pt_BR/LC_MESSAGES/django.po291
-rw-r--r--django/conf/locale/ro/LC_MESSAGES/django.mobin17096 -> 17096 bytes
-rw-r--r--django/conf/locale/ro/LC_MESSAGES/django.po297
-rw-r--r--django/conf/locale/ru/LC_MESSAGES/django.mobin21077 -> 21077 bytes
-rw-r--r--django/conf/locale/ru/LC_MESSAGES/django.po289
-rw-r--r--django/conf/locale/sk/LC_MESSAGES/django.mobin30380 -> 30380 bytes
-rw-r--r--django/conf/locale/sk/LC_MESSAGES/django.po293
-rw-r--r--django/conf/locale/sr/LC_MESSAGES/django.mobin30125 -> 30125 bytes
-rw-r--r--django/conf/locale/sr/LC_MESSAGES/django.po303
-rw-r--r--django/conf/locale/sv/LC_MESSAGES/django.mobin30439 -> 30439 bytes
-rw-r--r--django/conf/locale/sv/LC_MESSAGES/django.po293
-rw-r--r--django/conf/locale/zh_CN/LC_MESSAGES/django.mobin28644 -> 28644 bytes
-rw-r--r--django/conf/locale/zh_CN/LC_MESSAGES/django.po277
-rw-r--r--django/contrib/admin/templates/widget/file.html6
39 files changed, 2861 insertions, 2692 deletions
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index 48fb6af581..049cc3cdf4 100644
--- a/django/conf/locale/bn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bn/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po
index be47a86bc8..7e87133ae3 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-14 17:21+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-11-12 20:05+0530\n"
"Last-Translator: Baishampayan Ghose <b.ghose@gnu.org.in>\n"
"Language-Team: Ankur Bangla <core@bengalinux.org>\n"
@@ -16,37 +16,6 @@ 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
@@ -309,57 +278,6 @@ 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 ""
@@ -630,6 +548,10 @@ 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 ""
@@ -638,19 +560,11 @@ 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
@@ -666,9 +580,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
@@ -683,10 +597,10 @@ msgid "Log out"
msgstr "বাইরে যান"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -725,15 +639,13 @@ msgstr ""
"এই বস্তুটি একটি পরিবর্তন ইতিহাস নেই। এইটি এই অ্যাডমিন স্থান দ্বারা সম্ভবত যোগ করা "
"হয় নি।"
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "যোগ করুন"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "জ্যাঙ্গো স্থান অ্যাডমিন"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "জ্যাঙ্গো পরিচালনা"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -755,17 +667,14 @@ msgstr ""
"একটি ত্রুটি আছে। এইটি স্থান পরিচালককে ই-মেল দ্বারা প্রতিবেদন করা হয়েছে এবং খুব "
"তাড়াতাড়ি মেরামত করা হবে। আপনার ধৈর্য্যের জন্য ধন্যবাদ।"
-#: contrib/admin/templates/admin/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "জ্যাঙ্গো স্থান অ্যাডমিন"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "পাতা খুঁজে পাওয়া গেল না"
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "জ্যাঙ্গো পরিচালনা"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "আমরা দুঃখিত, কিন্তু আবেদনকৃত পাতা খুঁজে পাওয়া গেল না।"
#: contrib/admin/templates/admin/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -792,14 +701,10 @@ msgstr "আমার কাজ"
msgid "None available"
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/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "যোগ করুন"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -813,24 +718,6 @@ msgstr "পাসওয়ার্ড:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "আপনি কি <a href=\"/password_reset/\">আপনার পাসওয়ার্ড ভুলে গেছেন</a>?"
-#: 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 "স্বাগত,"
@@ -858,6 +745,33 @@ 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 ""
@@ -1054,6 +968,101 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+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 ""
@@ -1737,7 +1746,7 @@ msgstr ""
"\"%(attr)s\"বৈশিষ্ট্যয় লাইন %(line)s একটি অবৈধ মান আছে । (\"%(start)s\"এর সঙ্গে "
"লাইন আরম্ভ।)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1776,7 +1785,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index b456deaf76..f46b7f2e8d 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cs/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index 3dd233d082..eed15949f6 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-14 17:22+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-11-28 12:00+0100\n"
"Last-Translator: Radek Svarz <translate@svarz.cz>\n"
"Language-Team: Czech\n"
@@ -19,37 +19,6 @@ 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"
@@ -326,58 +295,6 @@ 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 ""
@@ -648,6 +565,10 @@ 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)"
@@ -656,20 +577,11 @@ 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
@@ -685,9 +597,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
@@ -702,10 +614,10 @@ msgid "Log out"
msgstr "Odhlásit se"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -744,15 +656,13 @@ msgstr ""
"Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes "
"administrátorské rozhraní."
-#: 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:4
+msgid "Django site admin"
+msgstr "Django správa webu"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr "Od %(title)s"
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django správa"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -774,17 +684,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr "Provést"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django správa webu"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Django správa"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -811,14 +718,10 @@ msgstr "Mé akce"
msgid "None available"
msgstr "Nic"
-#: 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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "%(name)s: přidat"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -832,25 +735,6 @@ msgstr "Heslo:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "<a href=\"/password_reset/\">Zapomněl(a) jste své heslo?</a>"
-#: 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,"
@@ -878,6 +762,34 @@ 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"
@@ -1086,6 +998,103 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Změnit"
+
+#: 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"
@@ -1777,7 +1786,7 @@ msgstr ""
"Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s "
"\"%(start)s\".)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, 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."
@@ -1818,7 +1827,7 @@ msgstr[1] ""
msgstr[2] ""
"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "ano, ne, možná"
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 4db6e57fac..f2f7ef91f7 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cy/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index 39bc7a0c50..4121a88a18 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-14 17:22+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
"Last-Translator: Jason Davies <jason@jasondavies.com>\n"
"Language-Team: Cymraeg <cy@li.org>\n"
@@ -16,38 +16,6 @@ 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"
@@ -300,59 +268,6 @@ 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 ""
@@ -615,6 +530,10 @@ 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)"
@@ -623,19 +542,11 @@ 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
@@ -651,9 +562,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
@@ -668,10 +579,10 @@ msgid "Log out"
msgstr "Allgofnodi"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -710,15 +621,13 @@ msgstr ""
"Does dim hanes newid gan y gwrthrych yma. Mae'n debyg ni ychwanegwyd drwy'r "
"safle gweinydd yma."
-#: 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:4
+msgid "Django site admin"
+msgstr "Gweinyddiad safle Django"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " Gan %(title)s"
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Gweinyddiad Django"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -740,17 +649,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr "Ewch"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Gweinyddiad safle Django"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Gweinyddiad Django"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -777,14 +683,10 @@ msgstr "Fy Ngweithredau"
msgid "None available"
msgstr "Dim ar gael"
-#: 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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Ychwanegu %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -798,24 +700,6 @@ msgstr "Cyfrinair:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Ydych wedi <a href=\"/password_reset/\">anghofio eich cyfrinair</a>?"
-#: 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,"
@@ -843,6 +727,33 @@ 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"
@@ -1039,6 +950,104 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Newidio"
+
+#: 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 ""
@@ -1720,7 +1729,7 @@ msgstr ""
"Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell "
"yn ddechrau â \"%(start)s\".)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1757,7 +1766,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "ie,na,efallai"
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 3091202a17..10e58e2ada 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.mo
+++ b/django/conf/locale/da/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po
index 540feb799c..42783a8037 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-14 17:20+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Morten Bagai <m@bagai.com>\n"
"Language-Team: Danish\n"
@@ -16,38 +16,6 @@ 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
@@ -310,60 +278,6 @@ 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 ""
@@ -634,6 +548,10 @@ 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 ""
@@ -642,19 +560,11 @@ 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
@@ -670,9 +580,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
@@ -687,10 +597,10 @@ msgid "Log out"
msgstr "Log ud"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -729,15 +639,13 @@ msgstr ""
"Dette objekt har ingen ændringshistorik. Det blev formentlig ikke tilføjet "
"via dette administrations-site"
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django site administration"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django administration"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -759,17 +667,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django site administration"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Django administration"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -796,14 +701,10 @@ msgstr "Mine handlinger"
msgid "None available"
msgstr "Ingen tilgængelige"
-#: 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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -817,24 +718,6 @@ msgstr "Adgangskode:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Har du <a href=\"/password_reset/\">glemt din adgangskode</a>?"
-#: 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"
@@ -862,6 +745,33 @@ 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 ""
@@ -1060,6 +970,105 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Ændre"
+
+#: 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 ""
@@ -1746,7 +1755,7 @@ msgstr ""
"\"%(attr)s\" attributten på linje $(line)s har en ugyldig værdi. (Linjen "
"starter med \"%(start)s\".)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1784,7 +1793,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index c0d22a8fc6..4f58674298 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.mo
+++ b/django/conf/locale/de/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index 319010a5aa..d944301086 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,45 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: Django 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 17:21+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-10-08 00:03+0200\n"
"Last-Translator: Georg Bauer <gb@bofh.ms>\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"
@@ -320,57 +288,6 @@ 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 ""
@@ -643,6 +560,10 @@ 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)"
@@ -651,19 +572,11 @@ 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
@@ -679,9 +592,9 @@ msgstr "Passwort ndern"
#: 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
@@ -696,10 +609,10 @@ msgid "Log out"
msgstr "Abmelden"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -738,15 +651,13 @@ msgstr ""
"Dieses Objekt hat keine nderungsgeschichte. Es wurde mglicherweise nicht "
"ber diese Verwaltungsseiten angelegt."
-#: 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:4
+msgid "Django site admin"
+msgstr "Django Systemverwaltung"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " Nach %(title)s "
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django Verwaltung"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -769,17 +680,15 @@ msgstr ""
"eMail weitergegeben und sollte bald behoben sein. Vielen Dank fr Ihr "
"Verstndnis."
-#: contrib/admin/templates/admin/search_form.html:7
-msgid "Go"
-msgstr "Los"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django Systemverwaltung"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Django Verwaltung"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -806,15 +715,10 @@ msgstr "Meine Aktionen"
msgid "None available"
msgstr "Keine vorhanden"
-#: 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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "%(name)s zufgen"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -828,24 +732,6 @@ msgstr "Passwort:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?"
-#: 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,"
@@ -874,6 +760,33 @@ 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"
@@ -1085,6 +998,101 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "Derzeit:"
+
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "ndern:"
+
+#: 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"
@@ -1775,7 +1783,7 @@ msgstr ""
"Das Attribut %(attr)s in Zeile %(line)s hat einen ungltigen Wert. Die Zeile "
"beginnt mit \"%(start)s\"."
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1817,6 +1825,6 @@ msgstr[0] ""
msgstr[1] ""
"Bitte gltige IDs fr %(self)s eingeben. Die Werte %(value)r sind ungltig."
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "Ja,Nein,Vielleicht"
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index d7f41a9a3c..9ab8c704bb 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 856aa98a0e..c52d7eabd4 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-14 17:21+0100\n"
+"POT-Creation-Date: 2005-12-17 22:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,34 +16,6 @@ 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"
@@ -291,53 +263,6 @@ 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 ""
@@ -600,6 +525,10 @@ 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 ""
@@ -608,19 +537,11 @@ 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
@@ -636,9 +557,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
@@ -653,10 +574,10 @@ msgid "Log out"
msgstr ""
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -693,14 +614,12 @@ msgid ""
"admin site."
msgstr ""
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
msgstr ""
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
msgstr ""
#: contrib/admin/templates/admin/500.html:4
@@ -721,16 +640,13 @@ msgid ""
"mail and should be fixed shortly. Thanks for your patience."
msgstr ""
-#: contrib/admin/templates/admin/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
msgstr ""
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
msgstr ""
#: contrib/admin/templates/admin/index.html:27
@@ -758,13 +674,9 @@ msgstr ""
msgid "None available"
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."
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
msgstr ""
#: contrib/admin/templates/admin/login.html:15
@@ -779,24 +691,6 @@ msgstr ""
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
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 ""
@@ -820,6 +714,33 @@ 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 ""
@@ -1008,6 +929,93 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+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"
@@ -1666,7 +1674,7 @@ msgid ""
"starts with \"%(start)s\".)"
msgstr ""
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1702,6 +1710,6 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index c71299ac5c..87471f6fc3 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 05b67e4f94..4cec399713 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-14 17:22+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-11-28 15:28+0000\n"
"Last-Translator: Ricardo Javier Cardenes Medina <ricardo.cardenes@gmail."
"com>\n"
@@ -20,38 +20,6 @@ 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"
@@ -321,57 +289,6 @@ msgstr ""
msgid "The comment form didn't provide either 'preview' or '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
msgid ""
@@ -643,6 +560,10 @@ 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)"
@@ -651,20 +572,11 @@ msgstr "Estado de los EEUU (dos letras maysculas)"
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
@@ -680,9 +592,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
@@ -697,10 +609,10 @@ msgid "Log out"
msgstr "Terminar sesin"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -739,15 +651,13 @@ msgstr ""
"Este objeto no tiene histrico de cambios. Probablemente no fue aadido "
"usando este sitio de administracin."
-#: 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:4
+msgid "Django site admin"
+msgstr "Sitio de administracin de Django"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " Por %(title)s "
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administracin de Django"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -770,17 +680,14 @@ msgstr ""
"mediante correo electrnico y debera arreglarse en breve. Gracias por su "
"paciencia"
-#: contrib/admin/templates/admin/search_form.html:7
-msgid "Go"
-msgstr "Buscar"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Sitio de administracin de Django"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Administracin de Django"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -807,14 +714,10 @@ msgstr "Mis acciones"
msgid "None available"
msgstr "Ninguno disponible"
-#: 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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Agregar %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -828,24 +731,6 @@ msgstr "Clave:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Ha <a href=\"/password_reset/\">olvidado su clave</a>?"
-#: 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,"
@@ -874,6 +759,33 @@ 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 "Buscar"
+
+#: 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"
@@ -1083,6 +995,103 @@ 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 "Fecha:"
+
+#: contrib/admin/templates/widget/date_time.html:4
+#, fuzzy
+msgid "Time:"
+msgstr "Hora"
+
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Modificar"
+
+#: 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 "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"
+
#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
@@ -1771,7 +1780,7 @@ 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
+#: core/meta/__init__.py:1947
#, 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."
@@ -1811,6 +1820,6 @@ msgstr[1] ""
"Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son "
"vlidos."
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "s,no,tal vez"
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 0447d83e52..0faaf53da0 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 9061eec533..2fbeff5f5a 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-14 17:22+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-10-18 12:27+0200\n"
"Last-Translator: Laurent Rahuel <laurent.rahuel@gmail.com>\n"
"Language-Team: franais <fr@li.org>\n"
@@ -15,38 +15,6 @@ 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
@@ -309,60 +277,6 @@ 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 ""
@@ -633,6 +547,10 @@ 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 ""
@@ -641,19 +559,11 @@ 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
@@ -669,9 +579,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
@@ -686,10 +596,10 @@ msgid "Log out"
msgstr "Dconnection"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -728,15 +638,13 @@ 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/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Ajouter"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Site d'administration de Django"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administration de Django"
#: contrib/admin/templates/admin/500.html:4
#, fuzzy
@@ -760,17 +668,14 @@ msgstr ""
"administrateurs du site et sera corrige dans les meilleurs dlais. Merci "
"pour votre patience."
-#: contrib/admin/templates/admin/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Site d'administration de Django"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Administration de Django"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -797,14 +702,10 @@ msgstr "Mes actions"
msgid "None available"
msgstr "Aucun(e) disponible"
-#: 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/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Ajouter"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -818,24 +719,6 @@ msgstr "Mot de passe"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Avez vous <a href=\"/password_reset/\">perdu votre mot de passe</a>?"
-#: 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,"
@@ -864,6 +747,33 @@ 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 ""
@@ -1063,6 +973,105 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Modifier"
+
+#: 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 ""
@@ -1764,7 +1773,7 @@ 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
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1803,7 +1812,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index f2322b7056..0a65898dea 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.mo
+++ b/django/conf/locale/gl/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index 1f422c2528..7c1d90314a 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-14 17:21+0100\n"
+"POT-Creation-Date: 2005-12-17 22:25+0100\n"
"PO-Revision-Date: 2005-12-08 15:03+0100\n"
"Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n"
"Language-Team: Galego\n"
@@ -17,38 +17,6 @@ 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"
@@ -316,56 +284,6 @@ 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 ""
@@ -638,6 +556,10 @@ 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)"
@@ -646,19 +568,11 @@ 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
@@ -674,9 +588,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
@@ -691,10 +605,10 @@ msgid "Log out"
msgstr "Saír"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -733,15 +647,13 @@ msgstr ""
"Este obxecto non ten histórico de cambios. Posibelmente non se creou usando "
"este sitio de administración."
-#: 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:4
+msgid "Django site admin"
+msgstr "Administración de sitio Django"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " Por %(title)s "
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administración de Django"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -763,17 +675,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr "Ir"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Administración de sitio Django"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Administración de Django"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -800,14 +709,10 @@ msgstr "As miñas accións"
msgid "None available"
msgstr "Ningunha dispoñíbel"
-#: 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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Engadir %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -821,24 +726,6 @@ msgstr "Contrasinal:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "<a href=\"/password_reset/\">Esqueceu o contrasinal</a>?"
-#: 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,"
@@ -867,6 +754,33 @@ 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"
@@ -1073,6 +987,101 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Modificar"
+
+#: 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"
@@ -1754,7 +1763,7 @@ 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
+#: core/meta/__init__.py:1947
#, 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."
@@ -1793,6 +1802,6 @@ msgstr[0] "Insira IDs de %(self)s válidas. O valor %(value)r non é válido."
msgstr[1] ""
"Insira IDs de %(self)s válidas. Os valores %(value)r non son válidos."
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "si,non,quizais"
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 5ceffcfa31..3d919dee5a 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.mo
+++ b/django/conf/locale/is/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index f6ec883235..5cbf502846 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-14 17:22+0100\n"
+"POT-Creation-Date: 2005-12-17 22:27+0100\n"
"PO-Revision-Date: 2005-11-13 18:08-0000\n"
"Last-Translator: Dagur Páll Ammendrup <dagurp@gmail.com>\n"
"Language-Team: <dagurp@gmail.com>\n"
@@ -18,36 +18,6 @@ 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
@@ -310,56 +280,6 @@ 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 ""
@@ -630,6 +550,10 @@ 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 ""
@@ -638,19 +562,11 @@ 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
@@ -666,9 +582,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
@@ -683,10 +599,10 @@ msgid "Log out"
msgstr "Skrá út"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -725,15 +641,13 @@ msgstr ""
"Þessi hlutur hefur enga breytingasögu. Hann var líklega ekki búinn til á "
"þessari stjórnunarsíðu."
-#: 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:4
+msgid "Django site admin"
+msgstr "Django vefstjóri"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django vefstjórn"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -755,17 +669,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django vefstjóri"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Django vefstjórn"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -792,14 +703,10 @@ msgstr "Aðgerðir mínar"
msgid "None available"
msgstr "Engin fáanleg"
-#: 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/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Bæta við"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -813,24 +720,6 @@ msgstr "Lykilorð:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "<a href=\"/password_reset/\">Gleymdir þú lykilorðinu</a> þí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),"
@@ -858,6 +747,33 @@ 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 ""
@@ -1057,6 +973,99 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Breyta"
+
+#: 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 ""
@@ -1743,7 +1752,7 @@ msgstr ""
"\"%(attr)s\" eigindið á línu %(line)s hefur ótækt gildi (línan hefst á \"%"
"(start)s\")."
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1782,7 +1791,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 28139c993a..869646dc2b 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.mo
+++ b/django/conf/locale/it/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 1893996b69..0b240c31a4 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-14 17:23+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,37 +16,6 @@ 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
@@ -309,57 +278,6 @@ 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 ""
@@ -630,6 +548,10 @@ 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 ""
@@ -638,19 +560,11 @@ 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
@@ -666,9 +580,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
@@ -683,10 +597,10 @@ msgid "Log out"
msgstr "Esci"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -725,15 +639,13 @@ msgstr ""
"Questo oggetto non ha cambiamenti storicizzati. Probabilmente non stato "
"creato con questo sito di amministrazione."
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Aggiungi"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Amministrazione sito Django"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Amministrazione Django"
#: contrib/admin/templates/admin/500.html:4
#, fuzzy
@@ -756,17 +668,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Amministrazione sito Django"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Amministrazione Django"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -793,14 +702,10 @@ msgstr "Azioni Proprie"
msgid "None available"
msgstr "Nessuna disponibile"
-#: 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/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Aggiungi"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -814,24 +719,6 @@ msgstr "Password:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Hai <a href=\"/password_reset/\">dimenticato la tua password</a>?"
-#: 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,"
@@ -860,6 +747,33 @@ 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 ""
@@ -1057,6 +971,101 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Cambia"
+
+#: 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 ""
@@ -1745,7 +1754,7 @@ 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
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1782,7 +1791,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index b055a022d7..4429692a21 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.mo
+++ b/django/conf/locale/no/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index 06b8d6ae98..9375b91f83 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-14 17:23+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
"Language-Team: Norwegian\n"
@@ -16,38 +16,6 @@ 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
@@ -324,58 +292,6 @@ 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 ""
@@ -651,6 +567,10 @@ 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)"
@@ -659,20 +579,11 @@ 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
@@ -688,9 +599,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
@@ -705,10 +616,10 @@ msgid "Log out"
msgstr "Log ut"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -747,15 +658,13 @@ msgstr ""
"Dette objektet har ingen endrings historie. Den var sannsynligvis ikke laget "
"via denne siden"
-#: 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:4
+msgid "Django site admin"
+msgstr "Django administrasjonsside"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr "Av %(title)s "
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django administrasjon"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -777,17 +686,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django administrasjonsside"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Django administrasjon"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -814,14 +720,10 @@ msgstr "Mine handlinger"
msgid "None available"
msgstr "Ingen tilgjengelige"
-#: 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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Legg til %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -835,24 +737,6 @@ msgstr "Passord:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Har du <a href=\"/password_reset/\">glemt passordet ditt</a>?"
-#: 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"
@@ -880,6 +764,33 @@ 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"
@@ -1081,6 +992,104 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Endre"
+
+#: 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"
@@ -1766,7 +1775,7 @@ msgstr ""
"\"%(attr)s\" tillegg på linje $(line)s har en ikke godkjent verdi. (Linja "
"starter med \"%(start)s\".)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, 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."
@@ -1804,7 +1813,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index d3533b2555..eef409d258 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index efeb67110b..d1412d9ea4 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-14 17:22+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-10-11 09:12GMT-3\n"
"Last-Translator: João Paulo Farias <jpaulofarias@gmail.com>\n"
"Language-Team: Português do Brasil <pt-br@li.org>\n"
@@ -16,38 +16,6 @@ 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
@@ -310,56 +278,6 @@ 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 ""
@@ -630,6 +548,10 @@ 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 ""
@@ -638,19 +560,11 @@ 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
@@ -666,9 +580,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
@@ -683,10 +597,10 @@ msgid "Log out"
msgstr "Encerrar sessão"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -725,15 +639,13 @@ 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/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Adicionar"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Site de administração do Django"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administração do Django"
#: contrib/admin/templates/admin/500.html:4
#, fuzzy
@@ -756,17 +668,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Site de administração do Django"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Administração do Django"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -793,14 +702,10 @@ msgstr "Minhas Ações"
msgid "None available"
msgstr "Nenhuma disponível"
-#: 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/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Adicionar"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -814,24 +719,6 @@ msgstr "Senha:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Você <a href=\"/password_reset/\"esqueceu a senha</a>?"
-#: 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,"
@@ -860,6 +747,33 @@ 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 ""
@@ -1056,6 +970,101 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Modificar"
+
+#: 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 ""
@@ -1749,7 +1758,7 @@ 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
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1788,7 +1797,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 5d64f84d4f..599955a91b 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ro/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index 1147cdd035..f660f51c2e 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-14 17:20+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-11-08 19:06+GMT+2\n"
"Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
"Language-Team: Romanian <ro@li.org>\n"
@@ -16,38 +16,6 @@ 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
@@ -310,59 +278,6 @@ 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 ""
@@ -633,6 +548,10 @@ 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 ""
@@ -641,19 +560,11 @@ 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
@@ -669,9 +580,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
@@ -686,10 +597,10 @@ msgid "Log out"
msgstr "Deautentificare"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -728,15 +639,13 @@ 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/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Adaugă"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Administrare sit Django"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administrare Django"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -758,17 +667,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Administrare sit Django"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Administrare Django"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -795,14 +701,10 @@ msgstr "Acţiunile Mele"
msgid "None available"
msgstr "Indisponibil"
-#: 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/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Adaugă"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -816,24 +718,6 @@ msgstr "Parola:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Ai <a href=\"/password_reset/\">uitat parola</a>?"
-#: 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,"
@@ -862,6 +746,33 @@ 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 ""
@@ -1058,6 +969,104 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Schimbă"
+
+#: 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 ""
@@ -1749,7 +1758,7 @@ msgstr ""
"Atributul \"%(attr)s\" din linia %(line)s are o valoare invalidă. ( Linia "
"începe cu \"%(start)s\".)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1788,7 +1797,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 0d523e22b8..ae61313c42 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ru/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 5e14cedf3e..262726be7d 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-14 17:20+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-11-26 00:00\n"
"Last-Translator: Dmitry Sorokin <ds@dial.com.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,38 +15,6 @@ 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"
@@ -301,54 +269,6 @@ 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 ""
@@ -615,6 +535,10 @@ 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 " ( )"
@@ -623,20 +547,11 @@ 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
@@ -652,9 +567,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
@@ -669,10 +584,10 @@ msgid "Log out"
msgstr ""
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -711,15 +626,13 @@ msgstr ""
" . "
" ."
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr " %(name)s"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr " Django"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr " Django"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -741,17 +654,14 @@ msgstr ""
" . e-mail "
" . ."
-#: contrib/admin/templates/admin/search_form.html:7
-msgid "Go"
-msgstr ""
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr " Django"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr " "
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr " Django"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr " , ."
#: contrib/admin/templates/admin/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -778,14 +688,10 @@ msgstr " "
msgid "None available"
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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr " %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -799,24 +705,6 @@ msgstr ":"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr " <a href=\"/password_reset/\"> </a>?"
-#: 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 " ,"
@@ -845,6 +733,33 @@ 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 ""
@@ -1039,6 +954,100 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+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 ""
@@ -1712,7 +1721,7 @@ msgid ""
"starts with \"%(start)s\".)"
msgstr ""
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr ""
@@ -1750,7 +1759,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr ""
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 04d08f4426..dc389cb273 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sk/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 095dd52059..df8f4b1c09 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-14 17:23+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-11-10 23:22-0500\n"
"Last-Translator: Vladimir Labath <vlado@labath.org>\n"
"Language-Team: Slovak <sk@li.org>\n"
@@ -16,37 +16,6 @@ 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"
@@ -317,58 +286,6 @@ 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 ""
@@ -639,6 +556,10 @@ 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)"
@@ -647,19 +568,11 @@ 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
@@ -675,9 +588,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
@@ -692,10 +605,10 @@ msgid "Log out"
msgstr "Odhlásenie"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -734,15 +647,13 @@ msgstr ""
"Tento object nemá históriu zmien. Možno nebol pridaný prostredníctvom tohoto "
"web admina"
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django web admin"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " Od %(title)s "
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administrácia Django"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -764,17 +675,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr "Choď"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django web admin"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Administrácia Django"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -801,14 +709,10 @@ msgstr "Moje udalosti"
msgid "None available"
msgstr "Nepovolené"
-#: 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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -822,24 +726,6 @@ msgstr "Heslo:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Zabudli ste<a href=\"/password_reset/\"> vaše heslo</a>?"
-#: 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,"
@@ -868,6 +754,33 @@ 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ť"
@@ -1076,6 +989,102 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Zmeň"
+
+#: 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 ""
@@ -1757,7 +1766,7 @@ msgstr ""
"Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína "
"s \"%(start)s\".)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, 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."
@@ -1795,6 +1804,6 @@ msgid_plural ""
msgstr[0] "Prosím vložte platné %(self)s IDs. Hodnota %(value)r je neplatná."
msgstr[1] "Prosím vložte platné %(self)s IDs. Hodnoty %(value)r sú neplatné."
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "ano,nie,možno"
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 9928c5aa54..239b719223 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index bce5122c6f..2f2bafbd56 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-14 17:20+0100\n"
+"POT-Creation-Date: 2005-12-17 22:25+0100\n"
"PO-Revision-Date: 2005-12-05 15:00+0100\n"
"Last-Translator: Nebojša Đorđević <nesh@studioquattro.co.yu>\n"
"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail."
@@ -17,38 +17,6 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: ../../../../\n"
-#: 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/comments/models/comments.py:8
#: contrib/comments/models/comments.py:161
msgid "object ID"
@@ -325,61 +293,6 @@ msgstr ""
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr "Ovaj komentar nije koristio 'preview' ili 'post'"
-# nesh: ovo se valjda ne prevodi
-# petar: ne prevodi se
-#: 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 ""
-"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"
-
#: contrib/admin/filterspecs.py:40
#, python-format
msgid ""
@@ -648,6 +561,12 @@ msgstr "Tekst"
msgid "Time"
msgstr "Vreme"
+# nesh: ovo se valjda ne prevodi
+# petar: ne prevodi se
+#: 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. država (dva VELIKA slova)"
@@ -656,19 +575,11 @@ msgstr "U.S. država (dva VELIKA slova)"
msgid "XML text"
msgstr "XML tekst"
-#: 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/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
@@ -684,9 +595,9 @@ msgstr "Izmeni lozinku"
#: 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
@@ -701,10 +612,10 @@ msgid "Log out"
msgstr "Odjavi se"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -743,15 +654,13 @@ msgstr ""
"Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem "
"administracije sajta."
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr "Dodaj %(name)s"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django administracija sajta"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr "Po %(title)s "
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django administracija"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -773,17 +682,14 @@ msgstr ""
"Dogodila se greška koja je prijavljena administratorima i biće popravljena "
"uskoro. Hvala Vam na strpljenju."
-#: contrib/admin/templates/admin/search_form.html:7
-msgid "Go"
-msgstr "Uradi"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django administracija sajta"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Strana nije pronađena"
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django administracija"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Tražena strana ne postoji."
#: contrib/admin/templates/admin/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -810,14 +716,10 @@ msgstr "Moje akcije"
msgid "None available"
msgstr "Nema dostupnih"
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Strana nije pronađena"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Tražena strana ne postoji."
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Dodaj %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -831,25 +733,6 @@ msgstr "Lozinka:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Da li ste <a href=\"/password_reset/\">zaboravili Vašu lozinku?</a>?"
-#: 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,"
@@ -877,6 +760,34 @@ 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"
@@ -1082,6 +993,104 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Izmena"
+
+#: 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."
@@ -1771,7 +1780,7 @@ msgstr ""
"Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje "
"sa \"%(start)s\".)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, 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."
@@ -1810,7 +1819,7 @@ msgstr[0] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
msgstr[1] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
msgstr[2] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "da,ne,možda"
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index 3c4673016d..01a1bb2406 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sv/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po
index 86290912e2..3ba35a07a8 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-14 17:21+0100\n"
+"POT-Creation-Date: 2005-12-17 22:26+0100\n"
"PO-Revision-Date: 2005-12-04 16:20+0100\n"
"Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n"
"Language-Team: Django translators <djangoi18n@googlegroups.com>\n"
@@ -18,38 +18,6 @@ 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"
@@ -320,57 +288,6 @@ 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 ""
@@ -639,6 +556,10 @@ 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)"
@@ -647,19 +568,11 @@ 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
@@ -675,9 +588,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
@@ -692,10 +605,10 @@ msgid "Log out"
msgstr "Logga ut"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -734,15 +647,13 @@ msgstr ""
"Det här objektet har ingen ändringshistorik. Det lades antagligen inte till "
"i den här admin-sidan"
-#: 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:4
+msgid "Django site admin"
+msgstr "Djangos sidadministration"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " Efter %(title)s "
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administration för Django"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -764,17 +675,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr "Utför"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Djangos sidadministration"
+#: 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/base_site.html:7
-msgid "Django administration"
-msgstr "Administration för Django"
+#: 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/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -801,14 +709,10 @@ msgstr "Mina händelser"
msgid "None available"
msgstr "Inga tillgängliga"
-#: 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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Lägg till %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -822,24 +726,6 @@ msgstr "Lösenord:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "Har du <a href=\"/password_reset/\">glömt ditt lösenord</a>?"
-#: 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,"
@@ -868,6 +754,33 @@ 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"
@@ -1076,6 +989,102 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+msgstr "Ändra"
+
+#: 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"
@@ -1757,7 +1766,7 @@ msgstr ""
"Attributet \"%(attr)s\" på rad %(line)s har ett ogiltigt värde. (Raden "
"börjar med \"%(start)s\".)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, 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."
@@ -1795,7 +1804,7 @@ msgstr[0] "Var god och fyll giltiga %(self)s ID. Värdet %(value)r är ogiltigt.
msgstr[1] ""
"Var god och fyll giltiga %(self)s ID. Värdena %(value)r är ogiltigt."
-#: core/template/defaultfilters.py:354
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "ja,nej,kanske"
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index eeebe3d5b2..40cb2836eb 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index a9fcc6c80d..fd4d8f79cf 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-14 17:21+0100\n"
+"POT-Creation-Date: 2005-12-17 22:25+0100\n"
"PO-Revision-Date: 2005-12-10 22:08+0800\n"
"Last-Translator: Hiweed Leng <hiweed@gmail.com>\n"
"Language-Team: Simplified Chinese <limodou@gmail.com>\n"
@@ -19,34 +19,6 @@ 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"
@@ -308,54 +280,6 @@ 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 ""
@@ -622,6 +546,10 @@ 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 "美国州名(两个大写字母)"
@@ -630,19 +558,11 @@ 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
@@ -658,9 +578,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
@@ -675,10 +595,10 @@ msgid "Log out"
msgstr "注销"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -715,15 +635,13 @@ msgid ""
"admin site."
msgstr "此对象没有修改历史。可能不能通过这个管理站点来增加。"
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr "增加 %(name)s"
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django管理站点"
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " 由 %(title)s"
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django管理员"
#: contrib/admin/templates/admin/500.html:4
msgid "Server error"
@@ -745,17 +663,14 @@ msgstr ""
"存在一个错误。它已经通过电子邮件被报告给站点管理员了,并且应该很快被改正。谢"
"谢你的关心。"
-#: contrib/admin/templates/admin/search_form.html:7
-msgid "Go"
-msgstr "去"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django管理站点"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "页面没有找到"
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django管理员"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "很报歉,请求页面无法找到。"
#: contrib/admin/templates/admin/index.html:27
#: contrib/admin/templates/admin/change_form.html:14
@@ -782,14 +697,10 @@ msgstr "我的动作"
msgid "None available"
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/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "增加 %(name)s"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -803,23 +714,6 @@ msgstr "口令:"
msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
msgstr "<a href=\"/password_reset/\">忘记你的密码</a>?"
-#: 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] "请改正下面的错误。"
-
-#: 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 "欢迎,"
@@ -846,6 +740,32 @@ msgstr ""
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 "在站点上查看"
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "请改正下面的错误。"
+
+#: 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 "删除"
@@ -1046,6 +966,95 @@ 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/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/templates/widget/file.html:3
+#, fuzzy
+msgid "Change:"
+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 "简单页面"
+
#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr "DATE_FORMAT"
@@ -1704,7 +1713,7 @@ msgid ""
msgstr ""
"在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
-#: core/meta/__init__.py:1946
+#: core/meta/__init__.py:1947
#, fuzzy, python-format
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "%(optname)s 带有 %(fieldname)s 已经存在。"
@@ -1739,7 +1748,7 @@ 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
+#: core/template/defaultfilters.py:371
msgid "yes,no,maybe"
msgstr "是、否、也许"
diff --git a/django/contrib/admin/templates/widget/file.html b/django/contrib/admin/templates/widget/file.html
index bacc30c521..e4a0756211 100644
--- a/django/contrib/admin/templates/widget/file.html
+++ b/django/contrib/admin/templates/widget/file.html
@@ -1,4 +1,4 @@
-{% load admin_modify %}{% if bound_field.original_value %}
-Currently: <a href="{{ bound_field.original_url }}" > {{ bound_field.original_value }} </a><br />
-Change: {% output_all bound_field.form_fields %}
+{% load admin_modify i18n %}{% if bound_field.original_value %}
+{% trans "Currently:" %} <a href="{{ bound_field.original_url }}" > {{ bound_field.original_value }} </a><br />
+{% trans "Change:" %}{% output_all bound_field.form_fields %}
{% else %} {% output_all bound_field.form_fields %} {% endif %}