From 1d6a56dae26acdecd7410b5670b6d3b4701b3179 Mon Sep 17 00:00:00 2001
From: Georg Bauer <gb@hugo.westfalen.de>
Date: Thu, 2 Feb 2006 10:25:15 +0000
Subject: [PATCH] fixed #1287 - comment forms are now translateable and
 overrideable

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2230 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   | 125 ++--
 django/conf/locale/cs/LC_MESSAGES/django.mo   | Bin 31597 -> 31597 bytes
 django/conf/locale/cs/LC_MESSAGES/django.po   | 126 ++--
 django/conf/locale/cy/LC_MESSAGES/django.mo   | Bin 24115 -> 24115 bytes
 django/conf/locale/cy/LC_MESSAGES/django.po   | 126 ++--
 django/conf/locale/da/LC_MESSAGES/django.mo   | Bin 16880 -> 16880 bytes
 django/conf/locale/da/LC_MESSAGES/django.po   | 125 ++--
 django/conf/locale/de/LC_MESSAGES/django.mo   | Bin 31707 -> 32093 bytes
 django/conf/locale/de/LC_MESSAGES/django.po   | 121 ++--
 django/conf/locale/en/LC_MESSAGES/django.mo   | Bin 536 -> 536 bytes
 django/conf/locale/en/LC_MESSAGES/django.po   | 121 ++--
 django/conf/locale/es/LC_MESSAGES/django.mo   | Bin 30253 -> 30253 bytes
 django/conf/locale/es/LC_MESSAGES/django.po   | 126 ++--
 django/conf/locale/fr/LC_MESSAGES/django.mo   | Bin 28145 -> 28145 bytes
 django/conf/locale/fr/LC_MESSAGES/django.po   | 126 ++--
 django/conf/locale/gl/LC_MESSAGES/django.mo   | Bin 30067 -> 30067 bytes
 django/conf/locale/gl/LC_MESSAGES/django.po   | 125 ++--
 django/conf/locale/is/LC_MESSAGES/django.mo   | Bin 17726 -> 17726 bytes
 django/conf/locale/is/LC_MESSAGES/django.po   | 125 ++--
 django/conf/locale/it/LC_MESSAGES/django.mo   | Bin 16501 -> 16501 bytes
 django/conf/locale/it/LC_MESSAGES/django.po   | 125 ++--
 django/conf/locale/ja/LC_MESSAGES/django.mo   | Bin 32628 -> 32628 bytes
 django/conf/locale/ja/LC_MESSAGES/django.po   | 126 ++--
 django/conf/locale/nl/LC_MESSAGES/django.mo   | Bin 27934 -> 27934 bytes
 django/conf/locale/nl/LC_MESSAGES/django.po   | 126 ++--
 django/conf/locale/no/LC_MESSAGES/django.mo   | Bin 24054 -> 24054 bytes
 django/conf/locale/no/LC_MESSAGES/django.po   | 125 ++--
 .../conf/locale/pt_BR/LC_MESSAGES/django.mo   | Bin 30419 -> 29096 bytes
 .../conf/locale/pt_BR/LC_MESSAGES/django.po   | 557 ++++++++++++------
 django/conf/locale/ro/LC_MESSAGES/django.mo   | Bin 17096 -> 17096 bytes
 django/conf/locale/ro/LC_MESSAGES/django.po   | 125 ++--
 django/conf/locale/ru/LC_MESSAGES/django.mo   | Bin 22101 -> 22101 bytes
 django/conf/locale/ru/LC_MESSAGES/django.po   | 126 ++--
 django/conf/locale/sk/LC_MESSAGES/django.mo   | Bin 31297 -> 31297 bytes
 django/conf/locale/sk/LC_MESSAGES/django.po   | 130 ++--
 django/conf/locale/sr/LC_MESSAGES/django.mo   | Bin 30950 -> 30950 bytes
 django/conf/locale/sr/LC_MESSAGES/django.po   | 483 +++++++++------
 django/conf/locale/sv/LC_MESSAGES/django.mo   | Bin 30439 -> 30439 bytes
 django/conf/locale/sv/LC_MESSAGES/django.po   | 126 ++--
 .../conf/locale/zh_CN/LC_MESSAGES/django.mo   | Bin 29384 -> 29384 bytes
 .../conf/locale/zh_CN/LC_MESSAGES/django.po   | 126 ++--
 .../conf/locale/zh_TW/LC_MESSAGES/django.mo   | Bin 29399 -> 29399 bytes
 .../conf/locale/zh_TW/LC_MESSAGES/django.po   | 126 ++--
 .../comments/templates/comments/form.html     |  34 ++
 .../comments/templates/comments/freeform.html |  11 +
 .../contrib/comments/templatetags/comments.py |  60 +-
 47 files changed, 2464 insertions(+), 1188 deletions(-)
 create mode 100644 django/contrib/comments/templates/comments/form.html
 create mode 100644 django/contrib/comments/templates/comments/freeform.html

diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index 6964e7aee08496b8785c8a993cf4ce24bb313387..c9b6c5bf46057930f4d7a07831b9584c9b416489 100644
GIT binary patch
delta 25
hcmbPqiE+{;#ti~mTt>PEMhb?8Rz_x<rL=z70RU^t2hjik

delta 25
hcmbPqiE+{;#ti~mT!y-aMhZs8R)&U~rL=z70RU^i2hIQh

diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po
index 7c0396ae1e..3caf80817b 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: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: 2005-11-12 20:05+0530\n"
 "Last-Translator: Baishampayan Ghose <b.ghose@gnu.org.in>\n"
 "Language-Team: Ankur Bangla <core@bengalinux.org>\n"
@@ -278,6 +278,77 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "ব্যবহারকারীর নাম:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "পাসওয়ার্ড:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "আমার পাসওয়ার্ড পরিবর্তন করুন"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "মন্তব্য সক্রিয় করুন"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "মন্তব্য সক্রিয় করুন"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "ব্যবহারকারীর নাম"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -352,7 +423,7 @@ msgstr "কার্যবিবরণী এন্ট্রি"
 msgid "log entries"
 msgstr "কার্যবিবরণী এন্ট্রি সমুহ"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr ""
 
@@ -368,23 +439,23 @@ msgstr ""
 msgid "Log in"
 msgstr "প্রবেশ করুন"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -463,26 +534,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "পরিবর্তন"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "পাসওয়ার্ড পরিবর্তন করুন"
@@ -572,6 +643,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr ""
@@ -581,6 +653,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: 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,28 +667,10 @@ msgstr ""
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -722,14 +777,6 @@ msgstr "কিছুই পাওয়া যাচ্ছে না"
 msgid "Add %(name)s"
 msgstr "যোগ করুন"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "ব্যবহারকারীর নাম:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "পাসওয়ার্ড:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "আপনি কি <a href=\"/password_reset/\">আপনার পাসওয়ার্ড ভুলে গেছেন</a>?"
@@ -1770,7 +1817,7 @@ msgstr ""
 "\"%(attr)s\"বৈশিষ্ট্যয় লাইন %(line)s একটি অবৈধ মান আছে । (\"%(start)s\"এর সঙ্গে "
 "লাইন আরম্ভ।)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index f4188d83aca12e43550a2fc3e914d65baaeaee35..2dcdb0fabd309eb8e0175139a7a4d708f835bdc1 100644
GIT binary patch
delta 25
hcmaF+jq&X_#toM}xQuiSj1&wFt&B`J-}RVa1OSx_3LF3c

delta 25
hcmaF+jq&X_#toM}xD0g-jTDTGtqct}-}RVa1OSx=3K{?a

diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index d1b1f0f855..3d44f4c0f6 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Czech translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
 "PO-Revision-Date: 2005-12-18 18:36+0100\n"
 "Last-Translator: Radek Švarz <tranlate@svarz.cz>\n"
 "Language-Team: Czech\n"
@@ -295,6 +295,78 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Formulář komentáře neobsahoval buď 'preview' nebo 'post'"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Uživatelské jméno:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Heslo:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Změnit mé heslo"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "hodnocení #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Komentář"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "volný komentář"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "uživatelské jméno"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -369,7 +441,7 @@ msgstr "log záznam"
 msgid "log entries"
 msgstr "log záznamy"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Všechna data"
 
@@ -385,7 +457,7 @@ msgstr ""
 msgid "Log in"
 msgstr "Přihlášení"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -393,7 +465,7 @@ 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:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -401,11 +473,11 @@ 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:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Uživatelská jména nemohou obsahovat znak '@'."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -485,26 +557,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "%s: změnit"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, 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:649
 #, 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:652
 msgid "Are you sure?"
 msgstr "Jste si jist(á)?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Historie změn: %s"
@@ -589,6 +661,7 @@ msgstr "text XML"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentace"
@@ -598,6 +671,7 @@ msgstr "Dokumentace"
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -611,28 +685,10 @@ msgstr "Dokumentace"
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -739,14 +795,6 @@ msgstr "Nic"
 msgid "Add %(name)s"
 msgstr "%(name)s: přidat"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Uživatelské jméno:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Heslo:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">Zapomněl(a) jste své heslo?</a>"
@@ -1808,7 +1856,7 @@ msgstr ""
 "Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s "
 "\"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "%(object)s s tímto %(type)s již existují pro daná %(field)s."
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 9a36894291706b362f73f566166e3b4456a87cff..8044d67cb2d3d271c22111248e0800675140622b 100644
GIT binary patch
delta 25
hcmdnIhjH^B#tn(qTt>PEMhb?8Rz_x<v#n1k0RVN$2wwmI

delta 25
hcmdnIhjH^B#tn(qT!y-aMhZs8R)&U~v#n1k0RVNr2wVUF

diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index 2fee563fb7..4111e4aeea 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: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
 "Last-Translator: Jason Davies <jason@jasondavies.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -268,6 +268,78 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Enw defnyddiwr:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Cyfrinair:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Newidio fy nghyfrinair"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "cyfraddiad #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Sylw"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "Sylw rhydd"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "enw defnyddiwr"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -340,7 +412,7 @@ msgstr "cofnod"
 msgid "log entries"
 msgstr "cofnodion"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Dyddiadau i gyd"
 
@@ -356,23 +428,23 @@ msgstr ""
 msgid "Log in"
 msgstr "Mewngofnodi"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -450,26 +522,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "Newidio %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Ydych yn sicr?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Hanes newid: %s"
@@ -554,6 +626,7 @@ msgstr "Testun XML"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dogfennaeth"
@@ -563,6 +636,7 @@ msgstr "Dogfennaeth"
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -576,28 +650,10 @@ msgstr "Dogfennaeth"
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -704,14 +760,6 @@ msgstr "Dim ar gael"
 msgid "Add %(name)s"
 msgstr "Ychwanegu %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Enw defnyddiwr:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Cyfrinair:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Ydych wedi <a href=\"/password_reset/\">anghofio eich cyfrinair</a>?"
@@ -1753,7 +1801,7 @@ msgstr ""
 "Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell "
 "yn ddechrau â \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 9a103502f0eda475716fa97697908e86215521f1..8bdc7a3478400fe2aa7a5aa5484e1fef8fdbd4b1 100644
GIT binary patch
delta 25
gcmey+%=n?1af6R0myxc4k%FP2m66%zFwI#K0CQUh;Q#;t

delta 25
gcmey+%=n?1af6R0m!Ynqk%E!2m7&q*FwI#K0CQFc-v9sr

diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po
index d66428d67d..f59a99fbd9 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: 2006-01-12 23:12+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Morten Bagai <m@bagai.com>\n"
 "Language-Team: Danish\n"
@@ -278,6 +278,77 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Brugernavn:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Adgangskode:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Ændre adgangskode"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "tillad kommentarer"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "tillad kommentarer"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "brugernavn"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -352,7 +423,7 @@ msgstr "logmeddelelse"
 msgid "log entries"
 msgstr "logmeddelelser"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr ""
 
@@ -368,23 +439,23 @@ msgstr ""
 msgid "Log in"
 msgstr "Log ind"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -463,26 +534,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "Ændre"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Ændre adgangskode"
@@ -572,6 +643,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr ""
@@ -581,6 +653,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: 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,28 +667,10 @@ msgstr ""
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -722,14 +777,6 @@ msgstr "Ingen tilgængelige"
 msgid "Add %(name)s"
 msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Brugernavn:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Adgangskode:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Har du <a href=\"/password_reset/\">glemt din adgangskode</a>?"
@@ -1779,7 +1826,7 @@ msgstr ""
 "\"%(attr)s\" attributten på linje $(line)s har en ugyldig værdi. (Linjen "
 "starter med \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 9654bd087b29ef50c4740681af158816ad61cf6a..e9f84e3ec242f99e21e339a7d08bb2288460bea4 100644
GIT binary patch
delta 8398
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
J#-==v{{vto*{c8m

delta 8114
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

diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index 38b3f19345..f1acbf8853 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: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: 2005-10-08 00:03+0200\n"
 "Last-Translator: Georg Bauer <gb@bofh.ms>\n"
 "MIME-Version: 1.0\n"
@@ -288,6 +288,73 @@ msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Benutzername:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Passwort:"
+
+#: contrib/comments/templates/comments/form.html:6
+msgid "Forgotten your password?"
+msgstr "Kennwort vergessen?"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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 "Abmelden"
+
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr "Bewertungen"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "Erforderlich"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr "Optional"
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr "Ein Bild ver�ffentlichen"
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+msgid "Preview comment"
+msgstr "Kommentarvorschau"
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "Ihr Name:"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -362,7 +429,7 @@ msgstr "Logeintrag"
 msgid "log entries"
 msgstr "Logeintr�ge"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Alle Tage"
 
@@ -380,7 +447,7 @@ msgstr ""
 msgid "Log in"
 msgstr "Anmelden"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -388,7 +455,7 @@ msgstr ""
 "Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst: die "
 "Beitr�ge wurden gesichert."
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -396,11 +463,11 @@ msgstr ""
 "Es sieht danach aus, das der Browser keine Cookies akzeptiert. Bitte im "
 "Browser Cookies aktivieren und diese Seite neu laden."
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Benutzernamen k�nnen das Zeichen '@' nicht enthalten."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -482,26 +549,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "%s �ndern"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Ein oder mehrere %(fieldname)s in %(name)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gel�scht."
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Sicher? Ganz sicher?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "�nderungsgeschichte: %s"
@@ -586,6 +653,7 @@ msgstr "XML Text"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentation"
@@ -595,6 +663,7 @@ msgstr "Dokumentation"
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -608,28 +677,10 @@ msgstr "Dokumentation"
 msgid "Change password"
 msgstr "Passwort �ndern"
 
-#: 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 "Abmelden"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -738,14 +789,6 @@ msgstr "Keine vorhanden"
 msgid "Add %(name)s"
 msgstr "%(name)s zuf�gen"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Benutzername:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Passwort:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?"
@@ -1809,7 +1852,7 @@ msgstr ""
 "Das Attribut %(attr)s in Zeile %(line)s hat einen ung�ltigen Wert. Die Zeile "
 "beginnt mit \"%(start)s\"."
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index c76eea564b703121fc53e8e99c493056c7985c3e..8006017dbe2ca9c3b291ac401c99eb0c5ed7fd72 100644
GIT binary patch
delta 22
dcmbQiGJ|D<BqNuRu7Qz)p`n$L>11WbuK+!`1)Tr@

