From 7dbff908b57f0f1ba30185c6b480fd6f41b3d64a Mon Sep 17 00:00:00 2001
From: Georg Bauer
Date: Sun, 4 Dec 2005 13:53:26 +0000
Subject: [PATCH] updated all message files for possible new message IDs and
new line numbers
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
django/conf/locale/bn/LC_MESSAGES/django.mo | Bin 26898 -> 26898 bytes
django/conf/locale/bn/LC_MESSAGES/django.po | 164 +++---
django/conf/locale/cs/LC_MESSAGES/django.mo | Bin 31229 -> 31229 bytes
django/conf/locale/cs/LC_MESSAGES/django.po | 503 +++++++++++-------
django/conf/locale/cy/LC_MESSAGES/django.mo | Bin 16972 -> 16972 bytes
django/conf/locale/cy/LC_MESSAGES/django.po | 164 +++---
django/conf/locale/da/LC_MESSAGES/django.mo | Bin 16807 -> 16807 bytes
django/conf/locale/da/LC_MESSAGES/django.po | 164 +++---
django/conf/locale/de/LC_MESSAGES/django.mo | Bin 30863 -> 30863 bytes
django/conf/locale/de/LC_MESSAGES/django.po | 20 +-
django/conf/locale/en/LC_MESSAGES/django.mo | Bin 536 -> 536 bytes
django/conf/locale/en/LC_MESSAGES/django.po | 176 +++---
django/conf/locale/es/LC_MESSAGES/django.mo | Bin 29896 -> 29896 bytes
django/conf/locale/es/LC_MESSAGES/django.po | 320 +++++++----
django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 17427 -> 17427 bytes
django/conf/locale/fr/LC_MESSAGES/django.po | 164 +++---
django/conf/locale/gl/LC_MESSAGES/django.mo | Bin 28391 -> 28391 bytes
django/conf/locale/gl/LC_MESSAGES/django.po | 467 ++++++++++------
django/conf/locale/is/LC_MESSAGES/django.mo | Bin 17726 -> 17726 bytes
django/conf/locale/is/LC_MESSAGES/django.po | 164 +++---
django/conf/locale/it/LC_MESSAGES/django.mo | Bin 16501 -> 16501 bytes
django/conf/locale/it/LC_MESSAGES/django.po | 164 +++---
django/conf/locale/no/LC_MESSAGES/django.mo | Bin 24054 -> 24054 bytes
django/conf/locale/no/LC_MESSAGES/django.po | 165 +++---
.../conf/locale/pt_BR/LC_MESSAGES/django.mo | Bin 16330 -> 16330 bytes
.../conf/locale/pt_BR/LC_MESSAGES/django.po | 164 +++---
django/conf/locale/ro/LC_MESSAGES/django.mo | Bin 17096 -> 17096 bytes
django/conf/locale/ro/LC_MESSAGES/django.po | 164 +++---
django/conf/locale/ru/LC_MESSAGES/django.mo | Bin 21077 -> 21077 bytes
django/conf/locale/ru/LC_MESSAGES/django.po | 165 +++---
django/conf/locale/sk/LC_MESSAGES/django.mo | Bin 30534 -> 30450 bytes
django/conf/locale/sk/LC_MESSAGES/django.po | 284 +++++-----
django/conf/locale/sr/LC_MESSAGES/django.mo | Bin 29892 -> 29892 bytes
django/conf/locale/sr/LC_MESSAGES/django.po | 165 +++---
django/conf/locale/sv/LC_MESSAGES/django.mo | Bin 17616 -> 17616 bytes
django/conf/locale/sv/LC_MESSAGES/django.po | 164 +++---
.../conf/locale/zh_CN/LC_MESSAGES/django.mo | Bin 28416 -> 28416 bytes
.../conf/locale/zh_CN/LC_MESSAGES/django.po | 165 +++---
38 files changed, 2435 insertions(+), 1471 deletions(-)
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index e7dad034f6a13c4d69ebd7bd213828d3da4e6a47..714f5b051f7a801a5d247e0fb62cb64e513bb8c0 100644
GIT binary patch
delta 25
hcmbPqiE+{;#ti~mTt>PECJKfoR;Ff~rL=z70RU_g2iX7s
delta 25
hcmbPqiE+{;#ti~mT!y+v77B)jR>nq~rL=z70RU_a2h{)o
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po
index 7d13196217..4a57076b97 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-11-28 11:32+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: 2005-11-12 20:05+0530\n"
"Last-Translator: Baishampayan Ghose \n"
"Language-Team: Ankur Bangla \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
msgstr "ই-মেল ঠিকানা"
@@ -397,170 +397,210 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, fuzzy, python-format
msgid "Add %s"
msgstr "যোগ করুন"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, fuzzy, python-format
msgid "Changed %s."
msgstr "পরিবর্তন"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, fuzzy, python-format
msgid "Change %s"
msgstr "পরিবর্তন"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "পাসওয়ার্ড পরিবর্তন করুন"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
msgstr "কাজের সময়"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
msgstr "তারিখ/সময়"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
msgstr "ই-মেল ঠিকানা:"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
msgstr "ডিসেম্বর"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
msgstr "একটি গোটা সংখ্যা ঢোকান।"
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "ইউ.আর.এল"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "পাসওয়ার্ড পরিবর্তন করুন"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "বাইরে যান"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -571,7 +611,7 @@ msgid "Home"
msgstr "বাড়ি"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "ইতিহাস"
@@ -637,7 +677,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "যোগ করুন"
@@ -661,7 +701,7 @@ msgstr "আমার কাজ"
msgid "None available"
msgstr "কিছুই পাওয়া যাচ্ছে না"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "যোগ করুন"
@@ -682,15 +722,7 @@ msgstr "আপনি কি আপনার পা
msgid "Welcome,"
msgstr "স্বাগত,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "পাসওয়ার্ড পরিবর্তন করুন"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "বাইরে যান"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -700,7 +732,7 @@ msgstr ""
"%(object_name)s '%(object)s' মুছে ফেললে তা সম্পর্কিত বস্তুও মুছে ফেলা হবে কিন্তু "
"আপনার অ্যাকাউন্টে বস্তুর নিম্নলিখিত ধরন মুছে ফেলার অনুমতি নেই:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -709,7 +741,7 @@ msgstr ""
"%(object_name)s\" %(object)s\" মুছে ফেলতে আপনি কি নিশ্চিত? নিম্নলিখিত সম্পর্কিত "
"বস্তুর সব মুছে ফেলা হবে:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "হ্যাঁ, আমি নিশ্চিত"
@@ -722,21 +754,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -936,6 +968,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "রিডাইরেক্ট করা"
@@ -1014,15 +1054,15 @@ msgstr "চ্যাপ্টা পাতা"
msgid "flat pages"
msgstr "চ্যাপ্টা পাতাগুলো"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index 5baca5847d1723c5b2e77788d28fdf62cec4170c..666f9256acba9549a086b9e160b75e42ed8a67c5 100644
GIT binary patch
delta 25
hcmezSnep#u#tl#1xr}rTOcV@FtW3=|zjx;|0sxpc3Euz!
delta 25
hcmezSnep#u#tl#1xeRrUEEEh4t&9yfzjx;|0sxpQ3EBVv
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index a96806a360..67285651db 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -7,14 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Django Czech translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 11:31+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: 2005-11-28 12:00+0100\n"
"Last-Translator: Radek Svarz \n"
"Language-Team: Czech\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Poedit-Language: Czech\n"
"X-Poedit-Country: CZECH REPUBLIC\n"
@@ -78,8 +79,7 @@ msgstr "datum/čas byl zaslán"
msgid "is public"
msgstr "je veřejné"
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
msgid "IP address"
msgstr "IP adresa"
@@ -88,8 +88,12 @@ msgid "is removed"
msgstr "je odstraněno"
#: contrib/comments/models/comments.py:27
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-msgstr "Zaškrtněte tento box, pokud komentář není vhodný. Místo něj bude zobrazena zpráva \"Tento komentář byl smazán\"."
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Zaškrtněte tento box, pokud komentář není vhodný. Místo něj bude zobrazena "
+"zpráva \"Tento komentář byl smazán\"."
#: contrib/comments/models/comments.py:31
msgid "Comment"
@@ -218,29 +222,37 @@ msgid "No voting for yourself"
msgstr "Nelze hlasovat pro sebe"
#: contrib/comments/views/comments.py:25
-msgid "This rating is required because you've entered at least one other rating."
-msgstr "Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné hodnocení."
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+"Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné "
+"hodnocení."
#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
"\n"
"%(text)s"
msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
"\n"
"%(text)s"
msgstr[0] ""
-"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %(count)s komentář:\n"
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentář:\n"
"\n"
"%(text)s"
msgstr[1] ""
-"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %(count)s komentáře:\n"
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentáře:\n"
"\n"
"%(text)s"
msgstr[2] ""
-"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %(count)s komentářů:\n"
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentářů:\n"
"\n"
"%(text)s"
@@ -272,8 +284,11 @@ msgstr "Někdo falšoval formulář komentáře (bezpečnostní narušení)"
#: contrib/comments/views/comments.py:204
#: contrib/comments/views/comments.py:289
-msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
-msgstr "Formulář komentáře měl neplatný parametr 'target' -- ID objektu nebylo platné"
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"Formulář komentáře měl neplatný parametr 'target' -- ID objektu nebylo platné"
#: contrib/comments/views/comments.py:254
#: contrib/comments/views/comments.py:318
@@ -289,8 +304,7 @@ msgstr ""
"%s:
\n"
"\n"
-#: contrib/admin/filterspecs.py:70
-#: contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
#: contrib/admin/filterspecs.py:143
msgid "All"
msgstr "Vše"
@@ -365,12 +379,20 @@ msgid "Log in"
msgstr "Přihlášení"
#: contrib/admin/views/decorators.py:56
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše podání je uloženo."
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše "
+"podání je uloženo."
#: contrib/admin/views/decorators.py:63
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, zapněte cookies, obnovte tuto stránku a zkuste znovu."
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, "
+"zapněte cookies, obnovte tuto stránku a zkuste znovu."
#: contrib/admin/views/decorators.py:77
msgid "Usernames cannot contain the '@' character."
@@ -379,7 +401,8 @@ msgstr "Uživatelská jména nemohou obsahovat znak '@'."
#: contrib/admin/views/decorators.py:79
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'."
+msgstr ""
+"Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'."
#: contrib/admin/views/main.py:49
msgid "Site administration"
@@ -395,172 +418,206 @@ msgstr "Vybrat %s"
msgid "Select %s to change"
msgstr "Vyberte %s pro změnu"
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně přidán."
-#: contrib/admin/views/main.py:416
-#: contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr "Můžete to opět upravit níže."
-#: contrib/admin/views/main.py:424
-#: contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr "Můžete přidat další %s níže."
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, python-format
msgid "Add %s"
msgstr "%s: přidat"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr "Záznam %s byl přidán."
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
#: contrib/admin/views/main.py:457
-#: contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
msgid "and"
msgstr "a"
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, python-format
msgid "Changed %s."
msgstr "%s: změněno"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr "Záznam %s byl smazán."
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr "Nebyly změněny žádné pole."
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" byl úspěšně změněn."
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže."
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, python-format
msgid "Change %s"
msgstr "%s: změnit"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "Jedno nebo více %(fieldname)s z %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Jedno nebo více %(fieldname)s z %(name)s:"
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně smazán."
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr "Jste si jist(á)?"
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, python-format
msgid "Change history: %s"
msgstr "Historie změn: %s"
-#: contrib/admin/views/doc.py:242
-#: contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253
-#: contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259
-#: contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr "Celé číslo"
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr "Boolean (buď Ano (True), nebo Ne (False))"
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Text (maximálně %(maxlength)s znaků)"
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr "Celá čísla oddělená čárkou"
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
msgid "Date (without time)"
msgstr "Datum (bez času)"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
msgid "Date (with time)"
msgstr "Datum (s časem)"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
msgid "E-mail address"
msgstr "E-mailová adresa"
-#: contrib/admin/views/doc.py:249
-#: contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr "Cesta k souboru"
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
msgid "Decimal number"
msgstr "Desetiné číslo"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (buď Ano (True), Ne (False), nebo Nic (None))"
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
msgid "Phone number"
msgstr "Telefonní číslo"
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr "Text (max. 50 znaků)"
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr "Text"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr "Čas"
-#: contrib/admin/views/doc.py:264
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr "Stát US (2 velké znaky)"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr "text XML"
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Změnit heslo"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Odhlásit se"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -571,7 +628,7 @@ msgid "Home"
msgstr "Domů"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Historie"
@@ -579,8 +636,7 @@ msgstr "Historie"
msgid "Date/time"
msgstr "Datum/čas"
-#: contrib/admin/templates/admin/object_history.html:19
-#: models/auth.py:47
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
msgid "User"
msgstr "Uživatel"
@@ -593,8 +649,12 @@ msgid "DATE_WITH_TIME_FULL"
msgstr "N, j.n. Y, H:i"
#: contrib/admin/templates/admin/object_history.html:36
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes administrátorské rozhraní."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes "
+"administrátorské rozhraní."
#: contrib/admin/templates/admin/base_site.html:4
msgid "Django site admin"
@@ -617,8 +677,12 @@ msgid "Server Error (500)"
msgstr "Chyba serveru (500)"
#: contrib/admin/templates/admin/500.html:10
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "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."
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a "
+"měla by být brzy odstraněna. Děkujeme za trpělivost."
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
@@ -630,7 +694,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Přidat"
@@ -654,7 +718,7 @@ msgstr "Mé akce"
msgid "None available"
msgstr "Nic"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, python-format
msgid "Add %(name)s"
msgstr "%(name)s: přidat"
@@ -675,25 +739,26 @@ msgstr "Zapomněl(a) jste své heslo?"
msgid "Welcome,"
msgstr "Vítejte,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Změnit heslo"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odhlásit se"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
-msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Mazání %(object_name)s '%(object)s' by vyústilo ve vymazání souvisejících objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:"
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Mazání %(object_name)s '%(object)s' by vyústilo ve vymazání souvisejících "
+"objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny následující související položky budou smazány:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny "
+"následující související položky budou smazány:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Ano, jsem si jist"
@@ -706,22 +771,22 @@ msgstr "Od %(title)s"
msgid "Go"
msgstr "Provést"
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr "Pohled na stránku"
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr "Objednávání"
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr "Objednávka:"
@@ -769,8 +834,12 @@ msgid "Password reset"
msgstr "Obnovení hesla"
#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
-msgstr "Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo obnovíme a zašleme Vám e-mailem nové."
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo "
+"obnovíme a zašleme Vám e-mailem nové."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -794,12 +863,20 @@ msgid "Password reset successful"
msgstr "Obnovení hesla bylo úspěšné"
#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) byste ji dostat během okamžiku."
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) "
+"byste ji dostat během okamžiku."
#: contrib/admin/templates/registration/password_change_form.html:12
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Vložte svoje staré heslo a poté vložte dvakrát nové heslo. Tak můžeme ověřit, že jste ho napsal(a) správně."
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Vložte svoje staré heslo a poté vložte dvakrát nové heslo. Tak můžeme "
+"ověřit, že jste ho napsal(a) správně."
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
@@ -871,10 +948,13 @@ msgid ""
"your computer is \"internal\").
\n"
msgstr ""
"\n"
-"Pro nainstalování bookmarkletů, přetáhněte odkaz na Vaše záložky (oblíbené),\n"
-"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k Vašim záložkám (oblíbeným). Nyní můžete\n"
+"
Pro nainstalování bookmarkletů, přetáhněte odkaz na Vaše "
+"záložky (oblíbené),\n"
+"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k Vašim záložkám "
+"(oblíbeným). Nyní můžete\n"
"zvolit bookmarklet z libovolné stránky. Poznámka: Některé tyto\n"
-"bookmarklety vyžadují, abyste prohlížel(a) stránky z počítače, který je nastaven jako\n"
+"bookmarklety vyžadují, abyste prohlížel(a) stránky z počítače, který je "
+"nastaven jako\n"
"\"interní\" (promluvte si s Vaším administrátorem, jestli si nejste jisti,\n"
"zda je Váš počítač \"interní\").
\n"
@@ -883,16 +963,24 @@ msgid "Documentation for this page"
msgstr "Dokumentace pro tuto stránku"
#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid "Jumps you from any page to the documentation for the view that generates that page."
-msgstr "Z libovolné stránky otevře dokumentaci pro pohled, který vygeneroval tuto stránku."
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Z libovolné stránky otevře dokumentaci pro pohled, který vygeneroval tuto "
+"stránku."
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
msgid "Show object ID"
msgstr "Ukázat id objektu"
#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Ukáže content-type a unikátní ID pro stránky, které reprezentují jeden objekt."
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Ukáže content-type a unikátní ID pro stránky, které reprezentují jeden "
+"objekt."
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Edit this object (current window)"
@@ -910,21 +998,37 @@ msgstr "Upravit tento objekt (ve novém okně)"
msgid "As above, but opens the admin page in a new window."
msgstr "Jako výše, ale otevře admin stránky v novém okně."
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+#, fuzzy
+msgid "Time:"
+msgstr "Čas"
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "přesměrovat z"
#: contrib/redirects/models/redirects.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Toto by měla být absolutní cesta, bez domény. Např. '/udalosti/hledat/'."
+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://'."
+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"
@@ -935,8 +1039,10 @@ 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."
+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"
@@ -955,8 +1061,12 @@ 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'."
+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"
@@ -964,7 +1074,9 @@ 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."
+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"
@@ -974,15 +1086,15 @@ msgstr "statická stránka"
msgid "flat pages"
msgstr "statické stránky"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr "j.n.Y"
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr "j.n.Y, H:i"
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr "H:i"
@@ -1022,28 +1134,23 @@ msgstr "Leden"
msgid "February"
msgstr "Únor"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "March"
msgstr "Březen"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "April"
msgstr "Duben"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "May"
msgstr "Květen"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "June"
msgstr "Červen"
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
msgid "July"
msgstr "Červenec"
@@ -1150,10 +1257,7 @@ msgstr "weby"
msgid "label"
msgstr "nadpis"
-#: models/core.py:29
-#: models/core.py:40
-#: models/auth.py:6
-#: models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "jméno"
@@ -1205,8 +1309,7 @@ msgstr "codename"
msgid "Permission"
msgstr "Oprávnění"
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
msgid "Permissions"
msgstr "Oprávnění"
@@ -1214,8 +1317,7 @@ msgstr "Oprávnění"
msgid "Group"
msgstr "Skupina"
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
msgid "Groups"
msgstr "Skupiny"
@@ -1268,8 +1370,12 @@ msgid "date joined"
msgstr "datum zaregistrování"
#: models/auth.py:44
-msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro každou skupinu, ve které je."
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro "
+"každou skupinu, ve které je."
#: models/auth.py:48
msgid "Users"
@@ -1363,9 +1469,7 @@ msgstr "Švédsky"
msgid "Simplified Chinese"
msgstr "Jednoduchá čínština"
-#: core/formfields.py:59
-#: core/meta/fields.py:285
-#: core/meta/fields.py:488
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
msgid "This field is required."
msgstr "Toto pole je povinné."
@@ -1382,9 +1486,7 @@ msgstr[2] "Ujistěte se, že Váš text má méně než %s znaků."
msgid "Line breaks are not allowed here."
msgstr "Zalomení řádky zde nenjsou povolená."
-#: core/formfields.py:436
-#: core/formfields.py:507
-#: core/formfields.py:545
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Vyberte platnou volbu. '%(data)s' není mezi %(choices)s."
@@ -1411,7 +1513,8 @@ msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka."
#: core/validators.py:66
msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka."
+msgstr ""
+"Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka."
#: core/validators.py:74
msgid "Uppercase letters are not allowed here."
@@ -1470,8 +1573,12 @@ msgid "Enter a valid e-mail address."
msgstr "Vložte platnou e-mailovou adresu."
#: core/validators.py:150
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Nahrajte na server platný obrázek. Soubor, který jste nahrál(a) nebyl obrázek, nebo byl porušen."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Nahrajte na server platný obrázek. Soubor, který jste nahrál(a) nebyl "
+"obrázek, nebo byl porušen."
#: core/validators.py:157
#, python-format
@@ -1511,8 +1618,7 @@ msgstr "Špatně formované XML: %s"
msgid "Invalid URL: %s"
msgstr "Neplatné URL: %s"
-#: core/validators.py:208
-#: core/validators.py:210
+#: core/validators.py:208 core/validators.py:210
#, python-format
msgid "The URL %s is a broken link."
msgstr "Odkaz na URL %s je rozbitý."
@@ -1538,8 +1644,7 @@ msgstr "Toto pole se musí shodovat s polem '%s'."
msgid "Please enter something for at least one field."
msgstr "Prosíme, vložte něco alespoň pro jedno pole."
-#: core/validators.py:266
-#: core/validators.py:277
+#: core/validators.py:266 core/validators.py:277
msgid "Please enter both fields or leave them both empty."
msgstr "Prosíme, vložte obě pole, nebo je nechte obě prázdná."
@@ -1569,7 +1674,8 @@ msgstr "Prosíme, vložte platné číslo."
#: core/validators.py:351
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural "Please enter a valid decimal number with at most %s total digits."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
msgstr[0] "Prosíme, vložte platné číslo s nejvíce %s cifrou celkem."
msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
@@ -1577,10 +1683,16 @@ msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
#: core/validators.py:354
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural "Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] "Prosíme, vložte platné číslo s nejvíce %s cifrou za desetinnou čárkou celkem."
-msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou celkem."
-msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou celkem."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+"Prosíme, vložte platné číslo s nejvíce %s cifrou za desetinnou čárkou celkem."
+msgstr[1] ""
+"Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou "
+"celkem."
+msgstr[2] ""
+"Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou "
+"celkem."
#: core/validators.py:364
#, python-format
@@ -1607,38 +1719,63 @@ msgstr "Nemohl jsem získat nic z %s."
#: core/validators.py:431
#, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
msgstr "URL %(url)s vrátilo neplatnou hlavičku Content-Type '%(contenttype)s'."
#: core/validators.py:464
#, python-format
-msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
-msgstr "Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná s "
+"\"%(start)s\".)"
#: core/validators.py:468
#, python-format
-msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
-msgstr "Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. "
+"(Řádka začíná s \"%(start)s\".)"
#: core/validators.py:473
#, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná s \"%"
+"(start)s\".)"
#: core/validators.py:478
#, python-format
-msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
-msgstr "\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná s \"%"
+"(start)s\".)"
#: core/validators.py:482
#, python-format
-msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
-msgstr "Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. "
+"(Řádka začíná s \"%(start)s\".)"
#: core/validators.py:487
#, python-format
-msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
-msgstr "Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s \"%(start)s\".)"
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s "
+"\"%(start)s\".)"
#: core/meta/fields.py:46
#, python-format
@@ -1655,8 +1792,11 @@ msgid " Separate multiple IDs with commas."
msgstr "Oddělte více identifikátorů čárkami."
#: core/meta/fields.py:132
-msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Podržte \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné položky."
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Podržte \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné "
+"položky."
#: core/meta/fields.py:508
msgid "Enter a valid filename."
@@ -1665,10 +1805,13 @@ msgstr "Vložte platný název souboru."
#: core/meta/fields.py:777
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
msgstr[0] "Prosíme, vložte platná %(self)s ID. Hodnota %(value)r není platná."
-msgstr[1] "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
-msgstr[2] "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
+msgstr[1] ""
+"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
+msgstr[2] ""
+"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
#: core/template/defaultfilters.py:354
msgid "yes,no,maybe"
@@ -1676,6 +1819,7 @@ msgstr "ano, ne, možná"
#~ msgid "Error in Template"
#~ msgstr "Chyba v šabloně"
+
#~ msgid ""
#~ "\n"
#~ "In template %(name)s, error at line %(line)s:\n"
@@ -1686,4 +1830,3 @@ msgstr "ano, ne, možná"
#, fuzzy
#~ msgid "count"
#~ msgstr "počet"
-
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index aa63656635b4ed131b8700c9e43e2879fc3ad412..7e3b238e3b9433a41fd51a9445162261efdd6099 100644
GIT binary patch
delta 25
gcmX@p!g!{Ial=OqE+bt769q#PD^s)0zcm6S0eZa%qW}N^
delta 25
gcmX@p!g!{Ial=OqE<;@-3k5?%D`TV0zcm6S0eZIxp8x;=
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index 48dc0c8e8f..ba573284b7 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 11:32+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
"Last-Translator: Jason Davies \n"
"Language-Team: Cymraeg \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
msgstr "cyfeiriad e-bost"
@@ -397,170 +397,210 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, fuzzy, python-format
msgid "Add %s"
msgstr "Ychwanegu"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Newidio"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, fuzzy, python-format
msgid "Change %s"
msgstr "Newidio"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Newid cyfrinair"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
msgstr "amser gweithred"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
msgstr "Dyddiad/amser"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
msgstr "Cyfeiriad e-bost:"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
msgstr "Rhagfyr"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
msgstr "Rhowch rhif cyfan."
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Newid cyfrinair"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Allgofnodi"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -571,7 +611,7 @@ msgid "Home"
msgstr "Adref"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Hanes"
@@ -637,7 +677,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Ychwanegu"
@@ -661,7 +701,7 @@ msgstr "Fy Ngweithredau"
msgid "None available"
msgstr "Dim ar gael"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Ychwanegu"
@@ -682,15 +722,7 @@ msgstr "Ydych wedi anghofio eich cyfrinair?"
msgid "Welcome,"
msgstr "Croeso,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Newid cyfrinair"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Allgofnodi"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -700,7 +732,7 @@ msgstr ""
"Bydda dileu'r %(object_name)s '%(object)s' yn ddilyn i dileu'r wrthrychau "
"perthynol, ond ni chaniateir eich cyfrif ddileu'r mathau o wrthrych canlynol:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -709,7 +741,7 @@ msgstr ""
"Ydych yn sicr chi eiso ddileu'r %(object_name)s \"%(object)s\"? Bydd y cwbl "
"o'r eitemau perthynol canlynol yn cae eu ddileu:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Yndw, rwy'n sicr"
@@ -722,21 +754,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -934,6 +966,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "ailgyfeirio o"
@@ -1016,15 +1056,15 @@ msgstr "tudalen fflat"
msgid "flat pages"
msgstr "tudalennau fflat"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 289182240a43df3e1837ccc55c6cd80e5f0aec0a..299c257f9c44ee3100e33bd295bf33b0c0248d6c 100644
GIT binary patch
delta 25
gcmZ49%(%Rnaf5^=myxc4iGrbtm8scgCCyd|0AZR2+5i9m
delta 25
gcmZ49%(%Rnaf5^=m!Ynag@U1>m9f!gCCyd|0AZ8{)&Kwi
diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po
index 91ff704071..d693acfd98 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-11-28 11:32+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Morten Bagai \n"
"Language-Team: Danish\n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
msgstr "e-mail adresse"
@@ -397,170 +397,210 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, fuzzy, python-format
msgid "Add %s"
msgstr "Tilføj"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Ændre"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, fuzzy, python-format
msgid "Change %s"
msgstr "Ændre"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Ændre adgangskode"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
msgstr "handlingstid"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
msgstr "Dato/tid"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
msgstr "E-mail adresse:"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
msgstr "December"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
msgstr "Indtast et heltal."
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "Internetadresse"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Ændre adgangskode"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Log ud"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -571,7 +611,7 @@ msgid "Home"
msgstr "Hjem"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Historik"
@@ -637,7 +677,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Tilføj"
@@ -661,7 +701,7 @@ msgstr "Mine handlinger"
msgid "None available"
msgstr "Ingen tilgængelige"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, python-format
msgid "Add %(name)s"
msgstr ""
@@ -682,15 +722,7 @@ msgstr "Har du glemt din adgangskode?"
msgid "Welcome,"
msgstr "Velkommen"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Ændre adgangskode"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Log ud"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -700,7 +732,7 @@ msgstr ""
"Hvis du sletter %(object_name)s '%(object)s' vil du også slette relaterede "
"objekter, men du har ikke rettigheder til at slette flg. typer objekter:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -709,7 +741,7 @@ msgstr ""
"Er du sikker på at du vil slette %(object_name) \"%(object)s\"? Alle de "
"følgende relaterede objekter vil blive slettet:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Ja, jeg er sikker"
@@ -722,21 +754,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -938,6 +970,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "omadresser fra"
@@ -1020,15 +1060,15 @@ msgstr "flad side"
msgid "flat pages"
msgstr "flade sider"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index df479567a96d64735a9740e503580130c07d20ce..13938797b8d7d3f0656b4e5318314baec2b3e521 100644
GIT binary patch
delta 19
acmeDG$k_jpaf6Wui;0z~*=943NCN;(#0JCw
delta 19
acmeDG$k_jpaf6Wui?NlV@n$oRNCN;(jRw2`
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index cb048542b6..b72dc69b1b 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/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-04 13:13+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: 2005-10-08 00:03+0200\n"
"Last-Translator: Georg Bauer \n"
"MIME-Version: 1.0\n"
@@ -576,7 +576,7 @@ msgstr "XML Text"
#: contrib/admin/templates/admin/change_list.html:4
#: contrib/admin/templates/admin/base.html:23
#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:8
+#: 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
@@ -594,7 +594,7 @@ msgstr "Passwort
#: contrib/admin/templates/admin/change_list.html:4
#: contrib/admin/templates/admin/base.html:23
#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:8
+#: 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
@@ -612,7 +612,7 @@ msgstr "Abmelden"
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:11
+#: 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
@@ -623,7 +623,7 @@ msgid "Home"
msgstr "Start"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Geschichte"
@@ -691,7 +691,7 @@ 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:13
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Zufgen"
@@ -769,21 +769,21 @@ msgstr " Nach %(title)s "
msgid "Go"
msgstr "Los"
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr "Im Web Anzeigen"
-#: contrib/admin/templates/admin/change_form.html:27
+#: 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:44
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr "Sortierung"
-#: contrib/admin/templates/admin/change_form.html:47
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr "Reihenfolge:"
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index 34f114e05265f0acb8d5ffaee36c891d9967542a..ccf56f5124095550ac3005d83b07df627adb83ed 100644
GIT binary patch
delta 22
dcmbQiGJ|D11WbuK+#x1*HH0
delta 22
dcmbQiGJ|D\n"
"Language-Team: LANGUAGE \n"
@@ -76,7 +76,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
msgid "IP address"
msgstr ""
@@ -379,165 +379,205 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, python-format
msgid "Add %s"
msgstr ""
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, python-format
msgid "Changed %s."
msgstr ""
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, python-format
msgid "Change %s"
msgstr ""
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, python-format
msgid "Change history: %s"
msgstr ""
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
msgid "Date (without time)"
msgstr ""
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
msgid "Date (with time)"
msgstr ""
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
msgid "E-mail address"
msgstr ""
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
msgid "Decimal number"
msgstr ""
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
-msgid "Phone number"
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
msgstr ""
#: contrib/admin/views/doc.py:260
-msgid "String (up to 50)"
-msgstr ""
-
-#: contrib/admin/views/doc.py:262
-msgid "Text"
+msgid "Phone number"
msgstr ""
#: contrib/admin/views/doc.py:263
-msgid "Time"
-msgstr ""
-
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
-msgid "URL"
+msgid "String (up to 50)"
msgstr ""
#: contrib/admin/views/doc.py:265
-msgid "U.S. state (two uppercase letters)"
+msgid "Text"
msgstr ""
#: contrib/admin/views/doc.py:266
+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 ""
+
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr ""
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr ""
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -548,7 +588,7 @@ msgid "Home"
msgstr ""
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr ""
@@ -610,7 +650,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr ""
@@ -634,7 +674,7 @@ msgstr ""
msgid "None available"
msgstr ""
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, python-format
msgid "Add %(name)s"
msgstr ""
@@ -655,15 +695,7 @@ msgstr ""
msgid "Welcome,"
msgstr ""
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr ""
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr ""
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -671,14 +703,14 @@ msgid ""
"types of objects:"
msgstr ""
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
"the following related items will be deleted:"
msgstr ""
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr ""
@@ -691,21 +723,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -897,6 +929,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr ""
@@ -968,15 +1008,15 @@ msgstr ""
msgid "flat pages"
msgstr ""
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr "P"
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 5c3e6ff12416769aeeec9ab8e2e11df965bb420e..c3771b702b39d8eb5da209100ea2f7659d2374cf 100644
GIT binary patch
delta 28
kcmX@{lJUe##tnzuc#U)oOcV@FtW3?c4GcG*cl)Ue0HnhTkpKVy
delta 28
kcmX@{lJUe##tnzucnx)pOce~xt&Gfd4a_#5cl)Ue0HqxYn*aa+
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 483bd8ff68..a85921ec97 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -9,9 +9,10 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: 2005-11-28 15:28+0000\n"
-"Last-Translator: Ricardo Javier Cardenes Medina \n"
+"Last-Translator: Ricardo Javier Cardenes Medina \n"
"Language-Team: Spanish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -79,7 +80,7 @@ msgstr "fecha/hora de env
msgid "is public"
msgstr "es pblico"
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
msgid "IP address"
msgstr "Direccin IP"
@@ -91,7 +92,9 @@ msgstr "est
msgid ""
"Check this box if the comment is inappropriate. A \"This comment has been "
"removed\" message will be displayed instead."
-msgstr "Marque esta caja si el comentario es inapropiado. En su lugar se mostrar \"Este comentario ha sido eliminado\"."
+msgstr ""
+"Marque esta caja si el comentario es inapropiado. En su lugar se mostrar "
+"\"Este comentario ha sido eliminado\"."
#: contrib/comments/models/comments.py:31
msgid "Comment"
@@ -220,7 +223,8 @@ msgid "No voting for yourself"
msgstr "No te votes t mismo"
#: contrib/comments/views/comments.py:25
-msgid "This rating is required because you've entered at least one other rating."
+msgid ""
+"This rating is required because you've entered at least one other rating."
msgstr "Se precisa esta puntuacin porque ha introducido al menos otra ms."
#: contrib/comments/views/comments.py:109
@@ -236,11 +240,13 @@ msgid_plural ""
"\n"
"%(text)s"
msgstr[0] ""
-"Este comentario lo envi un usuario que ha enviado menos de %(count)s comentario:\n"
+"Este comentario lo envi un usuario que ha enviado menos de %(count)s "
+"comentario:\n"
"\n"
"%(text)s"
msgstr[1] ""
-"Este comentario lo envi un usuario que ha enviado menos de %(count)s comentarios:\n"
+"Este comentario lo envi un usuario que ha enviado menos de %(count)s "
+"comentarios:\n"
"\n"
"%(text)s"
@@ -265,14 +271,18 @@ msgstr "No se proporcion
#: contrib/comments/views/comments.py:194
#: contrib/comments/views/comments.py:283
msgid "Somebody tampered with the comment form (security violation)"
-msgstr "Alguien est jugando con el formulario de comentarios (violacin de seguridad)"
+msgstr ""
+"Alguien est jugando con el formulario de comentarios (violacin de "
+"seguridad)"
#: contrib/comments/views/comments.py:204
#: contrib/comments/views/comments.py:289
msgid ""
"The comment form had an invalid 'target' parameter -- the object ID was "
"invalid"
-msgstr "El formulario de comentarios tiene un parmetro 'target' no vlido (el ID de objeto era invlido)"
+msgstr ""
+"El formulario de comentarios tiene un parmetro 'target' no vlido (el ID de "
+"objeto era invlido)"
#: contrib/comments/views/comments.py:254
#: contrib/comments/views/comments.py:318
@@ -353,7 +363,7 @@ msgstr "entrada de registro"
msgid "log entries"
msgstr "entradas de registro"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr "Todas las fechas"
@@ -366,13 +376,17 @@ msgstr "Registrarse"
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
-msgstr "Por favor, regstrese de nuevo, porque su sesin ha caducado. No se preocupe: se ha guardado su envo."
+msgstr ""
+"Por favor, regstrese de nuevo, porque su sesin ha caducado. No se "
+"preocupe: se ha guardado su envo."
#: contrib/admin/views/decorators.py:63
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
-msgstr "Parece que su navegador no est configurado para aceptar cookies. Actvelas por favor, recarge esta pgina, e intntelo de nuevo."
+msgstr ""
+"Parece que su navegador no est configurado para aceptar cookies. Actvelas "
+"por favor, recarge esta pgina, e intntelo de nuevo."
#: contrib/admin/views/decorators.py:77
msgid "Usernames cannot contain the '@' character."
@@ -381,7 +395,9 @@ msgstr "Los nombres de usuario no pueden contener el car
#: contrib/admin/views/decorators.py:79
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Su direccin de correo no es su nombre de usuario. Pruebe con '%s' en su lugar."
+msgstr ""
+"Su direccin de correo no es su nombre de usuario. Pruebe con '%s' en su "
+"lugar."
#: contrib/admin/views/main.py:49
msgid "Site administration"
@@ -397,159 +413,201 @@ msgstr "Escoja %s"
msgid "Select %s to change"
msgstr "Escoja %s para modificar"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Se aadi con xito el %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr "Puede editarlo de nuevo debajo."
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr "Puede agregar otro %s debajo."
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:437
#, python-format
msgid "Add %s"
msgstr "Agregar %s"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr "Agregado %s."
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr "y"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:455
#, python-format
msgid "Changed %s."
msgstr "Modificado %s."
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr "Borrado %s."
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr "No cambi ningn campo."
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "Se modific con xito el %(name)s \"%(obj)s."
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:494
#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "Se agreg con xito el %(name)s \"%(obj)s. Puede editarlo de nuevo debajo."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"Se agreg con xito el %(name)s \"%(obj)s. Puede editarlo de nuevo debajo."
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:532
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "Uno o ms %(fieldname)s en %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Uno o ms %(fieldname)s en %(name)s:"
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Se elimin con xito el %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr "Est seguro?"
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:662
#, python-format
msgid "Change history: %s"
msgstr "Modificar histrico: %s"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr "Entero"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Cadena (mximo %(maxlength)s)"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:248
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:249
msgid "Date (with time)"
msgstr "Fecha (con hora)"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:250
msgid "E-mail address"
msgstr "Direccin de correo"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr "Ruta al fichero"
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:252
msgid "Decimal number"
msgstr "Nmero decimal"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o None)"
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
msgid "Phone number"
msgstr "Nmero de telfono"
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr "Cadena (mximo 50)"
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr "Texto"
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr "Hora"
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr "Estado de los EEUU (dos letras maysculas)"
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr "Texto XML"
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Cambiar clave"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Terminar"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/change_list.html:5
@@ -677,15 +735,7 @@ msgstr "
msgid "Welcome,"
msgstr "Bienvenido,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambiar clave"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Terminar"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -696,7 +746,7 @@ msgstr ""
"objetos relacionados, pero su cuenta no tiene permiso para borrar los "
"siguientes tipos de objetos:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -705,15 +755,19 @@ msgstr ""
"Est seguro de que quiere borrar los %(object_name)s \"%(object)s\"? Se "
"borrarn los siguientes objetos relacionados:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "S, estoy seguro"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr " Por %(title)s "
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr "Ver en el sitio"
@@ -891,11 +945,13 @@ msgid ""
msgstr ""
"\n"
"Para instalar bookmarklets, arrastre el enlace a su barra\n"
-"de favoritos, o pulse con el botn derecho el enlace y adalo a sus favoritos.\n"
+"de favoritos, o pulse con el botn derecho el enlace y adalo a sus "
+"favoritos.\n"
"Ahora puede escoger el bookmarklet desde cualquier pgina en el sitio.\n"
"Observer que algunos de estos bookmarklets precisan que est viendo\n"
"el sitio desde un computador sealado como \"interno\" (hable\n"
-"con su administrador de sistemas si no est seguro de si el suyo lo es).
\n"
+"con su administrador de sistemas si no est seguro de si el suyo lo es)."
+"p>\n"
#: contrib/admin/templates/admin_doc/bookmarklets.html:19
msgid "Documentation for this page"
@@ -905,7 +961,8 @@ msgstr "Documentaci
msgid ""
"Jumps you from any page to the documentation for the view that generates "
"that page."
-msgstr "Le lleva desde cualquier pgina a la documentacin de la vista que la genera."
+msgstr ""
+"Le lleva desde cualquier pgina a la documentacin de la vista que la genera."
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
msgid "Show object ID"
@@ -916,8 +973,8 @@ msgid ""
"Shows the content-type and unique ID for pages that represent a single "
"object."
msgstr ""
-"Muestra el tipo de contenido e ID unvoco de las pginas que representan "
-"un nico objeto."
+"Muestra el tipo de contenido e ID unvoco de las pginas que representan un "
+"nico objeto."
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Edit this object (current window)"
@@ -925,7 +982,9 @@ msgstr "Editar este objeto (ventana actual)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:26
msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Le lleva a la pgina de administracin de pginas que representan un nico objeto."
+msgstr ""
+"Le lleva a la pgina de administracin de pginas que representan un nico "
+"objeto."
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "Edit this object (new window)"
@@ -933,7 +992,17 @@ msgstr "Editar este objeto (nueva ventana)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:29
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."
+msgstr ""
+"Como antes, pero abre la pgina de administracin en una nueva ventana."
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+#, fuzzy
+msgid "Time:"
+msgstr "Hora"
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
@@ -943,7 +1012,9 @@ msgstr "redirigir desde"
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/'."
+msgstr ""
+"Esta ruta debera ser absoluta, excluyendo el nombre de dominio. Ejeplo: '/"
+"events/search/'."
#: contrib/redirects/models/redirects.py:9
msgid "redirect to"
@@ -953,7 +1024,9 @@ msgstr "redirigir a"
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://'."
+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"
@@ -964,8 +1037,11 @@ 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."
+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"
@@ -987,7 +1063,9 @@ msgstr "nombre de plantilla"
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'."
+msgstr ""
+"Ejemplo: 'flatpages/contact_page'. Si no lo proporciona, el sistema usar "
+"'flatpages/default'."
#: contrib/flatpages/models/flatpages.py:13
msgid "registration required"
@@ -1005,15 +1083,15 @@ msgstr "p
msgid "flat pages"
msgstr "pginas simples"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
@@ -1288,8 +1366,8 @@ msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
msgstr ""
-"Adems de los permisos asignados manualmente, este usuario tambin "
-"tendr todos los permisos de los grupos en los que est."
+"Adems de los permisos asignados manualmente, este usuario tambin tendr "
+"todos los permisos de los grupos en los que est."
#: models/auth.py:48
msgid "Users"
@@ -1426,7 +1504,8 @@ msgstr "Este valor debe contener s
#: core/validators.py:66
msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Este valor debe contener slo letras, nmeros, guiones bajos y barras (/)."
+msgstr ""
+"Este valor debe contener slo letras, nmeros, guiones bajos y barras (/)."
#: core/validators.py:74
msgid "Uppercase letters are not allowed here."
@@ -1488,7 +1567,9 @@ msgstr "Introduzca una direcci
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
-msgstr "Enve una imagen vlida. El fichero que ha enviado era una imagen corrupta, o no era una imagen."
+msgstr ""
+"Enve una imagen vlida. El fichero que ha enviado era una imagen corrupta, "
+"o no era una imagen."
#: core/validators.py:157
#, python-format
@@ -1498,7 +1579,9 @@ msgstr "La URL %s no apunta a una imagen v
#: core/validators.py:161
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Los nmeros de telfono deben guardar el formato XXX-XXX-XXXX format. \"%s\" no es vlido."
+msgstr ""
+"Los nmeros de telfono deben guardar el formato XXX-XXX-XXXX format. \"%s\" "
+"no es vlido."
#: core/validators.py:169
#, python-format
@@ -1583,16 +1666,25 @@ msgstr "Por favor, introduzca un n
#: core/validators.py:351
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural "Please enter a valid decimal number with at most %s total digits."
-msgstr[0] "Por favor, introduzca un nmero decimal vlido con al menos %s dtigo total."
-msgstr[1] "Por favor, introduzca un nmero decimal vlido con al menos %s dtigos totales."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] ""
+"Por favor, introduzca un nmero decimal vlido con al menos %s dtigo total."
+msgstr[1] ""
+"Por favor, introduzca un nmero decimal vlido con al menos %s dtigos "
+"totales."
#: core/validators.py:354
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural "Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] "Por favor, introduzca un nmero decimal vlido con al menos %s dtigo decimal."
-msgstr[1] "Por favor, introduzca un nmero decimal vlido con al menos %s dtigos decimales."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+"Por favor, introduzca un nmero decimal vlido con al menos %s dtigo "
+"decimal."
+msgstr[1] ""
+"Por favor, introduzca un nmero decimal vlido con al menos %s dtigos "
+"decimales."
#: core/validators.py:364
#, python-format
@@ -1619,50 +1711,65 @@ msgstr "No pude obtener nada de %s."
#: core/validators.py:431
#, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s'.que no es vlida."
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+"La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s'.que no es "
+"vlida."
#: core/validators.py:464
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
"\"%(start)s\".)"
-msgstr "Por favor, cierre la etiqueta %(tag)s de la lnea %(line)s. (La lnea empieza por \"%(start)s\".)"
+msgstr ""
+"Por favor, cierre la etiqueta %(tag)s de la lnea %(line)s. (La lnea "
+"empieza por \"%(start)s\".)"
#: core/validators.py:468
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
"starts with \"%(start)s\".)"
-msgstr "Parte del texto que comienza en la lnea %(line)s no est permitido en ese contexto. (La lnea empieza por \"%(start)s\".)"
+msgstr ""
+"Parte del texto que comienza en la lnea %(line)s no est permitido en ese "
+"contexto. (La lnea empieza por \"%(start)s\".)"
#: core/validators.py:473
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
"(start)s\".)"
-msgstr "El \"%(attr)s\" de la lnea %(line)s no es un atributo vlido. (La lnea empieza por \"%(start)s\".)"
+msgstr ""
+"El \"%(attr)s\" de la lnea %(line)s no es un atributo vlido. (La lnea "
+"empieza por \"%(start)s\".)"
#: core/validators.py:478
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
"(start)s\".)"
-msgstr "La \"<%(tag)s>\" de la lnea %(line)s no es una etiqueta vlida. (La lnea empieza por \"%(start)s\".)"
+msgstr ""
+"La \"<%(tag)s>\" de la lnea %(line)s no es una etiqueta vlida. (La lnea "
+"empieza por \"%(start)s\".)"
#: core/validators.py:482
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
"starts with \"%(start)s\".)"
-msgstr "A una etiqueta de la lnea %(line)s le faltan uno o ms atributos requeridos. (La lnea empieza por \"%(start)s\".)"
+msgstr ""
+"A una etiqueta de la lnea %(line)s le faltan uno o ms atributos "
+"requeridos. (La lnea empieza por \"%(start)s\".)"
#: core/validators.py:487
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
"starts with \"%(start)s\".)"
-msgstr "El atributo \"%(attr)s\" de la lnea %(line)s tiene un valor que no es vlido. (La lnea empieza por \"%(start)s\".)"
+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/fields.py:46
#, python-format
@@ -1679,7 +1786,8 @@ msgid " Separate multiple IDs with commas."
msgstr " Separe mltiples ID con comas."
#: core/meta/fields.py:132
-msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Pulse \"Control\" o \"Command\" en un Mac para escoger ms de uno."
#: core/meta/fields.py:508
@@ -1689,7 +1797,15 @@ msgstr "Introduzca un nombre de fichero v
#: core/meta/fields.py:777
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
-msgstr[0] "Por favor, introduzca IDs de %(self)s vlidos. El valor %(value)r no es vlido."
-msgstr[1] "Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son vlidos."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] ""
+"Por favor, introduzca IDs de %(self)s vlidos. El valor %(value)r no es "
+"vlido."
+msgstr[1] ""
+"Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son "
+"vlidos."
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index a413704a00d4efed24a85c85d2fb000141ab2a0e..bde556408c9376c03134e1c8ef820ec57fad59e3 100644
GIT binary patch
delta 25
gcmbQ-!8o~tal=V\n"
"Language-Team: franais \n"
@@ -77,7 +77,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
msgstr "courriel"
@@ -396,170 +396,210 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, fuzzy, python-format
msgid "Add %s"
msgstr "Ajouter"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Modifier"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, fuzzy, python-format
msgid "Change %s"
msgstr "Modifier"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Modifier votre mot de passe"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
msgstr "heure de l'action"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
msgstr "Date/Heure"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
msgstr "Courriel:"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
msgstr "Dcembre"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
msgstr "Entrez un nombre entier."
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "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/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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Dconnection"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -570,7 +610,7 @@ msgid "Home"
msgstr "Accueil"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Historique"
@@ -638,7 +678,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Ajouter"
@@ -662,7 +702,7 @@ msgstr "Mes actions"
msgid "None available"
msgstr "Aucun(e) disponible"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Ajouter"
@@ -683,15 +723,7 @@ msgstr "Avez vous perdu votre mot de passe?"
msgid "Welcome,"
msgstr "Bienvenue,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Modifier votre mot de passe"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Dconnection"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, fuzzy, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -702,7 +734,7 @@ msgstr ""
"objets qui lui sont lis mais votre compte ne possde pas la permission de "
"supprimer les types d'objets suivants:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -711,7 +743,7 @@ msgstr ""
"tes vous certain de vouloir supprimer %(object_name)s \"%(object)s\"? Tous "
"les lments lis suivants seront supprims:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Oui, je suis certain"
@@ -724,21 +756,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -941,6 +973,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "redirig depuis"
@@ -1023,15 +1063,15 @@ msgstr "page
msgid "flat pages"
msgstr "pages plat"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index f56c402707afba0268da1906bef3f8bf14057828..95f9568af924b41cdf3e869d5a2c868f0b93005b 100644
GIT binary patch
delta 25
gcmaEUm+|>s#tqp{Tt>PECJKfoR;H$#OPz{z0EQ|E<^TWy
delta 25
gcmaEUm+|>s#tqp{T!y+v77B)jR>p>#OPz{z0EQ$8;s5{u
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index 35ea3982d5..fb386defce 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-11-28 11:31+0100\n"
+"POT-Creation-Date: 2005-12-04 14:55+0100\n"
"PO-Revision-Date: 2005-11-28 16:21+0100\n"
"Last-Translator: Afonso Fernández Nogueira \n"
"Language-Team: Galego\n"
@@ -77,8 +77,7 @@ msgstr "data/hora do envío"
msgid "is public"
msgstr "é público"
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
msgid "IP address"
msgstr "Enderezo IP"
@@ -87,8 +86,12 @@ msgid "is removed"
msgstr "está borrado"
#: contrib/comments/models/comments.py:27
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-msgstr "Marque esta caixa se o comentario non é apropiado. Verase a mensaxe \"Este comentario foi borrado\" no canto do seu contido."
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Marque esta caixa se o comentario non é apropiado. Verase a mensaxe \"Este "
+"comentario foi borrado\" no canto do seu contido."
#: contrib/comments/models/comments.py:31
msgid "Comment"
@@ -217,17 +220,20 @@ msgid "No voting for yourself"
msgstr "Non se pode votar a si mesmo"
#: contrib/comments/views/comments.py:25
-msgid "This rating is required because you've entered at least one other rating."
+msgid ""
+"This rating is required because you've entered at least one other rating."
msgstr ""
#: contrib/comments/views/comments.py:109
#, python-format
msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
"\n"
"%(text)s"
msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
"\n"
"%(text)s"
msgstr[0] ""
@@ -258,8 +264,12 @@ msgstr "Alguén manipulou o formulario do comentario (violación de seguridade)"
#: contrib/comments/views/comments.py:204
#: contrib/comments/views/comments.py:289
-msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
-msgstr "O formulario do comentario tiña un parámetro 'target' non válido: a ID do obxecto non é válida"
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"O formulario do comentario tiña un parámetro 'target' non válido: a ID do "
+"obxecto non é válida"
#: contrib/comments/views/comments.py:254
#: contrib/comments/views/comments.py:318
@@ -275,8 +285,7 @@ msgstr ""
"Por %s:
\n"
"\n"
-#: contrib/admin/filterspecs.py:70
-#: contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
#: contrib/admin/filterspecs.py:143
msgid "All"
msgstr "Todo"
@@ -351,12 +360,20 @@ msgid "Log in"
msgstr "Entrar"
#: contrib/admin/views/decorators.py:56
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Ten que identicarse outra vez porque a súa sesión expirou. Non se preocupe: o que enviou quedou gardado."
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Ten que identicarse outra vez porque a súa sesión expirou. Non se preocupe: "
+"o que enviou quedou gardado."
#: contrib/admin/views/decorators.py:63
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Semella que o seu navegador non está configurado para aceptar 'cookies'. Por favor, habilite as 'cookies', recargue a páxina e ténteo de novo."
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Semella que o seu navegador non está configurado para aceptar 'cookies'. "
+"Por favor, habilite as 'cookies', recargue a páxina e ténteo de novo."
#: contrib/admin/views/decorators.py:77
msgid "Usernames cannot contain the '@' character."
@@ -365,7 +382,9 @@ msgstr "Os nomes de usuario non poden conter o carácter '@'."
#: contrib/admin/views/decorators.py:79
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "O seu enderezo de correo electrónico non é o seu nome de usuario. Probe con '%s'."
+msgstr ""
+"O seu enderezo de correo electrónico non é o seu nome de usuario. Probe con "
+"'%s'."
#: contrib/admin/views/main.py:49
msgid "Site administration"
@@ -381,172 +400,207 @@ msgstr "Seleccione un elemento %s"
msgid "Select %s to change"
msgstr "Seleccione un elemento %s para modificar"
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "O elemento \"%(obj)s\" de tipo %(name)s engadiuse correctamente."
-#: contrib/admin/views/main.py:416
-#: contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr "Pode volver editalo embaixo."
-#: contrib/admin/views/main.py:424
-#: contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr "Pode engadir outro elemento %s embaixo."
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, python-format
msgid "Add %s"
msgstr "Engadir un elemento %s"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr "Engadido(s) %s."
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
#: contrib/admin/views/main.py:457
-#: contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
msgid "and"
msgstr "e"
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, python-format
msgid "Changed %s."
msgstr "Modificado(s) %s."
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr "Eliminado(s) %s."
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr "Non se modificou ningún campo."
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "O elemento %(name)s \"%(obj)s\" modificouse correctamente."
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "O elemento %(name)s \"%(obj)s\" engadiuse correctamente. Pode volver editalo embaixo."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"O elemento %(name)s \"%(obj)s\" engadiuse correctamente. Pode volver editalo "
+"embaixo."
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "Un ou máis %(fieldname)s no elemento %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Un ou máis %(fieldname)s no elemento %(name)s:"
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "O elemento %(name)s \"%(obj)s\" eliminouse correctamente."
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr "Está seguro?"
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, python-format
msgid "Change history: %s"
msgstr "Histórico de cambios: %s"
-#: contrib/admin/views/doc.py:242
-#: contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253
-#: contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259
-#: contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr "Número enteiro"
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr "Valor booleano (verdadeiro ou falso)"
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Cadea (ata %(maxlength)s caracteres)"
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr "Números enteiros separados por comas"
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
msgid "Date (without time)"
msgstr "Data (sen a hora)"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
msgid "Date (with time)"
msgstr "Data (coa hora)"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
msgid "E-mail address"
msgstr "Enderezo de correo electrónico"
-#: contrib/admin/views/doc.py:249
-#: contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr "Ruta do ficheiro"
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
msgid "Decimal number"
msgstr "Número decimal"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (verdadeiro, falso ou ningún)"
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
msgid "Phone number"
msgstr "Número de teléfono"
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr "Cadea (ata 50 caracteres)"
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr "Texto"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr "Hora"
-#: contrib/admin/views/doc.py:264
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr "Estado dos Estados Unidos (dúas letras maíusculas)"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr "Texto XML"
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Cambiar contrasinal"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Saír"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -557,7 +611,7 @@ msgid "Home"
msgstr "Inicio"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Histórico"
@@ -565,8 +619,7 @@ msgstr "Histórico"
msgid "Date/time"
msgstr "Data/hora"
-#: contrib/admin/templates/admin/object_history.html:19
-#: models/auth.py:47
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
msgid "User"
msgstr "Usuario"
@@ -579,8 +632,12 @@ msgid "DATE_WITH_TIME_FULL"
msgstr "j. N Y, H:i"
#: contrib/admin/templates/admin/object_history.html:36
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Este obxecto non ten histórico de cambios. Posibelmente non se creou usando este sitio de administración."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Este obxecto non ten histórico de cambios. Posibelmente non se creou usando "
+"este sitio de administración."
#: contrib/admin/templates/admin/base_site.html:4
msgid "Django site admin"
@@ -603,8 +660,12 @@ msgid "Server Error (500)"
msgstr "Erro do servidor (500)"
#: contrib/admin/templates/admin/500.html:10
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "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."
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Houbo un erro. Xa se informou aos administradores do sitio por correo "
+"electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia."
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
@@ -616,7 +677,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Engadir"
@@ -640,8 +701,8 @@ msgstr "As miñas accións"
msgid "None available"
msgstr "Ningunha dispoñíbel"
-#: contrib/admin/templates/admin/change_list.html:9
-#, python-format
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
msgid "Add %(name)s"
msgstr "Engadir %(name)s"
@@ -661,25 +722,27 @@ msgstr "Esqueceu o contrasinal?"
msgid "Welcome,"
msgstr "Benvido,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambiar contrasinal"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Saír"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
-msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Borrar o %(object_name)s '%(object)s' resultaría na eliminación de elementos relacionados, pero a súa conta non ten permiso para borrar os seguintes tipos de elementos:"
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Borrar o %(object_name)s '%(object)s' resultaría na eliminación de elementos "
+"relacionados, pero a súa conta non ten permiso para borrar os seguintes "
+"tipos de elementos:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "Seguro que quere borrar o %(object_name)s \"%(object)s\"? Eliminaranse os seguintes obxectos relacionados:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Seguro que quere borrar o %(object_name)s \"%(object)s\"? Eliminaranse os "
+"seguintes obxectos relacionados:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Si, estou seguro"
@@ -692,21 +755,21 @@ msgstr "Por %(title)s"
msgid "Go"
msgstr "Ir"
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr "Ver na web"
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr "Orde"
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr "Orde:"
@@ -754,8 +817,12 @@ msgid "Password reset"
msgstr "Recuperar o contrasinal"
#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
-msgstr "Esqueceu o contrasinal? Introduza o seu enderezo de correo electrónico embaixo e enviarémoslle un novo contrasinal."
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Esqueceu o contrasinal? Introduza o seu enderezo de correo electrónico "
+"embaixo e enviarémoslle un novo contrasinal."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -779,12 +846,20 @@ msgid "Password reset successful"
msgstr "O contrasinal foi recuperado correctamente"
#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Acabamos de enviarlle un novo contrasinal ao enderezo de correo indicado. Debería recibilo en breve."
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Acabamos de enviarlle un novo contrasinal ao enderezo de correo indicado. "
+"Debería recibilo en breve."
#: contrib/admin/templates/registration/password_change_form.html:12
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Por razóns de seguridade, introduza o contrasinal actual. Despois introduza dúas veces o contrasinal para verificarmos que o escribiu correctamente."
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Por razóns de seguridade, introduza o contrasinal actual. Despois introduza "
+"dúas veces o contrasinal para verificarmos que o escribiu correctamente."
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
@@ -869,7 +944,9 @@ msgid "Documentation for this page"
msgstr "Documentación para esta páxina"
#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid "Jumps you from any page to the documentation for the view that generates that page."
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
msgstr "Salta á documentación para a vista que xera a páxina."
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
@@ -877,8 +954,12 @@ msgid "Show object ID"
msgstr "Amosar ID do obxecto"
#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Amosa o tipo de contido e a ID única para páxinas que representan un obxecto determinado."
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Amosa o tipo de contido e a ID única para páxinas que representan un obxecto "
+"determinado."
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Edit this object (current window)"
@@ -886,7 +967,9 @@ msgstr "Editar este obxecto (nesta fiestra)"
#: contrib/admin/templates/admin_doc/bookmarklets.html:26
msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Salta á páxina de administración para páxina que representan un obxecto determinado."
+msgstr ""
+"Salta á páxina de administración para páxina que representan un obxecto "
+"determinado."
#: contrib/admin/templates/admin_doc/bookmarklets.html:28
msgid "Edit this object (new window)"
@@ -896,21 +979,38 @@ 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 ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+#, fuzzy
+msgid "Time:"
+msgstr "Hora"
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "orixe da redirección"
#: contrib/redirects/models/redirects.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Debe ser unha ruta absoluta, sen o nome de dominio. Exemplo: '/events/search/'"
+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://'"
+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"
@@ -921,8 +1021,10 @@ 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."
+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"
@@ -941,7 +1043,9 @@ 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'."
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
msgstr ""
#: contrib/flatpages/models/flatpages.py:13
@@ -960,15 +1064,15 @@ msgstr "páxina plana"
msgid "flat pages"
msgstr "páxinas planas"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
@@ -1008,28 +1112,23 @@ msgstr "xaneiro"
msgid "February"
msgstr "febreiro"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "March"
msgstr "marzo"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "April"
msgstr "abril"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "May"
msgstr "maio"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "June"
msgstr "xuño"
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
msgid "July"
msgstr "xullo"
@@ -1131,10 +1230,7 @@ msgstr "sitios"
msgid "label"
msgstr "etiqueta"
-#: models/core.py:29
-#: models/core.py:40
-#: models/auth.py:6
-#: models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "nome"
@@ -1186,8 +1282,7 @@ msgstr "código"
msgid "Permission"
msgstr "Permiso"
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
msgid "Permissions"
msgstr "Permisos"
@@ -1195,8 +1290,7 @@ msgstr "Permisos"
msgid "Group"
msgstr "Grupo"
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
msgid "Groups"
msgstr "Grupos"
@@ -1249,8 +1343,12 @@ msgid "date joined"
msgstr "data de rexistro"
#: models/auth.py:44
-msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "Ademais dos permisos asignados manualmente, este usuario gozará de todos os permisos concedidos a cada un dos grupos aos que pertence."
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Ademais dos permisos asignados manualmente, este usuario gozará de todos os "
+"permisos concedidos a cada un dos grupos aos que pertence."
#: models/auth.py:48
msgid "Users"
@@ -1344,9 +1442,7 @@ msgstr "sueco"
msgid "Simplified Chinese"
msgstr "chinés simplificado"
-#: core/formfields.py:59
-#: core/meta/fields.py:285
-#: core/meta/fields.py:488
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
#: core/meta/fields.py:499
msgid "This field is required."
msgstr "Requírese este campo."
@@ -1362,9 +1458,7 @@ msgstr[1] "Asegúrese de que o seu texto contén menos de %s caracteres."
msgid "Line breaks are not allowed here."
msgstr "Aquí non se permiten saltos de liña."
-#: core/formfields.py:436
-#: core/formfields.py:507
-#: core/formfields.py:545
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
@@ -1391,7 +1485,9 @@ msgstr "Este valor soamente pode conter letras, números e guións baixos (_)."
#: core/validators.py:66
msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Este valor soamente pode conter letras, números, guións baixos (_) e barras inclinadas."
+msgstr ""
+"Este valor soamente pode conter letras, números, guións baixos (_) e barras "
+"inclinadas."
#: core/validators.py:74
msgid "Uppercase letters are not allowed here."
@@ -1450,8 +1546,12 @@ msgid "Enter a valid e-mail address."
msgstr "Insira un enderezo de correo electrónico válido."
#: core/validators.py:150
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Suba unha imaxe válida. O ficheiro subido non era unha imaxe ou esta estaba corrupta."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Suba unha imaxe válida. O ficheiro subido non era unha imaxe ou esta estaba "
+"corrupta."
#: core/validators.py:157
#, python-format
@@ -1461,7 +1561,9 @@ msgstr "O URL %s non apunta a unha imaxe válida."
#: core/validators.py:161
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Os números de teléfono deben estar no formato XXX-XXX-XXXX. \"%s\" non é válido."
+msgstr ""
+"Os números de teléfono deben estar no formato XXX-XXX-XXXX. \"%s\" non é "
+"válido."
#: core/validators.py:169
#, python-format
@@ -1491,8 +1593,7 @@ msgstr "XML mal formado: %s"
msgid "Invalid URL: %s"
msgstr "URL non válido: %s"
-#: core/validators.py:208
-#: core/validators.py:210
+#: core/validators.py:208 core/validators.py:210
#, python-format
msgid "The URL %s is a broken link."
msgstr "O URL %s é unha ligazón rota."
@@ -1517,8 +1618,7 @@ msgstr "Este campo ten que coincidir co campo '%s'."
msgid "Please enter something for at least one field."
msgstr "Por favor, encha polo menos un campo."
-#: core/validators.py:266
-#: core/validators.py:277
+#: core/validators.py:266 core/validators.py:277
msgid "Please enter both fields or leave them both empty."
msgstr "Por favor, encha os dous campos ou deixe ambos en branco."
@@ -1548,14 +1648,16 @@ msgstr "Insira un número decimal válido."
#: core/validators.py:351
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural "Please enter a valid decimal number with at most %s total digits."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
msgstr[0] "Insira un número decimal válido cun máximo de %s díxito en total."
msgstr[1] "Insira un número decimal válido cun máximo de %s díxitos en total."
#: core/validators.py:354
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural "Please enter a valid decimal number with at most %s decimal places."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
msgstr[0] "Insira un número decimal válido cun máximo de %s lugar decimal."
msgstr[1] "Insira un número decimal válido cun máximo de %s lugares decimais."
@@ -1584,38 +1686,64 @@ msgstr "Non se puido recibir ningún dato de %s."
#: core/validators.py:431
#, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "O URL %(url)s devolveu a cabeceira Content-Type non válida '%(contenttype)s'."
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+"O URL %(url)s devolveu a cabeceira Content-Type non válida '%(contenttype)s'."
#: core/validators.py:464
#, python-format
-msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
-msgstr "Por favor, peche a etiqueta %(tag)s da liña %(line)s. (A liña comeza con \"%(start)s\")."
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Por favor, peche a etiqueta %(tag)s da liña %(line)s. (A liña comeza con \"%"
+"(start)s\")."
#: core/validators.py:468
#, python-format
-msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
-msgstr "Algún texto a partir da liña %(line)s non é válido nese contexto. (A liña comeza con \"%(start)s\")."
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Algún texto a partir da liña %(line)s non é válido nese contexto. (A liña "
+"comeza con \"%(start)s\")."
#: core/validators.py:473
#, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "\"%(attr)s\" na liña %(line)s non é un atributo válido. (A liña comeza con \"%(start)s\")."
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"%(attr)s\" na liña %(line)s non é un atributo válido. (A liña comeza con "
+"\"%(start)s\")."
#: core/validators.py:478
#, python-format
-msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
-msgstr "\"<%(tag)s>\" na liña %(line)s non é unha etiqueta válida. (A liña comeza con \"%(start)s\")."
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"<%(tag)s>\" na liña %(line)s non é unha etiqueta válida. (A liña comeza "
+"con \"%(start)s\")."
#: core/validators.py:482
#, python-format
-msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
-msgstr "Falta un o máis dos atributos requiridos para unha etiqueta da liña %(line)s. (A liña comeza con \"%(start)s\")."
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Falta un o máis dos atributos requiridos para unha etiqueta da liña %(line)"
+"s. (A liña comeza con \"%(start)s\")."
#: core/validators.py:487
#, python-format
-msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
-msgstr "O atributo \"%(attr)s\" na liña %(line)s contén un valor non válido. (A liña comeza con \"%(start)s\")."
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+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/fields.py:46
#, python-format
@@ -1632,8 +1760,11 @@ msgid " Separate multiple IDs with commas."
msgstr " Separe IDs múltiplas con comas."
#: core/meta/fields.py:132
-msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr " Para seleccionar máis dunha entrada, manteña premida a tecla \"Control\", ou \"Comando\" nun Mac."
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+" Para seleccionar máis dunha entrada, manteña premida a tecla \"Control\", "
+"ou \"Comando\" nun Mac."
#: core/meta/fields.py:508
msgid "Enter a valid filename."
@@ -1642,11 +1773,11 @@ msgstr "Introduza un nome de ficheiro válido."
#: core/meta/fields.py:777
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
msgstr[0] ""
msgstr[1] ""
#: core/template/defaultfilters.py:354
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 c43ff20d17cecbc51433f4de93f80b7bb8e2f47b..78b64d0e09d0c736154361e92300e922a207b937 100644
GIT binary patch
delta 25
gcmdnj#kjAFaYK(Lmyxc4iGrbtm8se0X__mf0dY?VBme*a
delta 25
gcmdnj#kjAFaYK(Lm!Ynag@U1>m9f$0X__mf0dYwPAOHXW
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index 12b923dc52..84c607b279 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-11-28 11:32+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: 2005-11-13 18:08-0000\n"
"Last-Translator: Dagur Páll Ammendrup \n"
"Language-Team: \n"
@@ -80,7 +80,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
msgstr "tölvupóstfang"
@@ -399,170 +399,210 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, fuzzy, python-format
msgid "Add %s"
msgstr "Bæta við"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Breyta"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, fuzzy, python-format
msgid "Change %s"
msgstr "Breyta"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Breyta lykilorði"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
msgstr "tími aðgerðar"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
msgstr "Dagsetning/tími"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
msgstr "Tölvupóstfang:"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
msgstr "desember"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
msgstr "Settu inn heila tölu."
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "veffang"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Breyta lykilorði"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Skrá út"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -573,7 +613,7 @@ msgid "Home"
msgstr "Heim"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Saga"
@@ -639,7 +679,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Bæta við"
@@ -663,7 +703,7 @@ msgstr "Aðgerðir mínar"
msgid "None available"
msgstr "Engin fáanleg"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Bæta við"
@@ -684,15 +724,7 @@ msgstr "Gleymdir þú lykilorðinu þínu?"
msgid "Welcome,"
msgstr "Velkomin(n),"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Breyta lykilorði"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Skrá út"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -702,7 +734,7 @@ msgstr ""
"Eyðing á %(object_name)s '%(object)s' hefði í för með sér eyðingu á tengdum "
"hlutum en þú hefur ekki réttindi til að eyða eftirfarandi hlutum:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -711,7 +743,7 @@ msgstr ""
"Ertu viss um að þú viljir eyða %(object_name)s \"%(object)s\"? Öllu "
"eftirfarandi verður eytt:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Já ég er viss."
@@ -724,21 +756,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -941,6 +973,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "beina frá"
@@ -1017,15 +1057,15 @@ msgstr "flöt síða"
msgid "flat pages"
msgstr "flatar síður"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 791fbc69afd245bbd2c9bcd077663ec08c39132c..493a83177bfdfc607275a9f30a09a72b29637a72 100644
GIT binary patch
delta 25
hcmey`!1%R+al;jLE+bt769q#PD^s)0_td9L004i92=)K~
delta 25
hcmey`!1%R+al;jLE<;@-3k5?%D`UgW_td9L004h|2=M>_
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index a14316be4e..505bfdba26 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-11-28 11:31+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
msgstr "indirizzo e-mail"
@@ -397,170 +397,210 @@ msgstr ""
msgid "Select %s to change"
msgstr "Clicca per cambiare"
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, fuzzy, python-format
msgid "Add %s"
msgstr "Aggiungi"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Cambia"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, fuzzy, python-format
msgid "Change %s"
msgstr "Cambia"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Cambia la password"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
msgstr "data azione"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
msgstr "Data/ora"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
msgstr "Indirizzo e-mail:"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
msgstr "Dicembre"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
msgstr "Inserire un numero."
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Cambia la password"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Esci"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -571,7 +611,7 @@ msgid "Home"
msgstr "Pagina iniziale"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Storia"
@@ -638,7 +678,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Aggiungi"
@@ -662,7 +702,7 @@ msgstr "Azioni Proprie"
msgid "None available"
msgstr "Nessuna disponibile"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Aggiungi"
@@ -683,15 +723,7 @@ msgstr "Hai dimenticato la tua password?"
msgid "Welcome,"
msgstr "Benvenuto,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambia la password"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Esci"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, fuzzy, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -702,7 +734,7 @@ msgstr ""
"degli oggetti relazionati, ma il tuo account non ha i permessi per rimuovere "
"i seguenti tipi di oggetti:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -711,7 +743,7 @@ msgstr ""
"Sei sicuro di voler rimuovere %(object_name)s \"%(object)s\"? I seguenti "
"oggetti relazionati saranno rimossi:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "S, sono sicuro"
@@ -724,21 +756,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -939,6 +971,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "redirigi da"
@@ -1017,15 +1057,15 @@ msgstr "pagina statica"
msgid "flat pages"
msgstr "pagine statiche"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 939d8fd3764c3a71e521677d2db0158fcb58ef88..a7143d85d23d01619cfc20e7c7d3aaccc994e0d3 100644
GIT binary patch
delta 25
gcmeyioAKLj#tk`ETt>PECJKfoR;Ff~%d8rd0fK-CxBvhE
delta 25
gcmeyioAKLj#tk`ET!y+v77B)jR>nq~%d8rd0fKr6v;Y7A
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index c771a292cf..c014f50e6c 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-11-28 11:32+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Espen Grndhaug \n"
"Language-Team: Norwegian\n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
msgid "IP address"
msgstr "IP adresse"
@@ -419,167 +419,207 @@ msgstr "Velg %s"
msgid "Select %s to change"
msgstr "Velg %s for å endre"
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" ble lagt inn i databasen."
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr "Du kan endre under"
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr "Du kan legge til en ny %s under."
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, python-format
msgid "Add %s"
msgstr "Ny %s"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr "La til %s"
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr "og"
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, python-format
msgid "Changed %s."
msgstr "Endret %s."
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr "Slettet %s."
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr "Ingen felt endret."
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" ble endret."
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, python-format
msgid "Change %s"
msgstr "Endre %s"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "En eller flere %(fieldname)s i %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "En eller flere %(fieldname)s i %(name)s:"
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" ble slettet."
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr "Er du sikker?"
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Endre historien: %s"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr "Heltall"
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
#, fuzzy
msgid "Boolean (Either True or False)"
msgstr "Boolean (Enten \"True\" eller \"False\")"
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Tekst (opp til %(maxlength)s tegn)"
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr "Heltall skilt med kommaer"
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
msgid "Date (without time)"
msgstr "Dato (uten tid)"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
msgid "Date (with time)"
msgstr "Dato/tid"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
msgid "E-mail address"
msgstr "Epost adresse"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr "Sti til fil"
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
msgid "Decimal number"
msgstr "Desimal tall"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
#, fuzzy
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (enten \"True\", \"False\" eller \"None\")"
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
msgid "Phone number"
msgstr "Telefonnummer"
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr "Tekst (opp til 50 tegn)"
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr "Tekst"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr "Tid"
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "Internettadresse"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr "Stat (i USA, to store bokstaver)"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr "XML tekst"
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Endre passord"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Log ut"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -590,7 +630,7 @@ msgid "Home"
msgstr "Hjem"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Historie"
@@ -656,7 +696,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Legg til"
@@ -680,7 +720,7 @@ msgstr "Mine handlinger"
msgid "None available"
msgstr "Ingen tilgjengelige"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, python-format
msgid "Add %(name)s"
msgstr "Legg til %(name)s"
@@ -701,15 +741,7 @@ msgstr "Har du glemt passordet ditt?"
msgid "Welcome,"
msgstr "Velkommen"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Endre passord"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Log ut"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -719,7 +751,7 @@ msgstr ""
"Vist du sletter %(object_name)s '%(object)s' vill du også slette relaterte "
"objekter, men du har ikke tillatelse til å slette de følgende objektene:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -728,7 +760,7 @@ msgstr ""
"Er du sikker på at du vill slette %(object_name) \"%(object)s\"? Alle de "
"følgende relaterte objektene vill bli slettet:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Ja, jeg er sikker"
@@ -741,21 +773,21 @@ msgstr "Av %(title)s "
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr "Vis på siden"
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr "Rekkefølge"
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr "Rekkefølge:"
@@ -960,6 +992,15 @@ msgstr "Endre dette objektet (åpnes i et nytt vindu)"
msgid "As above, but opens the admin page in a new window."
msgstr "Samme som over, men åpner administrasjonsiden i et nytt vindu."
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+#, fuzzy
+msgid "Time:"
+msgstr "Tid"
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "omadresser fra"
@@ -1040,15 +1081,15 @@ msgstr "flatside"
msgid "flat pages"
msgstr "flatsider"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr "j. M U"
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr "j. M U - h:i"
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr "h:i"
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 326de6d8f64039dd9463133c3b97350dafea8691..c828f6e5540f90bb597614353db2e7fb41834298 100644
GIT binary patch
delta 23
ecmX?Af2w}NA~h}}T>}#ZLlY}gv(0PN\n"
"Language-Team: Português do Brasil \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
msgstr "endereço de e-mail:"
@@ -397,170 +397,210 @@ msgstr ""
msgid "Select %s to change"
msgstr "Clique para alterar"
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, fuzzy, python-format
msgid "Add %s"
msgstr "Adicionar"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Modificar"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, fuzzy, python-format
msgid "Change %s"
msgstr "Modificar"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Alterar senha"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
msgstr "hora da ação"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
msgstr "Data/hora"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
msgstr "Endereço de e-mail:"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
msgstr "Dezembro"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
msgstr "Informe um número inteiro."
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Alterar senha"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Encerrar sessão"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -571,7 +611,7 @@ msgid "Home"
msgstr "Início"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Histórico"
@@ -638,7 +678,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Adicionar"
@@ -662,7 +702,7 @@ msgstr "Minhas Ações"
msgid "None available"
msgstr "Nenhuma disponível"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Adicionar"
@@ -683,15 +723,7 @@ msgstr "Você ?"
msgid "Welcome,"
msgstr "Bem vindo,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Alterar senha"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Encerrar sessão"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, fuzzy, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -702,7 +734,7 @@ msgstr ""
"objetos relacionados, mas sua conta não tem a permissão para remoção dos "
"seguintes tipos de objetos:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -711,7 +743,7 @@ msgstr ""
"Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os "
"seguintes itens relacionados serão removidos:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Sim, tenho certeza"
@@ -724,21 +756,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -938,6 +970,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "redirecionar de"
@@ -1016,15 +1056,15 @@ msgstr "página plana"
msgid "flat pages"
msgstr "páginas planas"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 78ec18dcb96b8f3c91d2c6a9fedc8b31b9d2e7b2..4c469c16c00b74ecb880e3d82ea3b96459b60ab2 100644
GIT binary patch
delta 25
gcmX@n%6Oucal\n"
"Language-Team: Romanian \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
msgstr "adresa email"
@@ -397,170 +397,210 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, fuzzy, python-format
msgid "Add %s"
msgstr "Adaugă"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Schimbă"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, fuzzy, python-format
msgid "Change %s"
msgstr "Schimbă"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Schimbă parola"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
msgstr "timp acţiune"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
msgstr "Dată/oră"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
msgstr "Adresa email:"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
msgstr "Decembrie"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
msgstr "Introduceţi un număr întreg."
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Schimbă parola"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Deautentificare"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -571,7 +611,7 @@ msgid "Home"
msgstr "Acasă"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Istoric"
@@ -637,7 +677,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Adaugă"
@@ -661,7 +701,7 @@ msgstr "Acţiunile Mele"
msgid "None available"
msgstr "Indisponibil"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Adaugă"
@@ -682,15 +722,7 @@ msgstr "Ai uitat parola?"
msgid "Welcome,"
msgstr "Bine ai venit,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Schimbă parola"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Deautentificare"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -701,7 +733,7 @@ msgstr ""
"obiectelor ce au legătură, dar contul tău nu are permisiunea de a şterge "
"următoarele tipuri de obiecte:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -710,7 +742,7 @@ msgstr ""
"Eşti sigur că vrei să ştergi %(object_name)s \"%(object)s\"?Următoarele "
"componente vor fi şterse:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Da, sînt sigur"
@@ -723,21 +755,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -937,6 +969,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "redirectat de la "
@@ -1018,15 +1058,15 @@ msgstr "pagina plată"
msgid "flat pages"
msgstr "pagini plate"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index f97e5e45bfda55b67625a449498a62d9171e4eae..57b23dc6c02fd56634ffd3df977befbe8a2eea60 100644
GIT binary patch
delta 25
hcmcb*gz@SU#tlWrTt>PECJKfoR;Ff~Ym9Ho0RVXm2$}!@
delta 25
hcmcb*gz@SU#tlWrT!y+v77B)jR>p>#Ym9Ho0RVXa2$cW;
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 79afe47d93..f7cce242f1 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-11-28 11:31+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: 2005-11-26 00:00\n"
"Last-Translator: Dmitry Sorokin \n"
"Language-Team: LANGUAGE \n"
@@ -75,7 +75,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
msgid "IP address"
msgstr "IP "
@@ -389,165 +389,205 @@ msgstr "
msgid "Select %s to change"
msgstr " %s "
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" ."
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr " "
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr " % ."
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, python-format
msgid "Add %s"
msgstr " %s"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr " %s"
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, python-format
msgid "Changed %s."
msgstr " %s."
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr " %s."
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, python-format
msgid "Change %s"
msgstr " %s"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr " %(fieldname)s %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr " %(fieldname)s %(name)s:"
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" ."
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr " ?"
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, python-format
msgid "Change history: %s"
msgstr " : %s"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr " (True False)"
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr " ( %(maxlength)s )"
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ", "
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
msgid "Date (without time)"
msgstr " ( )"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
msgid "Date (with time)"
msgstr " ( )"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
msgid "E-mail address"
msgstr "E-mail "
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr " "
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
msgid "Decimal number"
msgstr " "
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr " (True, False None)"
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
msgid "Phone number"
msgstr " "
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr " ( 50 )"
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr " ( )"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr "XML "
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr " "
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr ""
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -558,7 +598,7 @@ msgid "Home"
msgstr ""
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr ""
@@ -624,7 +664,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr ""
@@ -648,7 +688,7 @@ msgstr "
msgid "None available"
msgstr ""
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, python-format
msgid "Add %(name)s"
msgstr " %(name)s"
@@ -669,15 +709,7 @@ msgstr "
msgid "Welcome,"
msgstr " ,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr " "
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr ""
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -688,7 +720,7 @@ msgstr ""
", "
" :"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -697,7 +729,7 @@ msgstr ""
" , %(object_name)s \"%(object)s\"? "
" :"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr ", "
@@ -710,21 +742,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ":"
@@ -922,6 +954,15 @@ msgstr "
msgid "As above, but opens the admin page in a new window."
msgstr " , "
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+#, fuzzy
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr " "
@@ -998,15 +1039,15 @@ msgstr "
msgid "flat pages"
msgstr " "
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr ""
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 279da47d5ab04b66deb779075529802d6f0cc035..3855b580ec371cdabaf5f3ebee70daf7d37fc172 100644
GIT binary patch
delta 7761
zcmYk=3w%%YAII_U*o|SfVeV$L3&VzOu48T+X0F4~+?jjs`B(gsh)5xql8E@1`=z8m
ziW1UgkretX`72E=iHuzSulMi!-Q&@D^!Yu%mvheddd``S75d!x&Bt>w)OUs9$n!C#
zI%WqM^F8Usl~ig>U`=CQB3}y2k$cJk6A~eBn6vof!Ttk$nSRL2VDLGtVa1K7>HNU4-0WR-o&yvHqv%rCi;@!
zhBRb$V+Gug0r)wVp?&i;2?l3=#5(B1u+)JV)P;#I-xNd1x5Z%0MkdRQz-c%MHL@$H
z1|Fa~>d#F>Fc>w1wNdRP^5aMQrVk0-a3Jc2<1h>#Lv>&gmd9nTd?TuZ@1idrK{a#?
z)j&S#x{Ij$UBS)x2R6sm(RN8rqenfvNe)zE~{}j{6pT+x1fOE^4hOp*HVA)J(2L&A=O27I&g%@DOsH#~dc1cg;>pMbjY7SzXN4{AjDsPiwm`m3l8Uq=n-
z9%|}+=&hDA4F}^u)Jz`0Oe|=|{IfhJh4-S&!%Dasb;3?$u;y=!$3`t|M{<$>%;WrY
z$9GUKF29zxzAkD>)3FbJj_f-V#i&>%(;N5T0uKo_*fQ0=0ehj=d@M34W-anoHfKf(A7Vbjb=u1=sU!ywuy~`J%X6`1coe17m>SzqIM?9u4i98C1Bgk_h-&CHtbr#{d*&*(M?Zd81=AU0a2{6G^S_Nm
z90kWQ2(LTup*C4y2is6EYV(Dmc5^hUV@ar)OLcZc?fxuO#|EJ8I~ujwr=hM}pnBRj
zOG)U0b*K}!p&Hna!Fb%2e}kIZ%c!X?bQZbt5*_Wx%A&VpsPj{uolw{HcKKZNsDaTW
z{BWkLn2kDdA*w^mU49*^V{f54ydQn>V^@FDc?NaeMbyj`pgMHJ`8R52eAAi#P!gf(
zw!vs;g0s1^y)(<%&pFgN4%NVP)QxAOICC@+_z49X(JA!y
z9CgD2)Cm7XU08%V?*W#_pbXn!byR&l)OCrd2AZSJ?|`j*_-dm5x?a-B&g4W-7yI3w
zg>^Xb6zYZX7wS3hn#pSxH(^c8M~$Qqhof&-yURzT8lH##xCFI?D^ML>hXJ??wdDIz
zZ$i%r655rwQ5Obf*}rB(QB(OW^71n)P&1K_I`0ft!3$U#Z=o903qB4?qZ(*}svm}$
zp$VvtPDPg9W1b`tM8ONFo~^;haVzQt6Vu(^I30DP9;nA~AeO}msPmpcjc^SH<3=ol
zdr{{fM%AB2&B%ES)$@OiggWp5HNw(8Y!8D`GgH~+>!WUzj5{#{Sw?dkwIpdh?T!1Q
zI+ll(aXRXSv;<>t8;0Ol7)tx*3JI-!5k_K-UiQQ^)RgAo7@UmS0~atF?_xuY=xx6h
z-BI=PQ4MawSp3MaA;re+M21TnVpZ?Gs|55Wz_vP^=1CGDRxkxwRzil5cMrMikg9YPJcdi
z%9ls&g{r8hBpO3;HcrB&SP4r|sSZ`aiWrZ&zAb8CnK{hA8t&l=axj&AE5TzL^{
zB==F9suZ8X2&{z4H^ngQfI2S+pT`lXrM-b|FnoahEcZhVe5Hqkdh#l&Bd=pPzJ*os
zh|7P6nzEayDZh_uIB1~#I8{cCxH{^q*94nk4^)R1qVB%})!tgv{X837!B$tW3)R4T
zSPze*_QnlN!f2*N4GlomPe$G7Rp%zGLVgFT;S;FMcm~zs8>mhC5ZMzRQ#04DT{LQK
znmOBHIr3dmYd8>jC721QH{U_z0WcAR>>r&|QBThcxCZy&bJ%ULF%9q>Y6${{*n9>q
z(epo@#6l{3huX(%3AQC)gxXXscoZTq3$?}*Q5}66wW}99mpfm~L)RN3a-DoM6$4$t7H2bhB29L1y^-xboYn+Uo
zk$0OpfLfBEk@me2j^2O&r;|{FIj9Z{LET_1`r>p<#>Y`>z6+UMa{;wCT8!cvoPf%I
z;q=L~k6jXGQr-pY<4TOikMfxR8YF(9ARPln+rMVJVQuo8QS~QqCH{o$Lo;iPU7~Z?
zj(oMTY*ZYC+I%tN?2M#g2l4|k3)iDMP>9-$)y6abY(x_`-u^i~4>eW!sNG&`f_)Wd
zV|(&XU?zTmnyH|PcK26A%~VZi6#A2o!$?fPlGqCau`g3aAN&@B_57cAClt67
zicmfDnQBKIgqo2M48rOdhH+Q{TcPTEy8I)^jm>1#49&q1T;l52qh|CSZ$0b(nX5R5
zdaMea53v#X^3&|o(GE3|E~pOXpc)#6YG?}TBjZ6W)e2NYYfv5BgX+j3R6F@tPS5`j
zBy^+SQA_X;)qwAGYdO@&E2Gx14hCR6s-Y&R4m8J5OhajL<=&riOYocd~ZTWeNL!Glp=nyMc&^)?}fHNvsC#XbxH=f`W~e3
z5{<}LbY)+W*9^Q&=*aT8iZ{r_6GsVczjVr9!S;lXRCk_U!1syQ2|ZYv=2rPY;ULpo@Z380L)%lQ)B+>}aZ>~^Vsv}X0!mX(Fd5rj!2&Swop(6#W5}j<;Y;lVB
zhym19B03T}z9#gU+M|p+PC4u8P0*Iio5eNQjtf_zUMI!JNO!aI6nszgBFa<7Bjf!C
zmiCOEspkl7)MoDd>dsWkY7^RH4Jo^ZUlN77stE-f$mkeP{OV2Fe~v6B{R7dJbN1nN
zB8hYlq9?JGd>5iA=_j%HxJaTVWtl`{(jO9ky2`y+izr8(x7Ty<8zPL*(T12pl;DIB
zD!_0;UwwTCFA?jBKZwDUe}v14rbKD-I<{HNUwDPsMTEPu`Z&;?r&;sTZ*+
zsQE8J;t4`WKPrb1b!^uAJC)zzEb_t{LeU2)!jk$)CUw
zjKrJ7+nWEe#7JT&6}iMCq>GP;;sh=vVyOQKhY%5@2jC*&Afcl?F^^bB)S!MlP9~ZV
z#fKl|I=h>pzP`G=<%Wk4f(*bUa1WAkGjv)(|s^1Ilo;<@`SGW;@Bpkxs`4#9`tj
zv4cpUyfX1L=|jXn4*pM|%XP)(F3tDH`xo8>e8!a}bAt<{Hxso<7a#3Ok09cSPQ;^B
z{F_K5t;64`50{R{?JIs@Z~(?o4oWCww)fk+C~8QZ(n%4G
Xl3FCE#3we|dn@Bh|Gj6sO^W+J9g|HD
delta 7842
zcmYk>34Bh+8prWLHi?KNB9@4dNJ1op*h1_QOT-e=ScBNo#FnUCU!|qGxZ0wMDyph>
z(yG=~ON%PkQnhzMucDTyrM>Ew`}^li?x*L|=l#wz=e#p>X6BqXZSUPKb?{Cp*N*{i
ziwwu8QpSYf03TznQC?n2wZ=3HHD)1sb1YAOtcEci@dpgY@GxU~V+wZ1<=6;sq1p?p
zX-p6%;ZRJ+%D4kPjB%Oc6v|L>#;GtDuq^pyTYuB$MOcmcN9ct?wTyAcP<##}&=;4Y
z2Cxp@@Oz{qa~Uh*b@ar)upIpxcW#55GXWTZ@u&f0puRZR<|8qHe7yBV^do;8nKbhu
zPQXIc9Y)ibI%mSOKTGp>5MD}HHAr76}zIQd;~J6W
z+WIfCI{8&(R!x~G=guQBlROSJBXf~U%u0;LLs87X*6J=5Y9NBzU~GrXqUnbX@Oi9@
zTTlbOfNJP2#$#|D28*3B8yBHwe|_hRWl-;&
zO2{ObSS*iyQByVwb?5o0rI=*%nWzE0glhP8jKpO~A7(#lkNt*fzcw36^)1mu{pV6p
zgZZcqr=cIdf_e&;+WJqh3i(&40sV+RcpY_T4{ZJvH4q
z{!K$(lTZccU?R@KeHeiq7(PXlgBtmAoQ+3tE_P3FcKuoGNZx{V(v7@;T8ahej~}6K
zbQfyIzCxEOj#ALno<_YQFQD$U2z7^L*#NrZAPmGBsK==hYA@v3^ZBTTr=#8*FQR5(
zB?jOo)WG&)8Xj-L{Od$$Q>Wp0)Mn|3dX7`EC2mDEd>i$n@(^`L0gOV|N1)Efpa$Fs
zbwjODQ{Mr#l(R7lSD~b+Ih|kkSenXQ}8>~Qiil~_JS*tf~KlIYAq8`Q<;dh
zupR0-AC9We!M->iqwomU!276n0(lFmgUYCZ*0Oml#*jBf^^=VZ)MaugXp_8yBXKRV
zyrz6RrU{c#4Q@hh)=yCl?6vtp)Bum89=lVhjxJ+$^lk4fMGW$f>BI-CVP3;XJ^x=*
zs7gffkZ@p?628zA9>JBT+LGZ*5`gJ7OgDJ+OFSwtlAdRn+$uqe~5~
zq@WHqpgZnD)$c=Hcoa3DGd9118rUt=fFGk9dL=v8`&xrh->Zq5nOM|-8e3Z>Gyj^J
z6e{!{=!5ETlr`Tv-8#p*z`E4B#=05R!A?}W`%nWoZqHxDAo8o|j*pX>f8A-R6la9x
zP%#Q0-4gT|XCFmf}|vf5MZlPR>+r
z>*D-w@5Kl%tk~6gVKhfQ=l{SucpXDAAl12(c+4hG!4TYl>iBE)z>}yMJ%<|T74*dW
zs3mtjrl41$Pd8^*CZfKWh7+(4`rhhZ;a@)Bt*+?sO1pO0!YVZJy0%qB@?3TW}e6!md4?
zrCEp-$k(F=whJrcVbqK13P#dDJvj|Up$5<#wFgqM7LLbAT!@<5U6_LhPN*P`?@Pqt0JIb@&LQFu1pKzBRhyshCJXKR)X)2KQh?yon<*l%KAlI0rQ&H&8Qj
z2i4IZs40%iaPG7fjv`M*fBXak@DOTdFQE3=FB#0gDsEGu1|Oj|M`?b_w02(B3aH@&=DQD{YB1M1FyMGfRG
zY9J3W82`em7}Vd%8=z*a6KZqyL=7Yh^&^#sy5n)E_rhFkhHFp*`T^Cx>jnjN_#3Lh
z-);WX=5E}!I`GB1SPiu|k}(0NpgP)Y&mTawbJzL^tB{u-=yV){+Kkc2fL$h;f_7;-
zYE$H+)@}-FXF$6zHEy-C_LswBRnn%d~G~UCUy^@VO
z|2*pHcoWCtyU5GX_zh?NwHdM~#9=OKYL}uq+=v>$$EXIrKsP*$jqw=PMYj>WC9ytg
zZ_LNRxX_?3#<7(B|^97&i=-XD2%&1$TPf7HPf*(o<~hp
z_-JRh7hoj$I&6=}QFjtJ#+j)s^diqe%~Za15_*tN$67cW%ivlU1$|*XYHbQJ3Tuyb
zF6@Tha>^EQKMc
zf#g~zpzdG>`r|Cr=39uGfo-TIJBMBH38rA@eCPZds2A2wjKfnHfTatZfdwJ`xlA~P
zQkoJYPy_UM
zj)4rL;7>svg=2Y4KsD4JwFK#?4l=DnQFoq)TEoex0l82e%|#91b<~tEed~NsHJ65Z
zmKu50df!@VqEqi@t&SQ&3~H`g*!pg$P0$}TvdO5PW}rs!3hEBtM16mit=~40h1P!m
zj0$~mH&(~}sORAlYG7q1Ik)7G70D~3Zao&&a8uM~iO~l~Ylr`To}#3wyhYR@Jh<*A
zj@64^#~Om4Qu96G&dJKQq3_5`j)By966>k>fndFg2d@F?=t8_fJWG5;{QX!<@+qNT
zoZ7U(-YPy~ZU4pZNllfeN5|U^CX$PvA#@D3?x9?oa%0pi9UycJBT5sEIoFKXOIgQ1
zi9zM{|hjM9I;T!b6)h!YM>&uGg`d
zctl(#GKf6l0?~x?6^WN9r(##4D?u>o$G3p4U+zsC=
z&W!oeD!wK<+Wa`)Aodgchz|%IS%m&ISI2*ecAE5XD(;a~#R^0i{rDC$QL
zB}WW}cZe3Yt{whHzK)0{77%|Dm5CliDCckEQep`4JmDO6{_BzjanT6;H&N3$Tl~kl
z-eet!RH8f4gX{E?($SN0$JiI{Eb4gq75`6yLTqoZEl*iTFmb)O#M_c{uiA1IOd_}U&wojvq78AD
zc#ep$4f$daxsH6|4w0k89|>nQ}vW{cOrJiLJy>L2T(b)Ge=4`(`^3w{Ys42s$A><4$6zJx8(lFV%q@s@7~0s~YgA6bgt7Tk5(|^Ub0fUt!x}VCOlT6@pmE{$loKA_
SI{Rf|e$Md3!f9!fqW=fb1YD~C
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 29d60f5d96..28f9c8db5b 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-01 09:46-0500\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: 2005-11-10 23:22-0500\n"
"Last-Translator: Vladimir Labath \n"
"Language-Team: Slovak \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 ""
@@ -572,6 +489,7 @@ msgid "Are you sure?"
msgstr "Ste si istý?"
#: contrib/admin/views/main.py:662
+#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Zmena histórie:"
@@ -638,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)"
@@ -648,9 +570,9 @@ msgstr "XML text"
#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_list.html:4
-#: contrib/admin/templates/admin/change_form.html:8
#: 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 +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:8
#: 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 +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:11
+#: 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
@@ -697,7 +619,7 @@ msgid "Home"
msgstr "Začiatok"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "História"
@@ -725,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"
@@ -755,20 +675,17 @@ msgstr ""
"Vznikla chyba. Prostredníctvom e-mailu bol o nej informovaný správca a "
"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť."
-#: contrib/admin/templates/admin/search_form.html:7
-msgid "Go"
-msgstr "Choď"
+#: 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:4
-msgid "Django site admin"
-msgstr "Django web admin"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administrácia Django"
+#: contrib/admin/templates/admin/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:13
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Pridaj"
@@ -792,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:"
@@ -813,24 +726,6 @@ msgstr "Heslo:"
msgid "Have you forgotten your password?"
msgstr "Zabudli ste vaše heslo?"
-#: contrib/admin/templates/admin/change_form.html:19
-msgid "View on site"
-msgstr "Pozri na webe"
-
-#: contrib/admin/templates/admin/change_form.html:27
-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:44
-msgid "Ordering"
-msgstr "Určenie"
-
-#: contrib/admin/templates/admin/change_form.html:47
-msgid "Order:"
-msgstr "Poradie:"
-
#: contrib/admin/templates/admin/base.html:23
msgid "Welcome,"
msgstr "Vítajte,"
@@ -859,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ť"
@@ -1067,15 +989,103 @@ 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."
-#: utils/translation.py:335
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+#, fuzzy
+msgid "Time:"
+msgstr "Čas"
+
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "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 "DATUM_FORMAT"
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr "DATUMCAS_FORMAT"
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr "CAS_FORMAT"
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 2485f5f46ecee6d7d629205d22fb3cc1e0a075ae..1ee157b9fbeaf1a4086dfd1f319b8eb300814ab4 100644
GIT binary patch
delta 25
hcmX@|lJUq(#tlo{xr}rTOcV@FtV~TeuX7jE1ptO@2-yGt
delta 25
hcmX@|lJUq(#tlo{xeRrUEEEh4t&9yfuX7jE1ptO-2-N@p
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 51311b12ba..b66678222f 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-11-28 11:31+0100\n"
+"POT-Creation-Date: 2005-12-04 14:55+0100\n"
"PO-Revision-Date: 2005-11-26 17:10+0100\n"
"Last-Translator: Nebojša Đorđević \n"
"Language-Team: Nesh & Petar zaboravili Vašu lozinku?
?"
msgid "Welcome,"
msgstr "Dobrodošli,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Izmeni lozinku"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odjavi se"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -715,7 +747,7 @@ msgstr ""
"Brisanjem %(object_name)s '%(object)s' došlo bi do brisanja dodatnih "
"podataka, ali nemate prava da brišete sledeće tipove podataka:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -724,7 +756,7 @@ msgstr ""
"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
"obrisani i sledeći pridruženi objekti:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Da, siguran sam"
@@ -737,22 +769,22 @@ msgstr "Po %(title)s "
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr "Pogledaj na sajtu"
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr "Redosled"
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr "Red:"
@@ -961,6 +993,15 @@ 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 ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+#, fuzzy
+msgid "Time:"
+msgstr "Vreme"
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "redirekcija od"
@@ -1042,15 +1083,15 @@ msgstr "statična strana"
msgid "flat pages"
msgstr "statične strane"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr "D, d.m.Y."
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr "d.m.Y. H:i:s"
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr "H:i:s"
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index a763ad36e0281c24f588310391cc64218d85a5b6..6de47ace1096b56dd062f3d1c5e6672a8209c3f0 100644
GIT binary patch
delta 25
gcmcc6$#|iYal=ndE+bt769q#PD^s)0%vxuq0D2k-MF0Q*
delta 25
gcmcc6$#|iYal=ndE<;@-3k5?%D`TV0%vxuq0D2S%K>z>%
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po
index 9255281e17..92e771f02d 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-28 11:32+0100\n"
+"POT-Creation-Date: 2005-12-04 14:56+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
#, fuzzy
msgid "IP address"
msgstr "e-postadress"
@@ -397,170 +397,210 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, fuzzy, python-format
msgid "Add %s"
msgstr "Lägg till"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Ändra"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, fuzzy, python-format
msgid "Change %s"
msgstr "Ändra"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Ändra lösenord"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "Date (without time)"
msgstr "tid för händelse"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
#, fuzzy
msgid "Date (with time)"
msgstr "Datum/tid"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "E-mail address"
msgstr "E-postadress:"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
#, fuzzy
msgid "Decimal number"
msgstr "december"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
#, fuzzy
msgid "Phone number"
msgstr "Fyll i ett heltal."
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr ""
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Ändra lösenord"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Logga ut"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -571,7 +611,7 @@ msgid "Home"
msgstr "Hem"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "Historik"
@@ -637,7 +677,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "Lägg till"
@@ -661,7 +701,7 @@ msgstr "Mina händelser"
msgid "None available"
msgstr "Inga tillgängliga"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Lägg till"
@@ -682,15 +722,7 @@ msgstr "Har du glömt ditt lösenord?"
msgid "Welcome,"
msgstr "Välkommen,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Ändra lösenord"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Logga ut"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -701,7 +733,7 @@ msgstr ""
"objekt togs bort, men ditt konto har inte rättigheter att ta bort följande "
"objekttyper:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -710,7 +742,7 @@ msgstr ""
"Är du säker på att du vill ta bort %(object_name)s \"%(object)s\"? Följande "
"besläktade föremål kommer att tas bort:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "Ja, jag är säker"
@@ -723,21 +755,21 @@ msgstr ""
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr ""
@@ -939,6 +971,14 @@ msgstr ""
msgid "As above, but opens the admin page in a new window."
msgstr ""
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr ""
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "vidarebefodra från"
@@ -1019,15 +1059,15 @@ msgstr "flatsida"
msgid "flat pages"
msgstr "flatsidor"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr "Y-m-d"
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr "Y-m-d, H:i"
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr "H:i:s"
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index d39050e06fbe18853f95d4a70c230ecbd700fc27..43782df6db6adba3796aedc0cb7d9a56277c7244 100644
GIT binary patch
delta 25
gcmZp;$JlU>aYKhYmyxc4iGrbtm8t3GN$z>-0CqzNRR910
delta 25
gcmZp;$JlU>aYKhYm!Ynag@U1>m9gRGN$z>-0CqhHQ2+n{
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index 074e5f8c5a..44885695af 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-11-28 11:31+0100\n"
+"POT-Creation-Date: 2005-12-04 14:55+0100\n"
"PO-Revision-Date: 2005-11-26 23:02+0800\n"
"Last-Translator: limodou \n"
"Language-Team: Simplified Chinese \n"
@@ -79,7 +79,7 @@ msgstr "日期/时间已提交"
msgid "is public"
msgstr "公开"
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
msgid "IP address"
msgstr "IP地址"
@@ -400,165 +400,205 @@ msgstr "选择 %s"
msgid "Select %s to change"
msgstr "选择 %s 来修改"
-#: contrib/admin/views/main.py:411
+#: contrib/admin/views/main.py:407
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" 添加成功。"
-#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
msgid "You may edit it again below."
msgstr "你可以在下面再次编辑它。"
-#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
#, python-format
msgid "You may add another %s below."
msgstr "你可以在下面增加另一个 %s 。"
-#: contrib/admin/views/main.py:441
+#: contrib/admin/views/main.py:437
#, python-format
msgid "Add %s"
msgstr "增加 %s"
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:453
#, python-format
msgid "Added %s."
msgstr "%s 已增加。"
-#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:457
msgid "and"
msgstr "和"
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:455
#, python-format
msgid "Changed %s."
msgstr "已修改 %s 。"
-#: contrib/admin/views/main.py:461
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Deleted %s."
msgstr "%s 已删除。"
-#: contrib/admin/views/main.py:464
+#: contrib/admin/views/main.py:460
msgid "No fields changed."
msgstr "没有字段被修改。"
-#: contrib/admin/views/main.py:489
+#: contrib/admin/views/main.py:485
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" 修改成功。"
-#: contrib/admin/views/main.py:498
+#: contrib/admin/views/main.py:494
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。"
-#: contrib/admin/views/main.py:536
+#: contrib/admin/views/main.py:532
#, python-format
msgid "Change %s"
msgstr "修改 %s"
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:610
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "一个或多个 %(fieldname)s 在 %(name)s 中: %(obj)s"
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:615
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "一个或多个 %(fieldname)s 在 %(name)s 中:"
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:644
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" 删除成功。"
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:647
msgid "Are you sure?"
msgstr "你确信吗?"
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:662
#, python-format
msgid "Change history: %s"
msgstr "修改历史: %s"
-#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
-#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
msgid "Integer"
msgstr "整数"
-#: contrib/admin/views/doc.py:243
+#: contrib/admin/views/doc.py:245
msgid "Boolean (Either True or False)"
msgstr "布尔(True或False)"
-#: contrib/admin/views/doc.py:244
+#: contrib/admin/views/doc.py:246
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "字符串(最长 %(maxlength)s)"
-#: contrib/admin/views/doc.py:245
+#: contrib/admin/views/doc.py:247
msgid "Comma-separated integers"
msgstr "逗号分隔的整数"
-#: contrib/admin/views/doc.py:246
+#: contrib/admin/views/doc.py:248
msgid "Date (without time)"
msgstr "日期(无时间)"
-#: contrib/admin/views/doc.py:247
+#: contrib/admin/views/doc.py:249
msgid "Date (with time)"
msgstr "日期(带时间)"
-#: contrib/admin/views/doc.py:248
+#: contrib/admin/views/doc.py:250
msgid "E-mail address"
msgstr "邮箱地址"
-#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
msgid "File path"
msgstr "文件路径"
-#: contrib/admin/views/doc.py:250
+#: contrib/admin/views/doc.py:252
msgid "Decimal number"
msgstr "小数"
-#: contrib/admin/views/doc.py:256
+#: contrib/admin/views/doc.py:258
msgid "Boolean (Either True, False or None)"
msgstr "布尔(True, False或None)"
-#: contrib/admin/views/doc.py:257
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr ""
+
+#: contrib/admin/views/doc.py:260
msgid "Phone number"
msgstr "电话号码"
-#: contrib/admin/views/doc.py:260
+#: contrib/admin/views/doc.py:263
msgid "String (up to 50)"
msgstr "整数(最长50)"
-#: contrib/admin/views/doc.py:262
+#: contrib/admin/views/doc.py:265
msgid "Text"
msgstr "文本"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:266
msgid "Time"
msgstr "时间"
-#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:268
msgid "U.S. state (two uppercase letters)"
msgstr "美国州名(两个大写字母)"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:269
msgid "XML text"
msgstr "XML文本"
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "修改口令"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: 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
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "注销"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/change_list.html:5
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:10
+#: 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
@@ -569,7 +609,7 @@ msgid "Home"
msgstr "首页"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_form.html:19
msgid "History"
msgstr "历史"
@@ -633,7 +673,7 @@ 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:12
+#: contrib/admin/templates/admin/change_form.html:14
msgid "Add"
msgstr "增加"
@@ -657,7 +697,7 @@ msgstr "我的动作"
msgid "None available"
msgstr "无可用的"
-#: contrib/admin/templates/admin/change_list.html:9
+#: contrib/admin/templates/admin/change_list.html:10
#, python-format
msgid "Add %(name)s"
msgstr "增加 %(name)s"
@@ -678,15 +718,7 @@ msgstr "忘记你的密码?"
msgid "Welcome,"
msgstr "欢迎,"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "修改口令"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "注销"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
@@ -696,7 +728,7 @@ msgstr ""
"删除 %(object_name)s '%(object)s' 会导致删除相关的对象,但你的帐号无权删除下"
"列类型的对象:"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/templates/admin/delete_confirmation.html:13
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
@@ -704,7 +736,7 @@ msgid ""
msgstr ""
"你确信相要删除 %(object_name)s \"%(object)s\"?所有相关的项目都将被删除:"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
+#: contrib/admin/templates/admin/delete_confirmation.html:17
msgid "Yes, I'm sure"
msgstr "是的,我确定"
@@ -717,20 +749,20 @@ msgstr " 由 %(title)s"
msgid "Go"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_form.html:20
msgid "View on site"
msgstr "在站点上查看"
-#: contrib/admin/templates/admin/change_form.html:26
+#: 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:43
+#: contrib/admin/templates/admin/change_form.html:45
msgid "Ordering"
msgstr "排序中"
-#: contrib/admin/templates/admin/change_form.html:46
+#: contrib/admin/templates/admin/change_form.html:48
msgid "Order:"
msgstr "排序:"
@@ -934,6 +966,15 @@ msgstr "编辑本对象(新窗口)"
msgid "As above, but opens the admin page in a new window."
msgstr "同上,但在新窗口中打开管理页面。"
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+#, fuzzy
+msgid "Time:"
+msgstr "时间"
+
#: contrib/redirects/models/redirects.py:7
msgid "redirect from"
msgstr "重定向自"
@@ -1006,15 +1047,15 @@ msgstr "简单页面"
msgid "flat pages"
msgstr "简单页面"
-#: utils/translation.py:335
+#: utils/translation.py:350
msgid "DATE_FORMAT"
msgstr "日期格式"
-#: utils/translation.py:336
+#: utils/translation.py:351
msgid "DATETIME_FORMAT"
msgstr "日期时间格式"
-#: utils/translation.py:337
+#: utils/translation.py:352
msgid "TIME_FORMAT"
msgstr "时间格式"