delta 22
dcmbQiGJ|D<BqNuhuAz~Fk+GGb;bdjTuK+!@1)Bf>

diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 05126d01c1..fde0cf39eb 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -263,6 +263,73 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:6
+msgid "Forgotten your password?"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+msgid "Preview comment"
+msgstr ""
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr ""
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -335,7 +402,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr ""
 
@@ -351,23 +418,23 @@ msgstr ""
 msgid "Log in"
 msgstr ""
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -445,26 +512,26 @@ msgstr ""
 msgid "Change %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr ""
@@ -549,6 +616,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr ""
@@ -558,6 +626,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -571,28 +640,10 @@ msgstr ""
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -695,14 +746,6 @@ msgstr ""
 msgid "Add %(name)s"
 msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr ""
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr ""
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr ""
@@ -1698,7 +1741,7 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 50f14bb72fe7868d8e85194b702a644d4571633a..b3412433cfd0ccd416f58289dcf67261547a7442 100644
GIT binary patch
delta 25
hcmZ4chH>p1#tnw<Tt>PEMhb?8Rz{|qt=&KA0RVbQ2%rD}

delta 25
hcmZ4chH>p1#tnw<T!y-aMhZs8R)&U~t=&KA0RVbL2%Z1{

diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index c14c2c367e..daf7f3a3f1 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
 "PO-Revision-Date: 2005-11-28 15:28+0000\n"
 "Last-Translator: Ricardo Javier Cardenes Medina <ricardo.cardenes@gmail."
 "com>\n"
@@ -289,6 +289,78 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "El formulario de comentario no proporcion� 'previsualizar' ni 'enviar'"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Usuario:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Clave:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Cambiar mi clave"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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 sesi�n"
+
+#: contrib/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "calificaci�n 1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Comentario"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "Comentario libre"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "nombre de usuario"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -363,7 +435,7 @@ msgstr "entrada de registro"
 msgid "log entries"
 msgstr "entradas de registro"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Todas las fechas"
 
@@ -379,7 +451,7 @@ msgstr ""
 msgid "Log in"
 msgstr "Identificarse"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -387,7 +459,7 @@ msgstr ""
 "Por favor, identif�quese de nuevo, porque su sesi�n ha caducado. No se "
 "preocupe: se ha guardado su env�o."
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -395,11 +467,11 @@ msgstr ""
 "Parece que su navegador no est� configurado para aceptar cookies. Act�velas "
 "por favor, recargue esta p�gina, e int�ntelo de nuevo."
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Los nombres de usuario no pueden contener el car�cter '@'."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -480,26 +552,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Uno o m�s %(fieldname)s en %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Uno o m�s %(fieldname)s en %(name)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, 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:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "�Est� seguro?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Modificar hist�rico: %s"
@@ -584,6 +656,7 @@ msgstr "Texto XML"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Documentaci�n"
@@ -593,6 +666,7 @@ msgstr "Documentaci
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 #: contrib/admin/templates/admin_doc/view_detail.html:4
 #: contrib/admin/templates/admin_doc/template_tag_index.html:5
@@ -606,28 +680,10 @@ msgstr "Documentaci
 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 sesi�n"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -735,14 +791,6 @@ msgstr "Ninguno disponible"
 msgid "Add %(name)s"
 msgstr "Agregar %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Usuario:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Clave:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "�Ha <a href=\"/password_reset/\">olvidado su clave</a>?"
@@ -1806,7 +1854,7 @@ msgstr ""
 "El atributo \"%(attr)s\" de la l�nea %(line)s tiene un valor que no es "
 "v�lido. (La l�nea empieza por \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, fuzzy, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "Ya existe %(optname)s con este %(fieldname)s."
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 8d5abb1377b8f1e97c725bd9f0ec7ff2ce8127fd..919c2f431e35ba4d65b23575aee6f0546cb6cf95 100644
GIT binary patch
delta 25
hcmex(oAKjq#tl*qTt>PEMhb?8Rz{|qRUFRh0sw&b2&4c2

delta 25
hcmex(oAKjq#tl*qT!y-aMhZs8R)&U~RUFRh0sw&W2%-Q0

diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 44ba7e9998..40dabd33a9 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
 "PO-Revision-Date: 2005-10-18 12:27+0200\n"
 "Last-Translator: Mika�l Barbero <mikael.barbero nospam at nospam free.fr>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
@@ -305,6 +305,78 @@ msgstr ""
 "Le formulaire de commentaire ne proposait ni les options de pr�visualisation "
 "ni d'envoi"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Nom d'utilisateur"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Mot de passe"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Modifier mon mot de passe"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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 "D�connection"
+
+#: contrib/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "vote n�1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Commentaire"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "Commentaire libre"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "nom d'utilisateur"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -381,7 +453,7 @@ msgstr "entr
 msgid "log entries"
 msgstr "entr�es d'historique"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Toutes les dates"
 
@@ -400,7 +472,7 @@ msgstr ""
 msgid "Log in"
 msgstr "Connectez-vous"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -408,7 +480,7 @@ msgstr ""
 "Votre session a expir�, connectez-vous de nouveau s'il vous pla�t. Ne vous "
 "inqui�tez pas, votre travail pr�c�dement �ffectu� a �t� sauv�."
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -416,11 +488,11 @@ msgstr ""
 "Il semblerait que votre navigateur n'accepte pas les cookies. Activez-les, "
 "rechargez cette page et r��ssayez s'il vous pla�t."
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Les noms d'utilisateur ne peuvent contenir le caract�re '@'"
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -502,26 +574,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "Changement %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Un ou plusieurs %(fieldname)s dans %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Un ou plusieurs %(fieldname)s dans %(name)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "L'objet %(name)s \"%(obj)s\" a �t� supprim� avec succ�s."
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "�tes-vous s�r ?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Historique des changements : %s"
@@ -611,6 +683,7 @@ msgstr "Texte XML"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Documentation"
@@ -620,6 +693,7 @@ msgstr "Documentation"
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -633,28 +707,10 @@ msgstr "Documentation"
 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 "D�connection"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -763,14 +819,6 @@ msgstr "Aucun(e) disponible"
 msgid "Add %(name)s"
 msgstr "Ajouter %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Nom d'utilisateur"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Mot de passe"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Avez vous <a href=\"/password_reset/\">perdu votre mot de passe</a>?"
@@ -1845,7 +1893,7 @@ msgstr ""
 "La valeur de l'attribut \"%(attr)s\" de la ligne %(line)s n'est pas valide. "
 "(Ligne d�butant par \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index d0f086af4732104984e0a39c6c6768ddce25daa8..fb0608efe0369eb87d7aae5662cbea60e6ea9fac 100644
GIT binary patch
delta 25
hcmezTit+O+#tk`cTt>PEMhb?8Rz{|q%iR9z0RW5L38w%6

delta 25
hcmezTit+O+#tk`cT!y-aMhZs8R)&U~%iR9z0RW5G38er4

diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index 70c7c916e3..66130ac462 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: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
 "PO-Revision-Date: 2005-12-20 10:48+0100\n"
 "Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n"
 "Language-Team: Galego\n"
@@ -284,6 +284,77 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "O formulario de comentario non proporciona 'preview' ou 'post'"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Usuario:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Cambiar o contrasinal"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Comentario"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "Comentario libre"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "nome de usuario"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -358,7 +429,7 @@ msgstr "entrada de rexistro"
 msgid "log entries"
 msgstr "entradas de rexistro"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Todas as datas"
 
@@ -374,7 +445,7 @@ msgstr ""
 msgid "Log in"
 msgstr "Entrar"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -382,7 +453,7 @@ 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:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -390,11 +461,11 @@ 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:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Os nomes de usuario non poden conter o carácter '@'."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -474,26 +545,26 @@ msgstr "Engadiuse correctamente o/a %(name)s \"%(obj)s\" Pode editalo embaixo."
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Un ou máis %(fieldname)s no/a %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Un ou máis %(fieldname)s no/a %(name)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Eliminouse correctamente o/a %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Está seguro?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Histórico de cambios: %s"
@@ -578,6 +649,7 @@ msgstr "Texto XML"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Documentación"
@@ -587,6 +659,7 @@ msgstr "Documentación"
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -600,28 +673,10 @@ msgstr "Documentación"
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -728,14 +783,6 @@ msgstr "Ningunha dispoñíbel"
 msgid "Add %(name)s"
 msgstr "Engadir %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Usuario:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Contrasinal:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">Esqueceu o contrasinal</a>?"
@@ -1785,7 +1832,7 @@ msgstr ""
 "O atributo \"%(attr)s\" na liña %(line)s contén un valor non válido. (A liña "
 "comeza con \"%(start)s\")."
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, fuzzy, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "Xa existe un/ha %(optname)s con este/a %(fieldname)s."
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 00754d1263db82d99cdffeca60c87eba35d1d3b1..b84d6605970ccef48cb0a9b2d1a45831f6f5fd35 100644
GIT binary patch
delta 25
gcmdnj#kjAFaYK(Lmyxc4k%FP2m66%zX__mf0dWTi8~^|S

delta 25
gcmdnj#kjAFaYK(Lm!Ynqk%E!2m7&q*X__mf0dWEd8UO$Q

diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index 18914d3b13..bc22c37cca 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: 2006-01-12 23:12+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: 2005-11-13 18:08-0000\n"
 "Last-Translator: Dagur Páll Ammendrup <dagurp@gmail.com>\n"
 "Language-Team:  <dagurp@gmail.com>\n"
@@ -280,6 +280,77 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Notandanafn:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Lykilorð:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Breyta lykilorðinu mínu"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "virkja athugasemdir"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "virkja athugasemdir"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "notandanafn"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -354,7 +425,7 @@ msgstr "kladdafærsla"
 msgid "log entries"
 msgstr "kladdafærslur"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr ""
 
@@ -370,23 +441,23 @@ msgstr ""
 msgid "Log in"
 msgstr "Skrá inn"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -465,26 +536,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "Breyta"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Breyta lykilorði"
@@ -574,6 +645,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr ""
@@ -583,6 +655,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 #: contrib/admin/templates/admin_doc/view_detail.html:4
 #: contrib/admin/templates/admin_doc/template_tag_index.html:5
@@ -596,28 +669,10 @@ msgstr ""
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -724,14 +779,6 @@ msgstr "Engin fáanleg"
 msgid "Add %(name)s"
 msgstr "Bæta við"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Notandanafn:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Lykilorð:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">Gleymdir þú lykilorðinu</a> þínu?"
@@ -1776,7 +1823,7 @@ msgstr ""
 "\"%(attr)s\" eigindið á línu %(line)s hefur ótækt gildi (línan hefst á \"%"
 "(start)s\")."
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index e023fd2d48b44305d8422ade273d42ddaf09e5bd..7d8563ec3093291264fdadd51286d1a81a0586c3 100644
GIT binary patch
delta 25
hcmey`!1%R+al;jLE+bt7BLzc4D<iYb_td9L004hM2<`v?

delta 25
hcmey`!1%R+al;jLE<;^IBLyR4D?`K0_td9L004hB2<rd<

diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 1307d39a13..93b40e2da5 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: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -278,6 +278,77 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Password:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Cambia la mia password"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "abilita commenti"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "abilita commenti"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "nome utente"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -352,7 +423,7 @@ msgstr "voce di log"
 msgid "log entries"
 msgstr "voci di log"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr ""
 
@@ -368,23 +439,23 @@ msgstr ""
 msgid "Log in"
 msgstr "Accedi"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -463,26 +534,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "Cambia"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Cambia la password"
@@ -572,6 +643,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr ""
@@ -581,6 +653,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: 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,28 +667,10 @@ msgstr ""
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -723,14 +778,6 @@ msgstr "Nessuna disponibile"
 msgid "Add %(name)s"
 msgstr "Aggiungi"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Nome utente:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Password:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Hai <a href=\"/password_reset/\">dimenticato la tua password</a>?"
@@ -1778,7 +1825,7 @@ msgstr ""
 "L'attributo \"%(attr)s\" alla linea %(line)s ha un valore non valido. (La "
 "linea comincia con \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo
index bd24eec980dfd11bddcca820e8dbca7e98d94daa..a84d2ae69b403277c271f112fc1df2bf799f5e7b 100644
GIT binary patch
delta 25
hcmezJkMYYt#trM;xr}rTj1&wFt&Gez?{wd74gi$#3LyXh

delta 25
hcmezJkMYYt#trM;xeRp;jTH<{txSzK?{wd74gi%R3MK#m

diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po
index 39777d22dd..6d16aad848 100644
--- a/django/conf/locale/ja/LC_MESSAGES/django.po
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-13 15:53+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -282,6 +282,78 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "コメントフォームに「プレビュー」「投稿」のどちらも指示がありません。"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "ユーザ名"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "パスワード"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "パスワードの変更"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "レーティング #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "コメント"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "自由コメント"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "ユーザ名"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -356,7 +428,7 @@ msgstr "ログ"
 msgid "log entries"
 msgstr "ログ"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "全ての日:"
 
@@ -372,7 +444,7 @@ msgstr ""
 msgid "Log in"
 msgstr "ログイン"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -380,7 +452,7 @@ msgstr ""
 "再ログインしてください。ログインセッションが有効期間切れしてしまいました。入"
 "力データは失われておりませんのでご安心ください。"
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -388,11 +460,11 @@ msgstr ""
 "ブラウザがクッキーの設定を許可していないようです。クッキーの設定を許可して、"
 "もう一度このページを表示してください。"
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "ユーザ名は'@'を含むことが出来ません。"
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "メールアドレスはユーザ名ではありません。'%s'を試してみてください。"
@@ -470,26 +542,26 @@ msgstr "%(name)s \"%(obj)s\" が追加されました。この下で編集が可
 msgid "Change %s"
 msgstr "%s を変更"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "%(name)sに%(fieldname)s が一つ以上あります: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "%(name)sに%(fieldname)s が一つ以上あります:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, 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:652
 msgid "Are you sure?"
 msgstr "よろしいですか？ "
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "変更履歴: %s"
@@ -574,6 +646,7 @@ msgstr "XMLテキスト"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "文書"
@@ -583,6 +656,7 @@ msgstr "文書"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 #: contrib/admin/templates/admin_doc/view_detail.html:4
 #: contrib/admin/templates/admin_doc/template_tag_index.html:5
@@ -596,28 +670,10 @@ msgstr "文書"
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -724,14 +780,6 @@ msgstr "利用不可"
 msgid "Add %(name)s"
 msgstr "%(name)s を追加"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "ユーザ名"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "パスワード"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">パスワードを忘れましたか</a>？"
@@ -1762,7 +1810,7 @@ msgstr ""
 "%(line)s 行目の \"%(attr)s\" 亜鶏ビューは無効です。（ \"%(start)s\" で始まる"
 "行 ）"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo
index 634d3c49d7591f71da78ee9627d76b087e0c03be..364fedca92a6a8f72b6ac1390ad666d327200bdc 100644
GIT binary patch
delta 25
hcmbPti*ep9#tr_?Tt>PEMhb?8Rz_x<Bb|?G0swYN2w?yK

delta 25
hcmbPti*ep9#tr_?T!y-aMhZs8R)$8KBb|?G0swYI2wwmI

diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po
index 024ac606e9..9f9e6c4935 100644
--- a/django/conf/locale/nl/LC_MESSAGES/django.po
+++ b/django/conf/locale/nl/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:12+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Johan C. Stöver <johan@nilling.nl>\n"
 "Language-Team: \n"
@@ -288,6 +288,78 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Het opmerkingenformulier heeft geen 'voorbeeld' of 'post'"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Gebruikersnaam:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Wijzig mijn wachtwoord"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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 "Afmelden"
+
+#: contrib/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "waardering #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Opmerking"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "Opmerking"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "gebruikernaam"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -363,7 +435,7 @@ msgstr "log ingave"
 msgid "log entries"
 msgstr "log ingaves"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 #, fuzzy
 msgid "All dates"
 msgstr "Elke datum"
@@ -382,7 +454,7 @@ msgstr ""
 msgid "Log in"
 msgstr "Aanmelden"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -390,7 +462,7 @@ msgstr ""
 "Uw sessie is verlopen, meldt u opnieuw aan. Maakt u geen zorgen: Uw bijdrage "
 "is opgeslagen."
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -398,11 +470,11 @@ msgstr ""
 "Lijkt erop dat uw browser geen cookies accepteerd. Accepteer cookies, en "
 "laad deze pagina nogmaals en probeer het opnieuw"
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Gebruikersnamen mogen geen '@' bevatten."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Uw e-mail adres is niet uw gebruikersnaam. Probeer '%s' eens."
@@ -481,26 +553,26 @@ msgstr "De %(name)s \"%(obj)s\" toegevoegd. U mag het hieronder wijzigen."
 msgid "Change %s"
 msgstr "Wijzigen"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Een of meer %(fieldname)s in %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Een of meer %(fieldname)s in %(name)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Verwijdering %(name)s \"%(obj)s\" is geslaagd."
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Weet u het zeker?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Wachtwoord wijzigen"
@@ -585,6 +657,7 @@ msgstr "XML Tekst"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Documentatie"
@@ -594,6 +667,7 @@ msgstr "Documentatie"
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -607,28 +681,10 @@ msgstr "Documentatie"
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
-#: 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 "Afmelden"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -734,14 +790,6 @@ msgstr "Geen beschikbaar"
 msgid "Add %(name)s"
 msgstr "%(name)s toevoegen"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Gebruikersnaam:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Wachtwoord:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Wachtwoord <a href=\"password_reset/\">vergeten</a>?"
@@ -1801,7 +1849,7 @@ msgstr ""
 "De \"%(attr)s\" attribuut op regel %(line)s heeft een ongeldige waarde. "
 "(Regel start met \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index b64af505f3be354f3abde6570d5a4725471589b2..028f25022aac2ef389aaf54ad6c3ee66c7deedd2 100644
GIT binary patch
delta 25
gcmeyioAKLj#tk`ETt>PEMhb?8Rz_x<%d8rd0fIOPumAu6

delta 25
gcmeyioAKLj#tk`ET!y-aMhZs8R)$8K%d8rd0fI9Kt^fc4

diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index d2c59763c3..6814fd7f2d 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: 2006-01-12 23:12+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
 "Language-Team: Norwegian\n"
@@ -292,6 +292,77 @@ msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 "Kommentar skjemaet returnerte ikke et 'forhåndsvisning' eller 'post' objekt"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Brukernavn:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Passord:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Endre passord"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "tillat kommentarer"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "tillat kommentarer"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "brukernavn"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -369,7 +440,7 @@ msgstr "logg notis"
 msgid "log entries"
 msgstr "logg innlegg"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Alle datoer"
 
@@ -385,7 +456,7 @@ msgstr ""
 msgid "Log in"
 msgstr "Log inn"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -393,7 +464,7 @@ msgstr ""
 "Du må logge inn igjen, fordi sesjonen din har gått ut på dato, men ikke ikke "
 "bekjymr deg informasjonen du sendte ble lagret."
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -402,11 +473,11 @@ msgstr ""
 "('cookies'). Vennligst omkonfigurer nettleseren din, last siden på ny og "
 "prøv igjen."
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Brukernavnet kan ikke inneholde '@'"
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Epost adressen din er ikke brukernavnet ditt, prøv '%s' i stede."
@@ -485,26 +556,26 @@ msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
 msgid "Change %s"
 msgstr "Endre %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, 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:649
 #, 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:652
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Endre historien: %s"
@@ -591,6 +662,7 @@ msgstr "XML tekst"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentasjon"
@@ -600,6 +672,7 @@ msgstr "Dokumentasjon"
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -613,28 +686,10 @@ msgstr "Dokumentasjon"
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -741,14 +796,6 @@ msgstr "Ingen tilgjengelige"
 msgid "Add %(name)s"
 msgstr "Legg til %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Passord:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Har du <a href=\"/password_reset/\">glemt passordet ditt</a>?"
@@ -1799,7 +1846,7 @@ msgstr ""
 "\"%(attr)s\" tillegg på linje $(line)s har en ikke godkjent verdi. (Linja "
 "starter med \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, fuzzy, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "$(optname)s med %(fieldname)s finnes allerede."
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index c324550bb03cfd193f2bef8b39486b0956ab03e6..fd22fa0a1ce609d91cb642e42141ae635971b286 100644
GIT binary patch
delta 7769
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
RvBm4h#pe%xX7bRf=Klx!T=M_`

delta 8861
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

diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index 0f67f34a1f..039492698c 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,13 +7,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
 "PO-Revision-Date: 2006-01-23 19:54-0200\n"
 "Last-Translator: João Marcus Christ <joaoma@gmail.com>\n"
 "Language-Team: Português do Brasil <pt-br@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
@@ -75,8 +75,7 @@ msgstr "data/hora de envio"
 msgid "is public"
 msgstr "é público"
 
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:256
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
 msgid "IP address"
 msgstr "Endereço IP:"
 
@@ -85,8 +84,12 @@ msgid "is removed"
 msgstr "foi removido"
 
 #: 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 "Selecione esta opção se o comentário é inapropriado. Uma mensagem \"Este comentário foi removido\" será mostrada no lugar."
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Selecione esta opção se o comentário é inapropriado. Uma mensagem \"Este "
+"comentário foi removido\" será mostrada no lugar."
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
@@ -215,23 +218,29 @@ msgid "No voting for yourself"
 msgstr "Você não pode votar em si mesmo"
 
 #: contrib/comments/views/comments.py:25
-msgid "This rating is required because you've entered at least one other rating."
-msgstr "Esta avaliação é requerida porque você entrou com ao menos uma avaliação"
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+"Esta avaliação é requerida porque você entrou com ao menos uma avaliação"
 
 #: contrib/comments/views/comments.py:109
-#, python-format
+#, fuzzy, 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"
-"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
 "\n"
 "%(text)s"
-msgstr ""
-"Este comentário foi envidao por um usuário que enviou menos de %(count)s comentário:\n"
+msgstr[0] ""
+"Este comentário foi feito por um usuário esboço:\n"
 "\n"
 "%(text)s"
-"Este comentário foi enviado por um usuário que enviou menos de %(count)s comentários:\n"
+msgstr[1] ""
+"Este comentário foi feito por um usuário esboço:\n"
 "\n"
 "%(text)s"
 
@@ -263,14 +272,90 @@ msgstr "Alguém modificou o form de comentários (violação de segurança)"
 
 #: 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 form de comentários teve um parâmetro 'target' inválido -- o ID do objeto é inválido"
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"O form de comentários teve um parâmetro 'target' inválido -- o ID do objeto "
+"é inválido"
 
 #: contrib/comments/views/comments.py:254
 #: contrib/comments/views/comments.py:318
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "O form de comentários não forneceu nem 'preview' nem 'post'"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Usuário:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Senha:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Alterar minha senha"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "avaliação #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Comentário"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "Comentário livre"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "usuário"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -280,8 +365,7 @@ msgstr ""
 "<h3>Por %s</h3>\n"
 "<ul>\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 "Todos"
@@ -346,34 +430,45 @@ msgstr "entrada de log"
 msgid "log entries"
 msgstr "entradas de log"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Todas as datas"
 
-#: contrib/admin/views/decorators.py:9
-#: parts/auth/formfields.py:33
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
 #: parts/auth/formfields.py:38
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
-msgstr "Por favor entre usuário e senha corretos. Note que ambos os camposdiferenciam maiúsculas e minúsculas."
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Por favor entre usuário e senha corretos. Note que ambos os "
+"camposdiferenciam maiúsculas e minúsculas."
 
 #: contrib/admin/views/decorators.py:23
 #: contrib/admin/templates/admin/login.html:24
 msgid "Log in"
 msgstr "Acessar"
 
-#: contrib/admin/views/decorators.py:57
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Por favor acesse novamente, pois sua sessão expirou. Não se preocupe: Os dados enviados foram salvos."
+#: contrib/admin/views/decorators.py:61
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Por favor acesse novamente, pois sua sessão expirou. Não se preocupe: Os "
+"dados enviados foram salvos."
 
-#: contrib/admin/views/decorators.py:64
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Parece que seu navegador não está configurado para aceitar cookies. Por favor habilite os cookies, recarregue esta página, e tente novamente."
+#: contrib/admin/views/decorators.py:68
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Parece que seu navegador não está configurado para aceitar cookies. Por "
+"favor habilite os cookies, recarregue esta página, e tente novamente."
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Nomes de usuário não podem conter o caracter '@'."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Seu endereço de e-mail não é seu nome de usuário. Tente usar '%s'"
@@ -397,15 +492,11 @@ msgstr "Selecione %s para modificar"
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado com sucesso."
 
-#: contrib/admin/views/main.py:415
-#: contrib/admin/views/main.py:491
-#: contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
 msgid "You may edit it again below."
 msgstr "Você pode editá-lo(a) de novo abaixo."
 
-#: contrib/admin/views/main.py:423
-#: contrib/admin/views/main.py:500
-#: contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
 #, python-format
 msgid "You may add another %s below."
 msgstr "Você pode adicionar outro(a) %s abaixo."
@@ -420,11 +511,7 @@ msgstr "Adicionar %s"
 msgid "Added %s."
 msgstr "Adicionado %s."
 
-#: contrib/admin/views/main.py:456
-#: contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:457
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
 #: contrib/admin/views/main.py:461
 msgid "and"
 msgstr "e"
@@ -450,44 +537,44 @@ msgstr "O(A) %(name)s \"%(obj)s\" foi modificado com sucesso."
 
 #: contrib/admin/views/main.py:498
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado com sucesso. Você pode editá-lo(a) abaixo."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"O(A) %(name)s \"%(obj)s\" foi adicionado com sucesso. Você pode editá-lo(a) "
+"abaixo."
 
 #: contrib/admin/views/main.py:536
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Um(a) ou mais %(fieldname)s em %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Um(a) ou mais %(fieldname)s em %(name)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado com sucesso."
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Você tem certeza?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Histórico de Modificações: %s"
 
-#: contrib/admin/views/doc.py:244
-#: contrib/admin/views/doc.py:253
-#: contrib/admin/views/doc.py:255
-#: contrib/admin/views/doc.py:261
-#: contrib/admin/views/doc.py:262
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
 msgid "Integer"
 msgstr "Inteiro"
 
@@ -515,10 +602,8 @@ msgstr "Data/hora"
 #: contrib/admin/views/doc.py:250
 msgid "E-mail address"
 msgstr "Endereço de e-mail"
-""
 
-#: contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:254
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
 msgid "File path"
 msgstr "Caminho do Arquivo"
 
@@ -550,8 +635,7 @@ msgstr "Texto"
 msgid "Time"
 msgstr "Hora"
 
-#: contrib/admin/views/doc.py:267
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -568,6 +652,7 @@ msgstr "Texto XML"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Documentação"
@@ -577,6 +662,7 @@ msgstr "Documentação"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 #: contrib/admin/templates/admin_doc/view_detail.html:4
 #: contrib/admin/templates/admin_doc/template_tag_index.html:5
@@ -590,28 +676,10 @@ msgstr "Documentação"
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -631,8 +699,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 "Usuário"
 
@@ -645,8 +712,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 objeto não tem um histórico de alterações. Ele provavelmente não foi adicionado por este site de administração."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Este objeto não tem um histórico de alterações. Ele provavelmente não foi "
+"adicionado por este site de administração."
 
 #: contrib/admin/templates/admin/base_site.html:4
 msgid "Django site admin"
@@ -669,8 +740,12 @@ msgid "Server Error <em>(500)</em>"
 msgstr "Erro no Servidor <em>(500)</em>"
 
 #: 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 "Houve um erro. Este foi reportado aos administradores do site através d e-mail e deve ser consertado em breve. Obrigado pela compreensão."
+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 ""
+"Houve um erro. Este foi reportado aos administradores do site através d e-"
+"mail e deve ser consertado em breve. Obrigado pela compreensão."
 
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -711,14 +786,6 @@ msgstr "Nenhuma disponível"
 msgid "Add %(name)s"
 msgstr "Adicionar %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Usuário:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Senha:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Você <a href=\"/password_reset/\"esqueceu a senha</a>?"
@@ -729,13 +796,23 @@ msgstr "Bem vindo,"
 
 #: 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 "A remoção de '%(object)s' %(object_name)s pode resultar na remoção de objetos relacionados, mas sua conta não tem a permissão para remoção dos seguintes tipos de objetos:"
+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 ""
+"A remoção de '%(object)s' %(object_name)s pode resultar na remoção de "
+"objetos relacionados, mas sua conta não tem a permissão para remoção dos "
+"seguintes tipos de objetos:"
 
 #: 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 "Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os seguintes itens relacionados serão removidos:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+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:17
 msgid "Yes, I'm sure"
@@ -755,8 +832,11 @@ msgid "View on site"
 msgstr "Ver no site"
 
 #: contrib/admin/templates/admin/change_form.html:28
+#, fuzzy
 msgid "Please correct the error below."
-msgstr "Por favor, corrija o erro abaixo."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Por favor, corrija o erro abaixo."
+msgstr[1] "Por favor, corrija o erro abaixo."
 
 #: contrib/admin/templates/admin/change_form.html:45
 msgid "Ordering"
@@ -810,8 +890,12 @@ msgid "Password reset"
 msgstr "Reinicializar senha"
 
 #: 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 a senha? Digite seu e-mail abaixo e nós iremos enviar uma nova senha para você."
+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 a senha? Digite seu e-mail abaixo e nós iremos enviar uma nova "
+"senha para você."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -835,12 +919,20 @@ msgid "Password reset successful"
 msgstr "Senha inicializada com sucesso"
 
 #: 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 "Nós enviamos uma nova senha para o e-mail que você informou. Você deve estar recebendo uma mensagem em breve."
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Nós enviamos uma nova senha para o e-mail que você informou. Você deve estar "
+"recebendo uma mensagem em 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 favor, informe sua senha antiga, por segurança, e então informe sua nova senha duas vezes para que possamos verificar que se ela está correta."
+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 favor, informe sua senha antiga, por segurança, e então informe sua nova "
+"senha duas vezes para que possamos verificar que se ela está correta."
 
 #: contrib/admin/templates/registration/password_change_form.html:17
 msgid "Old password:"
@@ -921,16 +1013,23 @@ msgid "Documentation for this page"
 msgstr "Documentação para esta página"
 
 #: 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 "Leva você de qualquer página da documentação para a view que gera tal página."
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Leva você de qualquer página da documentação para a view que gera tal página."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:22
 msgid "Show object ID"
 msgstr "Mostar ID de objeto"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Mostra o tipo de conteúdo e ID único para páginas que representam um objeto único."
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Mostra o tipo de conteúdo e ID único para páginas que representam um objeto "
+"único."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Edit this object (current window)"
@@ -938,7 +1037,9 @@ msgstr "Edita este objeto (janela atual)"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:26
 msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Vai para a página de administração para páginas que representam um objeto único."
+msgstr ""
+"Vai para a página de administração para páginas que representam um objeto "
+"único."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:28
 msgid "Edit this object (new window)"
@@ -969,16 +1070,24 @@ msgid "redirect from"
 msgstr "redirecionar de"
 
 #: contrib/redirects/models/redirects.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Deve conter um caminho absoluto, excluindo o nome de domínio. Exemplo: '/eventos/busca/'."
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Deve conter um caminho absoluto, excluindo o nome de domínio. Exemplo: '/"
+"eventos/busca/'."
 
 #: contrib/redirects/models/redirects.py:9
 msgid "redirect to"
 msgstr "redirecionar para"
 
 #: contrib/redirects/models/redirects.py:10
-msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
-msgstr "Deve conter um caminho absoluto (como acima) ou uma URL completa, começando com 'http://'."
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Deve conter um caminho absoluto (como acima) ou uma URL completa, começando "
+"com 'http://'."
 
 #: contrib/redirects/models/redirects.py:12
 msgid "redirect"
@@ -989,7 +1098,8 @@ msgid "redirects"
 msgstr "redirecionamentos"
 
 #: contrib/flatpages/models/flatpages.py:7
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr "Exemplo: '/sobre/contato/'. Lembre-se das barras no começo e no final."
 
 #: contrib/flatpages/models/flatpages.py:8
@@ -1009,8 +1119,12 @@ msgid "template name"
 msgstr "nome do modelo"
 
 #: contrib/flatpages/models/flatpages.py:12
-msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
-msgstr "Exemplo: 'flatfiles/contact_page'. Se não for informado, será utilizado 'flatfiles/default'."
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Exemplo: 'flatfiles/contact_page'. Se não for informado, será utilizado "
+"'flatfiles/default'."
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
@@ -1076,28 +1190,23 @@ msgstr "Janeiro"
 msgid "February"
 msgstr "Fevereiro"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "March"
 msgstr "Março"
 
-#: 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 "Junho"
 
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
 msgid "July"
 msgstr "Julho"
 
@@ -1150,24 +1259,39 @@ msgid "Dec."
 msgstr "Dez."
 
 #: utils/timesince.py:12
+#, fuzzy
 msgid "year"
-msgstr "ano"
+msgid_plural "years"
+msgstr[0] "ano"
+msgstr[1] "ano"
 
 #: utils/timesince.py:13
+#, fuzzy
 msgid "month"
-msgstr "mês"
+msgid_plural "months"
+msgstr[0] "mês"
+msgstr[1] "mês"
 
 #: utils/timesince.py:14
+#, fuzzy
 msgid "day"
-msgstr "dia"
+msgid_plural "days"
+msgstr[0] "dia"
+msgstr[1] "dia"
 
 #: utils/timesince.py:15
+#, fuzzy
 msgid "hour"
-msgstr "hora"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "hora"
 
 #: utils/timesince.py:16
+#, fuzzy
 msgid "minute"
-msgstr "minuto"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minuto"
 
 #: models/core.py:7
 msgid "domain name"
@@ -1189,10 +1313,7 @@ msgstr "sites"
 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"
 
@@ -1244,8 +1365,7 @@ msgstr "nome código"
 msgid "Permission"
 msgstr "Permissão"
 
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
 msgid "Permissions"
 msgstr "Permissões"
 
@@ -1253,8 +1373,7 @@ msgstr "Permissões"
 msgid "Group"
 msgstr "Grupo"
 
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
 msgid "Groups"
 msgstr "Grupos"
 
@@ -1307,8 +1426,12 @@ msgid "date joined"
 msgstr "data de registro"
 
 #: 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 "Em adição às permissões atribuídas manualmente, este usuário também terá todas as permissões dadas a cada grupo que participar."
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Em adição às permissões atribuídas manualmente, este usuário também terá "
+"todas as permissões dadas a cada grupo que participar."
 
 #: models/auth.py:48
 msgid "Users"
@@ -1411,32 +1534,27 @@ msgstr "Sueco"
 msgid "Simplified Chinese"
 msgstr "Chinês Simplificado"
 
-#: core/formfields.py:59
-#: core/meta/fields.py:285
-#: core/meta/fields.py:488
 #: conf/global_settings.py:58
 msgid "Traditional Chinese"
 msgstr "Chinês Tradicional"
 
-#: 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 "Este campo é requerido."
 
 #: core/formfields.py:338
-#, python-format
+#, fuzzy, python-format
 msgid "Ensure your text is less than %s character."
-msgstr "Certifique-se de que seu texto tenha menos que %s caracteres."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Certifique-se de que seu texto tenha menos que %s caracteres."
+msgstr[1] "Certifique-se de que seu texto tenha menos que %s caracteres."
 
 #: core/formfields.py:343
 msgid "Line breaks are not allowed here."
 msgstr "Não são permitidas múltiplas linhas aqui."
 
-#: core/formfields.py:438
-#: core/formfields.py:509
-#: core/formfields.py:547
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "Selecione uma escolha válida; '%(data)s' não está em %(choices)s."
@@ -1522,8 +1640,12 @@ msgid "Enter a valid e-mail address."
 msgstr "Informe um endereço de email 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 "Envie uma imagem válida. O arquivo enviado não é uma imagem ou está corrompido."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Envie uma imagem válida. O arquivo enviado não é uma imagem ou está "
+"corrompido."
 
 #: core/validators.py:157
 #, python-format
@@ -1533,7 +1655,8 @@ msgstr "A URL %s não aponta para um imagem válida."
 #: core/validators.py:161
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Números de telefone deves estar no formato XXX-XXX-XXXX.\"%s\" é inválido."
+msgstr ""
+"Números de telefone deves estar no formato XXX-XXX-XXXX.\"%s\" é inválido."
 
 #: core/validators.py:169
 #, python-format
@@ -1563,8 +1686,7 @@ msgstr "XML mal formado: %s"
 msgid "Invalid URL: %s"
 msgstr "URL inválida: %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 "A URL %s é um link quebrado."
@@ -1574,9 +1696,11 @@ msgid "Enter a valid U.S. state abbreviation."
 msgstr "Informe uma abreviação válida de nome de um estado dos EUA."
 
 #: core/validators.py:231
-#, python-format
+#, fuzzy, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
-msgstr "Lave sua boca! A palavra %s não é permitida aqui."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] "Lave sua boca! A palavra %s não é permitida aqui."
+msgstr[1] "Lave sua boca! A palavra %s não é permitida aqui."
 
 #: core/validators.py:238
 #, python-format
@@ -1587,8 +1711,7 @@ msgstr "Este campo deve ser igual ao campo '%s'."
 msgid "Please enter something for at least one field."
 msgstr "Informe algo em pelo menos um 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 "Informe ambos os campos ou deixe ambos vazios."
 
@@ -1616,14 +1739,20 @@ msgid "Please enter a valid decimal number."
 msgstr "Informe um número decimal."
 
 #: core/validators.py:351
-#, python-format
+#, fuzzy, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
-msgstr "Por favor entre com um número decimal com no máximo %s digitos."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] "Por favor entre com um número decimal com no máximo %s digitos."
+msgstr[1] "Por favor entre com um número decimal com no máximo %s digitos."
 
 #: core/validators.py:354
-#, python-format
+#, fuzzy, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
-msgstr "Informe um número decimal com no máximo %s casa decimal."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "Informe um número decimal com no máximo %s casa decimal."
+msgstr[1] "Informe um número decimal com no máximo %s casa decimal."
 
 #: core/validators.py:364
 #, python-format
@@ -1650,40 +1779,67 @@ msgstr "Não foi possível receber dados de %s."
 
 #: core/validators.py:431
 #, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "A URL %(url)s retornou um cabeçalho '%(contenttype)s' de Content-Type inválido."
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+"A URL %(url)s retornou um cabeçalho '%(contenttype)s' de Content-Type "
+"inválido."
 
 #: 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, feche a tag %(tag)s na linha %(line)s. (A linha começa com \"%(start)s\".)"
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Por favor, feche a tag %(tag)s na linha %(line)s. (A linha começa com \"%"
+"(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 "Algum texto começando na linha %(line)s não é permitido no contexto. (Linha começa com \"%(start)s\".)"
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Algum texto começando na linha %(line)s não é permitido no contexto. (Linha "
+"começa com \"%(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 linha %(line)s não é um atributo válido. (Linha começa com \"%(start)s\".)"
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"%(attr)s\" na linha %(line)s não é um atributo válido. (Linha começa com "
+"\"%(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 linha %(line)s é uma tag inválida. (Linha começa com \"%(start)s\".)"
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"<%(tag)s>\" na linha %(line)s é uma tag inválida. (Linha começa com \"%"
+"(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 "Uma tag na linha %(line)s está não apresenta um ou mais atributos exigidos.(Linha começa com \"%(start)s\".)"
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Uma tag na linha %(line)s está não apresenta um ou mais atributos exigidos."
+"(Linha começa com \"%(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 linha %(line)s tem um valor inválido. (Linha começa com \"%(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 linha %(line)s tem um valor inválido. (Linha "
+"começa com \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "%(object)s com este %(type)s já existe para o %(field)s dado."
@@ -1703,25 +1859,54 @@ msgid " Separate multiple IDs with commas."
 msgstr " Separe IDs múltiplos com vírgulas."
 
 #: core/meta/fields.py:132
-msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr " Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar mais de uma opção."
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+" Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar "
+"mais de uma opção."
 
 #: core/meta/fields.py:508
 msgid "Enter a valid filename."
 msgstr "Informe um nome de arquivo válido."
 
 #: core/meta/fields.py:782
-#, python-format
+#, fuzzy, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgstr "Por favor, entre IDs válidos para %(self)s. O valor %(value)r é inválido."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] ""
+"Por favor, entre IDs válidos para %(self)s. O valor %(value)r é inválido."
+msgstr[1] ""
+"Por favor, entre IDs válidos para %(self)s. O valor %(value)r é inválido."
 
 #: core/template/defaultfilters.py:379
 msgid "yes,no,maybe"
 msgstr "sim,não,talvez"
 
 #: parts/auth/formfields.py:27
-msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
-msgstr "Seu navegador Web não parece estar com os cookies habilitados. Cookies são requeridos para acesssar."
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Seu navegador Web não parece estar com os cookies habilitados. Cookies são "
+"requeridos para acesssar."
+
+#~ msgid ""
+#~ "This comment was posted by a user who has posted fewer than %(count)s "
+#~ "comment:\n"
+#~ "\n"
+#~ "%(text)sThis comment was posted by a user who has posted fewer than %"
+#~ "(count)s comments:\n"
+#~ "\n"
+#~ "%(text)s"
+#~ msgstr ""
+#~ "Este comentário foi envidao por um usuário que enviou menos de %(count)s "
+#~ "comentário:\n"
+#~ "\n"
+#~ "%(text)sEste comentário foi enviado por um usuário que enviou menos de %"
+#~ "(count)s comentários:\n"
+#~ "\n"
+#~ "%(text)s"
 
 #, fuzzy
 #~ msgid "count"
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index f2459c8fcb5f547607132d21dbdd34c975ac8552..e24d7370c21b78d135a7b40005419fa5cbfa1ca0 100644
GIT binary patch
delta 25
gcmX@n%6Oucal<qXE+bt7BLzc4D<iYb3p6yO0CB?yw*UYD

delta 25
gcmX@n%6Oucal<qXE<;^IBLyR4D?`K03p6yO0CBhnv;Y7A

diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index 913e2fdf62..dda7df497c 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/django/conf/locale/ro/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -278,6 +278,77 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Utilizator:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Parola:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Schimbă-mi parola"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "permite comentarii"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "permite comentarii"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "nume utilizator"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -352,7 +423,7 @@ msgstr "intrare log"
 msgid "log entries"
 msgstr "intrări log"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr ""
 
@@ -368,23 +439,23 @@ msgstr ""
 msgid "Log in"
 msgstr "Login"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -463,26 +534,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "Schimbă"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Schimbă parola"
@@ -572,6 +643,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr ""
@@ -581,6 +653,7 @@ msgstr ""
 #: 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/registration/password_change_form.html:3
 #: 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,28 +667,10 @@ msgstr ""
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -722,14 +777,6 @@ msgstr "Indisponibil"
 msgid "Add %(name)s"
 msgstr "Adaugă"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Utilizator:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Parola:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Ai <a href=\"/password_reset/\">uitat parola</a>?"
@@ -1782,7 +1829,7 @@ msgstr ""
 "Atributul \"%(attr)s\" din linia %(line)s are o valoare invalidă. ( Linia "
 "începe cu \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 3f59887de8d0eaf21e4973d8096fddb9e4cf8936..65b6b4477e41ee7fbf3bef17d1ee75a097f8c46e 100644
GIT binary patch
delta 25
gcmcb*hVkke#trsnTt>PEMhb?8Rz{|qJ<WI&0CZ;ub^rhX

delta 25
gcmcb*hVkke#trsnT!y-aMhZs8R)&U~J<WI&0CZvpbN~PV

diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 47133d6bba..270c27dabf 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: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
 "PO-Revision-Date: 2005-11-26 00:00\n"
 "Last-Translator: Dmitry Sorokin <ds@dial.com.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -270,6 +270,78 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "���:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "������:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "��������� ������"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "������� #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "�����������"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "��������� �����������"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "��� ������������"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -342,7 +414,7 @@ msgstr "
 msgid "log entries"
 msgstr "���������� ������"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "��� ����"
 
@@ -358,7 +430,7 @@ msgstr ""
 msgid "Log in"
 msgstr "����"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -366,7 +438,7 @@ msgstr ""
 "���������� ������� �����, ���������� ���� ������ ��������. �� ������������:"
 "��������� ���� ������ ���������."
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -374,11 +446,11 @@ msgstr ""
 "������, ��� ��� ������� �� �������� �� ����� cookies. ����������� �������� "
 "cookie, ������������� �������� � ����������� �����. "
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "��� ������������ �� ����� �������� ������ '@'."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
@@ -456,26 +528,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "�������� %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, 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:649
 #, 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:652
 msgid "Are you sure?"
 msgstr "�� �������?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "������ �������: %s"
@@ -560,6 +632,7 @@ msgstr "XML 
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "������������"
@@ -569,6 +642,7 @@ msgstr "
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 #: contrib/admin/templates/admin_doc/view_detail.html:4
 #: contrib/admin/templates/admin_doc/template_tag_index.html:5
@@ -582,28 +656,10 @@ msgstr "
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -710,14 +766,6 @@ msgstr "
 msgid "Add %(name)s"
 msgstr "�������� %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "���:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "������:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "�� <a href=\"/password_reset/\">������ ������</a>?"
@@ -1744,7 +1792,7 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 157307f7e62228d171eabc84f16eddac7e408201..9b9f5607869809268ebe067943919db0ef8683c4 100644
GIT binary patch
delta 25
hcmX^3h4J7Q#tpMQxr}rTj1&wFt&GezFZG;b004*m30(jH

delta 25
hcmX^3h4J7Q#tpMQxeRp;jTDTGtqhGeFZG;b004*h30nXF

diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 21f4a26f22..df5a487e1d 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: 2006-01-12 23:12+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: 2005-11-10 23:22-0500\n"
 "Last-Translator: Vladimir Labath <vlado@labath.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -286,6 +286,78 @@ 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/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Meno:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Heslo:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Zmena môjho hesla"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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ásenie"
+
+#: contrib/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "hodnotenie #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Komentár"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "Voľný komentár"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "užívateľské meno"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -360,7 +432,7 @@ msgstr "záznam priebehu"
 msgid "log entries"
 msgstr "záznamy priebehu"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Všetky dátumy"
 
@@ -370,15 +442,15 @@ msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
-"Prosím, vložte spávne meno užvateľa ako aj heslo. Pripomínam, že obe polia"
-"rozlišujú malé a veľké písmena"
+"Prosím, vložte spávne meno užvateľa ako aj heslo. Pripomínam, že obe "
+"poliarozlišujú malé a veľké písmena"
 
 #: contrib/admin/views/decorators.py:23
 #: contrib/admin/templates/admin/login.html:24
 msgid "Log in"
 msgstr "Prihlásenie"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -386,7 +458,7 @@ msgstr ""
 "Prosím prihlaste sa znovu, lebo čas vášho sedenia vypršal. Nemajte obavy: "
 "Vaše údaje su uchované."
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -394,11 +466,11 @@ msgstr ""
 "Vyzerá, že váš prehliadač nemá povolené cookies. Prosím povoľte cookies, "
 "znovu načítajte túto stránku a skúste činnosť znovu."
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Meno užívateľa nemože obsahovať  znak '@' ."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Vaša e-mailova adresa nie je vaše užívateľské meno. Skúste '%s'."
@@ -478,26 +550,26 @@ msgstr ""
 msgid "Change %s"
 msgstr "Zmeň %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Jeden alebo viac %(fieldname)s v %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Jeden alebo viac %(fieldname)s v %(name)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne vymazaný."
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Ste si istý?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Zmena histórie:"
@@ -582,6 +654,7 @@ msgstr "XML text"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentácia"
@@ -591,6 +664,7 @@ msgstr "Dokumentácia"
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -604,28 +678,10 @@ msgstr "Dokumentácia"
 msgid "Change password"
 msgstr "Zmena hesla"
 
-#: 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ásenie"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -732,14 +788,6 @@ msgstr "Nepovolené"
 msgid "Add %(name)s"
 msgstr "Pridaj %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Meno:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Heslo:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Zabudli ste<a href=\"/password_reset/\"> vaše heslo</a>?"
@@ -1791,7 +1839,7 @@ msgstr ""
 "Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína "
 "s \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "%(object)s s %(type)s už existuje pre prvok  %(field)s."
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index afb105aeee398164f8b58743b6fa6973b25fb450..e5bc4d0f2df8c1d80521d1fe820aeaf4d1763cc6 100644
GIT binary patch
delta 25
hcmaF%k@49_#tqtDTt>PEMhb?8Rz{|qO}#ei0RV*82-N@p

delta 25
hcmaF%k@49_#tqtDT!y-aMhZs8R)&U~O}#ei0RV*32-5%n

diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index ca89cefc80..dac807af61 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,14 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Serbian (latin) translation v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
 "PO-Revision-Date: 2006-01-15 11:21+0100\n"
 "Last-Translator: Nebojša Đorđević <nesh@studioquattro.co.yu>\n"
-"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail.com>\n"
+"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail."
+"com>\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: Serbian\n"
 "X-Poedit-Country: YUGOSLAVIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -75,8 +77,7 @@ msgstr "datum/vreme slanja"
 msgid "is public"
 msgstr "da li je javni"
 
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:256
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
 msgid "IP address"
 msgstr "IP adresa"
 
@@ -85,8 +86,12 @@ msgid "is removed"
 msgstr "obrisan je"
 
 #: 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 "Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je obrisan\" umesto teksta komentara."
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je "
+"obrisan\" umesto teksta komentara."
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
@@ -216,29 +221,35 @@ msgstr "Ne možete da glasate sami za sebe"
 
 # nesh: grrrrr, ala je rogobatno
 #: 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 "Ovaj rejting je obavezan pošto ste uneli još najmanje jedan rejting."
 
 #: 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] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
 "\n"
 "%(text)s"
 msgstr[2] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
 "\n"
 "%(text)s"
 
@@ -271,14 +282,89 @@ msgstr "Neko je menjao form za komentare (povreda sigurnosti)"
 
 #: 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 "Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan"
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan"
 
 #: contrib/comments/views/comments.py:254
 #: contrib/comments/views/comments.py:318
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Ovaj komentar nije koristio 'preview' ili 'post'"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Korisničko ime:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Lozinka:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Izmeni moju lozinku"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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 "Odjavi se"
+
+#: contrib/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "rejting #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Komentar"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "Slobodan komentar"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "korisničko ime"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -288,8 +374,7 @@ msgstr ""
 "<h3>Od %s:</h3>\n"
 "<ul>\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 "Sve"
@@ -354,34 +439,45 @@ msgstr "unos u dnevnik izmena"
 msgid "log entries"
 msgstr "unosi u dnevnik izmena"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Svi datumi"
 
-#: contrib/admin/views/decorators.py:9
-#: parts/auth/formfields.py:33
+#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33
 #: parts/auth/formfields.py:38
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
-msgstr "Unesite ispravno korisničko ime i šifru. Napomena: oba polja prave razliku između velikih i malih slova."
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Unesite ispravno korisničko ime i šifru. Napomena: oba polja prave razliku "
+"između velikih i malih slova."
 
 #: contrib/admin/views/decorators.py:23
 #: contrib/admin/templates/admin/login.html:24
 msgid "Log in"
 msgstr "Prijavi se"
 
-#: contrib/admin/views/decorators.py:57
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su sačuvani."
+#: contrib/admin/views/decorators.py:61
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su "
+"sačuvani."
 
-#: contrib/admin/views/decorators.py:64
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte stranu i pokušajte ponovo."
+#: contrib/admin/views/decorators.py:68
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte "
+"stranu i pokušajte ponovo."
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Korisnička imena ne mogu sadržati karakter '@'."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Vaša e-mail adresa nije koriničko ime. Probajte sa '%s'."
@@ -405,13 +501,11 @@ msgstr "Izaberi %s za izmenu"
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "Uspešno dodat %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:415
-#: contrib/admin/views/main.py:492
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492
 msgid "You may edit it again below."
 msgstr "Ispod ga možete ponovo izmeniti."
 
-#: contrib/admin/views/main.py:423
-#: contrib/admin/views/main.py:501
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501
 #, python-format
 msgid "You may add another %s below."
 msgstr "Ispod možete dodati još jedan %s."
@@ -426,8 +520,7 @@ msgstr "Dodaj %s"
 msgid "Added %s."
 msgstr "Dodat %s"
 
-#: contrib/admin/views/main.py:457
-#: contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
 #: contrib/admin/views/main.py:461
 msgid "and"
 msgstr "i"
@@ -453,7 +546,8 @@ msgstr "Uspešno izmenjen: %(name)s \"%(obj)s\"."
 
 #: contrib/admin/views/main.py:498
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" je uspešno dodat. Ispod ga možete ponovo menjati."
 
 #: contrib/admin/views/main.py:536
@@ -461,36 +555,33 @@ msgstr "%(name)s \"%(obj)s\" je uspešno dodat. Ispod ga možete ponovo menjati.
 msgid "Change %s"
 msgstr "Izmeni %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Jedno ili više %(fieldname)s u %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Jedan ili više %(fieldname)s u %(name)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Uspešno obrisan: %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Da li ste sigurni?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Istorija izmena: %s"
 
-#: contrib/admin/views/doc.py:244
-#: contrib/admin/views/doc.py:253
-#: contrib/admin/views/doc.py:255
-#: contrib/admin/views/doc.py:261
-#: contrib/admin/views/doc.py:262
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
 msgid "Integer"
 msgstr "Ceo broj"
 
@@ -519,8 +610,7 @@ msgstr "Datum (sa vremenom)"
 msgid "E-mail address"
 msgstr "E-mail adresa"
 
-#: contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:254
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
 msgid "File path"
 msgstr "Putanja do fajla"
 
@@ -554,8 +644,7 @@ msgstr "Vreme"
 
 # nesh: ovo se valjda ne prevodi
 # petar: ne prevodi se
-#: contrib/admin/views/doc.py:267
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -572,6 +661,7 @@ msgstr "XML tekst"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentacija"
@@ -581,6 +671,7 @@ msgstr "Dokumentacija"
 #: 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/registration/password_change_form.html:3
 #: 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,28 +685,10 @@ msgstr "Dokumentacija"
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: 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 "Odjavi se"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -635,8 +708,7 @@ msgstr "Istorija"
 msgid "Date/time"
 msgstr "Datum/vreme"
 
-#: 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 "Korisnik"
 
@@ -649,8 +721,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 "Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem administracije sajta."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem "
+"administracije sajta."
 
 #: contrib/admin/templates/admin/base_site.html:4
 msgid "Django site admin"
@@ -673,8 +749,12 @@ msgid "Server Error <em>(500)</em>"
 msgstr "Greška na serveru <em>(500)</em>"
 
 #: 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 "Dogodila se greška koja je prijavljena administratorima i biće popravljena uskoro. Hvala Vam na strpljenju."
+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 ""
+"Dogodila se greška koja je prijavljena administratorima i biće popravljena "
+"uskoro. Hvala Vam na strpljenju."
 
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -715,14 +795,6 @@ msgstr "Nema dostupnih"
 msgid "Add %(name)s"
 msgstr "Dodaj %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Korisničko ime:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Lozinka:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Da li ste <a href=\"/password_reset/\">zaboravili Vašu lozinku?</a>?"
@@ -733,13 +805,22 @@ msgstr "Dobrodošli,"
 
 #: 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 "Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja dodatnih podataka, ali nemate prava da brišete sledeće tipove podataka:"
+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 ""
+"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: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 "Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće obrisani i sledeći pridruženi objekti:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+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:17
 msgid "Yes, I'm sure"
@@ -817,8 +898,12 @@ msgid "Password reset"
 msgstr "Resetovanje lozinke"
 
 #: 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 "Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu lozinku na dati e-mail."
+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 ""
+"Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu "
+"lozinku na dati e-mail."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -842,12 +927,20 @@ msgid "Password reset successful"
 msgstr "Vaša lozinka je uspešno resetovana"
 
 #: 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 "Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da stigne u narednih nekoliko minuta."
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da "
+"stigne u narednih nekoliko minuta."
 
 #: 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 "Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi provere ispravnosti unosa."
+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 ""
+"Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi "
+"provere ispravnosti unosa."
 
 #: contrib/admin/templates/registration/password_change_form.html:17
 msgid "Old password:"
@@ -915,23 +1008,36 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 "\n"
-"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup nekima od strana mora biti sa kompjutera čija je IP adresa označena kao \"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je vaš IP označen kao \"internal\").</p>\n"
+"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u "
+"vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete "
+"da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup "
+"nekima od strana mora biti sa kompjutera čija je IP adresa označena kao "
+"\"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je "
+"vaš IP označen kao \"internal\").</p>\n"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:19
 msgid "Documentation for this page"
 msgstr "Dokumentacija za ovu stranu"
 
 #: 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 "Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji generiše tu stranu."
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji "
+"generiše tu stranu."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:22
 msgid "Show object ID"
 msgstr "Prikaži ID objekta"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan objekt."
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan "
+"objekt."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Edit this object (current window)"
@@ -970,16 +1076,24 @@ msgid "redirect from"
 msgstr "redirekcija od"
 
 #: contrib/redirects/models/redirects.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/search/'."
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/"
+"search/'."
 
 #: contrib/redirects/models/redirects.py:9
 msgid "redirect to"
 msgstr "redirekcija na"
 
 #: contrib/redirects/models/redirects.py:10
-msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
-msgstr "Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa 'http://'."
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa "
+"'http://'."
 
 #: contrib/redirects/models/redirects.py:12
 msgid "redirect"
@@ -990,8 +1104,11 @@ msgid "redirects"
 msgstr "redirekcije"
 
 #: contrib/flatpages/models/flatpages.py:7
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu crtu."
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu "
+"crtu."
 
 #: contrib/flatpages/models/flatpages.py:8
 msgid "title"
@@ -1010,8 +1127,12 @@ msgid "template name"
 msgstr "ime templejta"
 
 #: contrib/flatpages/models/flatpages.py:12
-msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
-msgstr "Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti flatpages/default'."
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti "
+"flatpages/default'."
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
@@ -1019,7 +1140,9 @@ msgstr "samo za registrovane korisnike"
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj strani."
+msgstr ""
+"Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj "
+"strani."
 
 #: contrib/flatpages/models/flatpages.py:17
 msgid "flat page"
@@ -1077,28 +1200,23 @@ msgstr "Januar"
 msgid "February"
 msgstr "Februar"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "March"
 msgstr "Mart"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "April"
 msgstr "April"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "May"
 msgstr "Maj"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "June"
 msgstr "Jun"
 
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
 msgid "July"
 msgstr "Jul"
 
@@ -1205,10 +1323,7 @@ msgstr "sajtovi"
 msgid "label"
 msgstr "labela"
 
-#: 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 "ime"
 
@@ -1260,8 +1375,7 @@ msgstr "kodno ime"
 msgid "Permission"
 msgstr "Pravo"
 
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
 msgid "Permissions"
 msgstr "Prava"
 
@@ -1269,8 +1383,7 @@ msgstr "Prava"
 msgid "Group"
 msgstr "Grupa"
 
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
 msgid "Groups"
 msgstr "Grupe"
 
@@ -1323,8 +1436,11 @@ msgid "date joined"
 msgstr "datum otvaranja naloga"
 
 #: 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 "Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
 
 #: models/auth.py:48
 msgid "Users"
@@ -1430,9 +1546,7 @@ msgstr "Kineski (pojednostavljen)"
 msgid "Traditional Chinese"
 msgstr "Tradicionalni Kineski"
 
-#: 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 "Obavezno polje."
@@ -1449,9 +1563,7 @@ msgstr[2] "Tekst mora imati manje od %s slova."
 msgid "Line breaks are not allowed here."
 msgstr "Novi redovi ovde nisu dozvoljeni."
 
-#: core/formfields.py:438
-#: core/formfields.py:509
-#: core/formfields.py:547
+#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "Izaberite validnu opciju: '%(data)s' nije u %(choices)s."
@@ -1479,7 +1591,8 @@ msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)."
 
 #: core/validators.py:66
 msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte."
+msgstr ""
+"Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte."
 
 #: core/validators.py:74
 msgid "Uppercase letters are not allowed here."
@@ -1538,8 +1651,12 @@ msgid "Enter a valid e-mail address."
 msgstr "Unesite ispravnu e-mail adresu."
 
 #: core/validators.py:150
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam fajl oštećen."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam "
+"fajl oštećen."
 
 #: core/validators.py:157
 #, python-format
@@ -1550,7 +1667,8 @@ msgstr "URL %s ne pokazuje na ispravnu sliku"
 #: core/validators.py:161
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
+msgstr ""
+"Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
 
 #: core/validators.py:169
 #, python-format
@@ -1580,8 +1698,7 @@ msgstr "Neispravan XML: %s"
 msgid "Invalid URL: %s"
 msgstr "Neispravan URL: %s"
 
-#: core/validators.py:208
-#: core/validators.py:210
+#: core/validators.py:208 core/validators.py:210
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s je neispravan link."
@@ -1608,8 +1725,7 @@ msgstr "Ovo polje mora biti jednako sa poljem '%s'."
 msgid "Please enter something for at least one field."
 msgstr "Morate popuniti barem jedno polje."
 
-#: 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 "Popunite oba polja ili oba ostavite prazna."
 
@@ -1639,7 +1755,8 @@ msgstr "Unesite ispravan decimalni broj."
 #: 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] "Unesite ispravan decimalni broj sa %s cifrom."
 msgstr[1] "Unesite ispravan decimalni broj sa %s cifre."
 msgstr[2] "Unesite ispravan decimalni broj sa %s cifara."
@@ -1647,7 +1764,8 @@ msgstr[2] "Unesite ispravan decimalni broj sa %s cifara."
 #: 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] "Unesite decimalni broj sa najviše %s decimalnim mestom."
 msgstr[1] "Unesite decimalni broj sa najviše %s decimalna mesta."
 msgstr[2] "Unesite decimalni broj sa najviše %s decimalnih mesta."
@@ -1677,40 +1795,65 @@ msgstr "Ništa nije moglo da se skine sa URL-a %s."
 
 #: core/validators.py:431
 #, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'."
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+"Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(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 "Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%"
+"(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 "Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red "
+"počinje sa \"%(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 "Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(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 \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)"
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(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 "Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%"
+"(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\" u redu %(line)s ima neispravnu vrednost. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje "
+"sa \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "%(object)s sa ovim tipom %(type)s već postoji za polje %(field)s."
@@ -1730,8 +1873,11 @@ msgid " Separate multiple IDs with commas."
 msgstr " Odvojite višestruke ID-ove zarezima."
 
 #: core/meta/fields.py:132
-msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr " Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više stavki."
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+" Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više "
+"stavki."
 
 #: core/meta/fields.py:508
 msgid "Enter a valid filename."
@@ -1740,7 +1886,8 @@ msgstr "Unesite ispravno ime fajla."
 #: core/meta/fields.py:782
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
 msgstr[1] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
 msgstr[2] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
@@ -1750,11 +1897,16 @@ msgid "yes,no,maybe"
 msgstr "da,ne,možda"
 
 #: parts/auth/formfields.py:27
-msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
-msgstr "Vaš web brovser nema omogućenje \"cookie\". \"cookie\" podrška je potrebna da bi ste mogli da se prijavite."
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
+msgstr ""
+"Vaš web brovser nema omogućenje \"cookie\". \"cookie\" podrška je potrebna "
+"da bi ste mogli da se prijavite."
 
 #~ msgid "Error in Template"
 #~ msgstr "Greška u templejtu"
+
 #~ msgid ""
 #~ "\n"
 #~ "In template %(name)s, error at line %(line)s:\n"
@@ -1765,4 +1917,3 @@ msgstr "Vaš web brovser nema omogućenje \"cookie\". \"cookie\" podrška je pot
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "sadržaj"
-
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index 5afe00f360c889865b2c1f0dfcbc555343bd8b1d..c9ff90560883cce5fb77bed8f3b031e659ff32e9 100644
GIT binary patch
delta 25
hcmaF<mht&p#tj-CTt>PEMhb?8Rz_x<jXbvM0RV&c2+9Be

delta 25
hcmaF<mht&p#tj-CT!y-aMhZs8R)$8KjXbvM0RV&X2*>~c

diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po
index 4e41a95c60..24fa88631a 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:12+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: 2005-12-04 16:20+0100\n"
 "Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n"
 "Language-Team: Django translators <djangoi18n@googlegroups.com>\n"
@@ -288,6 +288,78 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Kommenteringsformuläret skickade varken 'förhandsgranska' eller 'post'"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "Ändra mitt lösenord"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "betyg #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "Kommentar"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "Fri kommentar"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "användarnamn"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -362,7 +434,7 @@ msgstr "loggpost"
 msgid "log entries"
 msgstr "loggposter"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "Alla datum"
 
@@ -378,7 +450,7 @@ msgstr ""
 msgid "Log in"
 msgstr "Logga in"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
@@ -386,7 +458,7 @@ msgstr ""
 "Du måste logga in igen, eftersom din session har tagit slut. Oroa dig inte: "
 "ditt bidrag har sparats."
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -394,11 +466,11 @@ msgstr ""
 "Det ser ut som om din webbläsare inte är konfigurerad att acceptera kakor. "
 "Aktivera kakor, ladda om den här sidan, och försök igen."
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "Användarnamn kan inte innehålla tecknet '@'."
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället."
@@ -476,26 +548,26 @@ msgstr "%(name)set \"%(obj)s\" lades till. Du kan ändra det igen här under."
 msgid "Change %s"
 msgstr "Ändra %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Ett eller flera %(fieldname)s i %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Ett eller flera %(fieldname)s i %(name)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)set \"%(obj)s\" togs bort."
 
-#: contrib/admin/views/main.py:651
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Är du säker?"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Ändra historien: %s"
@@ -580,6 +652,7 @@ msgstr "XML-text"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "Dokumentation"
@@ -589,6 +662,7 @@ msgstr "Dokumentation"
 #: 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/registration/password_change_form.html:3
 #: 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
@@ -602,28 +676,10 @@ msgstr "Dokumentation"
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -730,14 +786,6 @@ msgstr "Inga tillgängliga"
 msgid "Add %(name)s"
 msgstr "Lägg till %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Användarnamn:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Lösenord:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Har du <a href=\"/password_reset/\">glömt ditt lösenord</a>?"
@@ -1790,7 +1838,7 @@ msgstr ""
 "Attributet \"%(attr)s\" på rad %(line)s har ett ogiltigt värde. (Raden "
 "börjar med \"%(start)s\".)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, fuzzy, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "%(optname)s med det här %(fieldname)s finns redan."
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 39f33ecb4122f567d1280be507f0b3f8e47e8145..551e6bcc594932f8e1df107f17b779e27e8b4ca9 100644
GIT binary patch
delta 25
hcmX@{l<~w<#tlC`xr}rTj1&wFt&B`JGkYD?004^q2`T^p

delta 25
hcmX@{l<~w<#tlC`xeRp;jTDTGtqct}GkYD?004^l2`B&n

diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index 9c4c2d2b7e..67bcbef22f 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: 2006-01-12 23:11+0100\n"
+"POT-Creation-Date: 2006-02-02 11:25+0100\n"
 "PO-Revision-Date: 2006-01-05 13:46+0800\n"
 "Last-Translator: limodou <limodou@gmail.com>\n"
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
@@ -280,6 +280,78 @@ msgstr "评论表格有一个无效的 'target' 参数 -- 对象 ID 无效"
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "评论表格无法提供 '预览' 或 '张贴' 功能"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "用户名："
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "口令："
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "修改我的口令"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "等级 #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "评论"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "自由评论"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "用户名"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -354,7 +426,7 @@ msgstr "日志记录"
 msgid "log entries"
 msgstr "日志记录"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "全有日期"
 
@@ -370,13 +442,13 @@ msgstr "请输入正确的用户名和口令。请注意两个域都是大小写
 msgid "Log in"
 msgstr "登录"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr "请重新登录，因为你的会话已经过期。不用担心：你的提交已经被保存。"
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -384,11 +456,11 @@ msgstr ""
 "看上去你的浏览器没有配置成接受 cookie 。请允许 cookie，重新装入本页面，再试一"
 "次。"
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "用户名不能包含 '@' 字符。"
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "你的邮箱地址不是你的用户名。换 '%s' 试试。"
@@ -466,26 +538,26 @@ msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。
 msgid "Change %s"
 msgstr "修改 %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, 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:620
 #, 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:649
 #, 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:652
 msgid "Are you sure?"
 msgstr "你确信吗？"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "修改历史： %s"
@@ -570,6 +642,7 @@ msgstr "XML文本"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "文档"
@@ -579,6 +652,7 @@ msgstr "文档"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 #: contrib/admin/templates/admin_doc/view_detail.html:4
 #: contrib/admin/templates/admin_doc/template_tag_index.html:5
@@ -592,28 +666,10 @@ msgstr "文档"
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -718,14 +774,6 @@ msgstr "无可用的"
 msgid "Add %(name)s"
 msgstr "增加 %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "用户名："
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "口令："
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">忘记你的密码</a>？"
@@ -1736,7 +1784,7 @@ msgid ""
 msgstr ""
 "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "带有这个 %(type)s 的 %(object)s 对于给定的 %(field)s 已经存在了。"
diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo
index 0a2f071b632989867e81a1565a30564b80ef2066..5e2e3c0e234fe99757b5614836b29df88ee4b641 100644
GIT binary patch
delta 25
hcmccql=1pg#tm~kxr}rTj1&wFt&GezFY`3i1OSMg2>Sp4

delta 25
hcmccql=1pg#tm~kxeRp;jTDTGtqhGeFY`3i1OSMb2>Ad2

diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.po b/django/conf/locale/zh_TW/LC_MESSAGES/django.po
index 8d07ac8a58..e6485e24f6 100644
--- a/django/conf/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_TW/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-12 23:12+0100\n"
+"POT-Creation-Date: 2006-02-02 11:26+0100\n"
 "PO-Revision-Date: 2005-12-28 23:30+0800\n"
 "Last-Translator: yungyuc <yyc@seety.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -280,6 +280,78 @@ msgstr "此評論表單有一個無效的 'target' 參數 -- 物件 ID 是無效
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "此評論表單沒有提供 'preview' 或 'post'"
 
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "使用者名稱:"
+
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "密碼:"
+
+#: contrib/comments/templates/comments/form.html:6
+#, fuzzy
+msgid "Forgotten your password?"
+msgstr "變更我的密碼"
+
+#: contrib/comments/templates/comments/form.html:8
+#: 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/registration/password_change_form.html:3
+#: 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/comments/templates/comments/form.html:12
+#, fuzzy
+msgid "Ratings"
+msgstr "等級 #1"
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr ""
+
+#: contrib/comments/templates/comments/form.html:27
+#: contrib/comments/templates/comments/freeform.html:5
+#, fuzzy
+msgid "Comment:"
+msgstr "評論"
+
+#: contrib/comments/templates/comments/form.html:32
+#: contrib/comments/templates/comments/freeform.html:9
+#, fuzzy
+msgid "Preview comment"
+msgstr "自由評論"
+
+#: contrib/comments/templates/comments/freeform.html:4
+#, fuzzy
+msgid "Your name:"
+msgstr "使用者名稱"
+
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -354,7 +426,7 @@ msgstr "紀錄項目"
 msgid "log entries"
 msgstr "紀錄項目"
 
-#: contrib/admin/templatetags/admin_list.py:245
+#: contrib/admin/templatetags/admin_list.py:241
 msgid "All dates"
 msgstr "所有日期"
 
@@ -370,13 +442,13 @@ msgstr "請輸入一個正確的使用者名稱與密碼。注意此二欄位都
 msgid "Log in"
 msgstr "登入"
 
-#: contrib/admin/views/decorators.py:57
+#: contrib/admin/views/decorators.py:61
 msgid ""
 "Please log in again, because your session has expired. Don't worry: Your "
 "submission has been saved."
 msgstr "請再登入一次，因為你的 session 已經到期。不必擔心: 你的提交已被儲存。"
 
-#: contrib/admin/views/decorators.py:64
+#: contrib/admin/views/decorators.py:68
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "cookies, reload this page, and try again."
@@ -384,11 +456,11 @@ msgstr ""
 "看起來你的瀏覽器沒有組態成允許 cookie。請啟用 cookie、重新載入此頁，然後再試"
 "一次。"
 
-#: contrib/admin/views/decorators.py:78
+#: contrib/admin/views/decorators.py:82
 msgid "Usernames cannot contain the '@' character."
 msgstr "使用者名稱不能包含 '@' 字元。"
 
-#: contrib/admin/views/decorators.py:80
+#: contrib/admin/views/decorators.py:84
 #, python-format
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "你的電子郵件地址不是你的使用者名稱。試著改用 '%s'。"
@@ -466,26 +538,26 @@ msgstr "%(name)s \"%(obj)s\" 已成功新增。你可以在下面再次編輯。
 msgid "Change %s"
 msgstr "變更 %s"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "在 %(name) 裡的一個或多個 %(fieldname)s: %(obj)s"
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "在 %(name)s 裡的一個或多個 %(fieldname)s:"
 
-#: contrib/admin/views/main.py:648
+#: contrib/admin/views/main.py:649
 #, 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:652
 msgid "Are you sure?"
 msgstr "你確定？"
 
-#: contrib/admin/views/main.py:666
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "變更歷史: %s"
@@ -570,6 +642,7 @@ msgstr "XML 文字"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:3
 msgid "Documentation"
 msgstr "文件"
@@ -579,6 +652,7 @@ msgstr "文件"
 #: 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/registration/password_change_form.html:3
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 #: contrib/admin/templates/admin_doc/view_detail.html:4
 #: contrib/admin/templates/admin_doc/template_tag_index.html:5
@@ -592,28 +666,10 @@ msgstr "文件"
 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:5
-#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/base.html:28
 #: 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
@@ -718,14 +774,6 @@ msgstr "沒有可用的"
 msgid "Add %(name)s"
 msgstr "新增 %(name)s"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "使用者名稱:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "密碼:"
-
 #: contrib/admin/templates/admin/login.html:20
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "你 <a href=\"/password_reset/\">忘記你的密碼了嗎</a>？"
@@ -1742,7 +1790,7 @@ msgid ""
 msgstr ""
 "在第 %(line)s 的 \"%(attr)s\" 屬性有一個無效值 (行開始於 \"%(start)s\")。"
 
-#: core/meta/__init__.py:1947
+#: core/meta/__init__.py:1944
 #, python-format
 msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr "此 %(type)s 的 %(object)s 已存在於給定的 %(field)s 裡。"
diff --git a/django/contrib/comments/templates/comments/form.html b/django/contrib/comments/templates/comments/form.html
new file mode 100644
index 0000000000..deb5540c92
--- /dev/null
+++ b/django/contrib/comments/templates/comments/form.html
@@ -0,0 +1,34 @@
+{% load i18n %}
+{% if display_form %}
+<form {% if photos_optional or photos_required %}enctype="multipart/form-data" {% endif %}action="/comments/post/" method="post">
+
+{% if user.is_anonymous %}
+<p>{% trans "Username:" %} <input type="text" name="username" id="id_username" /><br />{% trans "Password:" %} <input type="password" name="password" id="id_password" /> (<a href="/accounts/password_reset/">{% trans "Forgotten your password?" %}</a>)</p>
+{% else %}
+<p>{% trans "Username:" %} <strong>{{ user.username }}</strong> (<a href="/accounts/logout/">{% trans "Log out" %}</a>)</p>
+{% endif %}
+
+{% if ratings_optional or ratings_required %}
+<p>{% trans "Ratings" %} ({% if ratings_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):</p>
+<table>
+<tr><th>&nbsp;</th>{% for value in rating_range %}<th>{{ value }}</th>{% endfor %}</tr>
+{% for rating in rating_choices %}
+<tr><th>{{ rating }}</th>{% for value in rating_range %}<th><input type="radio" name="rating{{ forloop.parentloop.counter }}" value="{{ value }}" /></th>{% endfor %}</tr>
+{% endfor %}
+</table>
+<input type="hidden" name="rating_options" value="{{ rating_options }}" />
+{% endif %}
+
+{% if photos_optional or photos_required %}
+<p>{% trans "Post a photo" %} ({% if photos_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}): <input type="file" name="photo" /></p>
+<input type="hidden" name="photo_options" value="{{ photo_options }}" />
+{% endif %}
+
+<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
+
+<input type="hidden" name="options" value="{{ options }}" />
+<input type="hidden" name="target" value="{{ target }}" />
+<input type="hidden" name="gonzo" value="{{ hash }}" />
+<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p>
+</form>
+{% endif %}
diff --git a/django/contrib/comments/templates/comments/freeform.html b/django/contrib/comments/templates/comments/freeform.html
new file mode 100644
index 0000000000..0c52bfab29
--- /dev/null
+++ b/django/contrib/comments/templates/comments/freeform.html
@@ -0,0 +1,11 @@
+{% load i18n %}
+{% if display_form %}
+<form action="/comments/postfree/" method="post">
+<p>{% trans "Your name:" %} <input type="text" id="id_person_name" name="person_name" /></p>
+<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
+<input type="hidden" name="options" value="{{ options }}" />
+<input type="hidden" name="target" value="{{ target }}" />
+<input type="hidden" name="gonzo" value="{{ hash }}" />
+<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p>
+</form>
+{% endif %}
diff --git a/django/contrib/comments/templatetags/comments.py b/django/contrib/comments/templatetags/comments.py
index c2c4ab47d5..9c829bb761 100644
--- a/django/contrib/comments/templatetags/comments.py
+++ b/django/contrib/comments/templatetags/comments.py
@@ -1,6 +1,6 @@
 "Custom template tags for user comments"
 
-from django.core import template
+from django.core import template, template_loader
 from django.core.exceptions import ObjectDoesNotExist
 from django.models.comments import comments, freecomments
 from django.models.core import contenttypes
@@ -8,56 +8,8 @@ import re
 
 register = template.Library()
 
-COMMENT_FORM = '''
-{% load i18n %}
-{% if display_form %}
-<form {% if photos_optional or photos_required %}enctype="multipart/form-data" {% endif %}action="/comments/post/" method="post">
-
-{% if user.is_anonymous %}
-<p>{% trans "Username:" %} <input type="text" name="username" id="id_username" /><br />{% trans "Password:" %} <input type="password" name="password" id="id_password" /> (<a href="/accounts/password_reset/">{% trans "Forgotten your password?" %}</a>)</p>
-{% else %}
-<p>{% trans "Username:" %} <strong>{{ user.username }}</strong> (<a href="/accounts/logout/">{% trans "Log out" %}</a>)</p>
-{% endif %}
-
-{% if ratings_optional or ratings_required %}
-<p>{% trans "Ratings" %} ({% if ratings_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):</p>
-<table>
-<tr><th>&nbsp;</th>{% for value in rating_range %}<th>{{ value }}</th>{% endfor %}</tr>
-{% for rating in rating_choices %}
-<tr><th>{{ rating }}</th>{% for value in rating_range %}<th><input type="radio" name="rating{{ forloop.parentloop.counter }}" value="{{ value }}" /></th>{% endfor %}</tr>
-{% endfor %}
-</table>
-<input type="hidden" name="rating_options" value="{{ rating_options }}" />
-{% endif %}
-
-{% if photos_optional or photos_required %}
-<p>{% trans "Post a photo" %} ({% if photos_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}): <input type="file" name="photo" /></p>
-<input type="hidden" name="photo_options" value="{{ photo_options }}" />
-{% endif %}
-
-<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
-
-<input type="hidden" name="options" value="{{ options }}" />
-<input type="hidden" name="target" value="{{ target }}" />
-<input type="hidden" name="gonzo" value="{{ hash }}" />
-<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p>
-</form>
-{% endif %}
-'''
-
-FREE_COMMENT_FORM = '''
-{% load i18n %}
-{% if display_form %}
-<form action="/comments/postfree/" method="post">
-<p>{% trans "Your name:" %} <input type="text" id="id_person_name" name="person_name" /></p>
-<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p>
-<input type="hidden" name="options" value="{{ options }}" />
-<input type="hidden" name="target" value="{{ target }}" />
-<input type="hidden" name="gonzo" value="{{ hash }}" />
-<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p>
-</form>
-{% endif %}
-'''
+COMMENT_FORM = 'comments/form'
+FREE_COMMENT_FORM = 'comments/freeform'
 
 class CommentFormNode(template.Node):
     def __init__(self, content_type, obj_id_lookup_var, obj_id, free,
@@ -104,15 +56,15 @@ class CommentFormNode(template.Node):
         context['options'] = ','.join(options)
         if self.free:
             context['hash'] = comments.get_security_hash(context['options'], '', '', context['target'])
-            default_form = FREE_COMMENT_FORM
+            default_form = template_loader.get_template(FREE_COMMENT_FORM)
         else:
             context['photo_options'] = self.photo_options
             context['rating_options'] = normalize_newlines(base64.encodestring(self.rating_options).strip())
             if self.rating_options:
                 context['rating_range'], context['rating_choices'] = comments.get_rating_options(self.rating_options)
             context['hash'] = comments.get_security_hash(context['options'], context['photo_options'], context['rating_options'], context['target'])
-            default_form = COMMENT_FORM
-        output = template.Template(default_form).render(context)
+            default_form = template_loader.get_template(COMMENT_FORM)
+        output = default_form.render(context)
         context.pop()
         return output