From ef9ce5e60087b02f851c52af4b683279e24be6ff Mon Sep 17 00:00:00 2001
From: Georg Bauer <gb@hugo.westfalen.de>
Date: Fri, 4 Nov 2005 17:24:13 +0000
Subject: [PATCH] new_admin: updated all translation files for new message IDs
 and updated german translation

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1085 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/conf/locale/cs/LC_MESSAGES/django.mo   | Bin 16988 -> 16988 bytes
 django/conf/locale/cs/LC_MESSAGES/django.po   | 537 ++++++++++++-----
 django/conf/locale/de/LC_MESSAGES/django.mo   | Bin 21838 -> 21916 bytes
 django/conf/locale/de/LC_MESSAGES/django.po   | 132 +++--
 django/conf/locale/en/LC_MESSAGES/django.mo   | Bin 421 -> 421 bytes
 django/conf/locale/en/LC_MESSAGES/django.po   | 502 +++++++++++-----
 django/conf/locale/es/LC_MESSAGES/django.mo   | Bin 5203 -> 5203 bytes
 django/conf/locale/es/LC_MESSAGES/django.po   | 539 ++++++++++++-----
 django/conf/locale/fr/LC_MESSAGES/django.mo   | Bin 17763 -> 17763 bytes
 django/conf/locale/fr/LC_MESSAGES/django.po   | 539 ++++++++++++-----
 django/conf/locale/gl/LC_MESSAGES/django.mo   | Bin 5322 -> 5322 bytes
 django/conf/locale/gl/LC_MESSAGES/django.po   | 539 ++++++++++++-----
 django/conf/locale/it/LC_MESSAGES/django.mo   | Bin 16820 -> 16820 bytes
 django/conf/locale/it/LC_MESSAGES/django.po   | 540 ++++++++++++-----
 .../conf/locale/no_NB/LC_MESSAGES/django.mo   | Bin 17318 -> 17318 bytes
 .../conf/locale/no_NB/LC_MESSAGES/django.po   | 537 ++++++++++++-----
 .../conf/locale/pt_BR/LC_MESSAGES/django.mo   | Bin 16668 -> 16668 bytes
 .../conf/locale/pt_BR/LC_MESSAGES/django.po   | 540 ++++++++++++-----
 django/conf/locale/ru/LC_MESSAGES/django.mo   | Bin 5134 -> 5134 bytes
 django/conf/locale/ru/LC_MESSAGES/django.po   | 539 ++++++++++++-----
 django/conf/locale/sr/LC_MESSAGES/django.mo   | Bin 16564 -> 16564 bytes
 django/conf/locale/sr/LC_MESSAGES/django.po   | 542 +++++++++++++-----
 .../conf/locale/zh_CN/LC_MESSAGES/django.mo   | Bin 15626 -> 15626 bytes
 .../conf/locale/zh_CN/LC_MESSAGES/django.po   | 535 ++++++++++++-----
 24 files changed, 4393 insertions(+), 1628 deletions(-)

diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index 82973470106c4a46dc0ea7208aee4e3356c2c0bb..792ea342d1902fb24ecb09db6556e424b7696cca 100644
GIT binary patch
delta 23
ecmcc9!g!~Jaf5&choOa)k&(86;bsX97byT;<_4Dl

delta 23
ecmcc9!g!~Jaf5&chk>P)k)^JI*=7k17byT<QU;{}

diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index 9efc833280..cb17afc08e 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\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: 2005-10-31 19:42+0100\n"
 "Last-Translator: Radek Svarz <translate@svarz.cz>\n"
 "Language-Team: Czech\n"
@@ -15,38 +15,288 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Vítejte,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "čas akce"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "object id"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "object repr"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "příznak akce"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "zpráva změny"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "log záznam"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "log záznamy"
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Přihlášení"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Přidat"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Změnit"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Změnit"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "Změnit heslo"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odhlásit se"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "čas akce"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Datum/čas"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "E-mailová adresa:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "Prosinec"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "e-mailová adresa"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Vložte celé číslo."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Přidat"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Změnit"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nemáte oprávnění nic měnit."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Poslední akce"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mé akce"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nic"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "Domů"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Stránka nenalezena"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
-
 #: contrib/admin/templates/admin/500.html:4
 #, fuzzy
 msgid "Server error"
@@ -69,6 +319,7 @@ msgstr ""
 "měla by být brzy odstraněna. Děkujeme za trpělivost."
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Historie"
 
@@ -104,6 +355,45 @@ msgstr "Django správa webu"
 msgid "Django administration"
 msgstr "Django správa"
 
+#: 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>"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Stránka nenalezena"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
 msgid ""
@@ -127,53 +417,38 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ano, jsem si jist"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Přidat"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Vítejte,"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Změnit"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Změnit heslo"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nemáte oprávnění nic měnit."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odhlásit se"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Poslední akce"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mé akce"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nic"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Uživatelské jméno:"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
 
-#: 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>"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Přihlášení"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Děkujeme Vám za Váš strávený čas na našich webových stránkách."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Přihlašte se znova"
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "aktivní"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -191,6 +466,49 @@ msgstr "Změna hesla byla úspěšná"
 msgid "Your password was changed."
 msgstr "Vaše heslo bylo změněno."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "Obnovení hesla"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo "
+"obnovíme a zašleme Vám e-mailem nové."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-mailová adresa:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Obnovit mé heslo"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Děkujeme Vám za Váš strávený čas na našich webových stránkách."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Přihlašte se znova"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Obnovení hesla bylo úspěšné"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) "
+"byste ji dostat během okamžiku."
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -215,25 +533,6 @@ msgstr "Potvrdit heslo:"
 msgid "Change my password"
 msgstr "Změnit mé heslo:"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Obnovení hesla"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Obnovení hesla bylo úspěšné"
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) "
-"byste ji dostat během okamžiku."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "Dostal(a) jste tento e-mail, protože jste požádal(a) o obnovení hesla"
@@ -265,50 +564,6 @@ msgstr "Děkujeme za používání našeho webu!"
 msgid "The %(site_name)s team"
 msgstr "Tým %(site_name)s"
 
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo "
-"obnovíme a zašleme Vám e-mailem nové."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "E-mailová adresa:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Obnovit mé heslo"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "čas akce"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "object id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "object repr"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "příznak akce"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "zpráva změny"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "log záznam"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "log záznamy"
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Pondělí"
@@ -488,10 +743,6 @@ msgstr "přesměrovat"
 msgid "redirects"
 msgstr "přesměrování"
 
-#: models/core.py:81
-msgid "URL"
-msgstr "URL"
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -655,53 +906,53 @@ msgstr "Důležitá data"
 msgid "Message"
 msgstr "Zpráva"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr "Česky"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr "Německy"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr "Anglicky"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr "Španělsky"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr "Francouzsky"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 #, fuzzy
 msgid "Galician"
 msgstr "Galicijský"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr "Italsky"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr "Brazilsky"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr "Rusky"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 #, fuzzy
 msgid "Serbian"
 msgstr "Srbsky"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -970,11 +1221,11 @@ msgstr ""
 "Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s "
 "\"%(start)s\".)"
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr "Oddělte více identifikátorů čárkami."
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 2cab9505f7c6bc44ed5cc7b540f2025216a3bacf..835505006168687b625715c72e327984175cdd76 100644
GIT binary patch
delta 5782
zcmYk=34Bz=0mt!K2ssFtkOUG8$0Hy~kZ>fNMj#jh5fZ=xB8tR?EMz$ra&an)C`1Jm
zx`K#`l*1w_ZCIcdQL&1O2o;c8Z!J<pidc$xfY{%E-_TFz<A1+1Z{N<FnK$o6J-p5H
z<a3_jXGu}34W)s{m{!<1)|fk}-<YVQ#%yhFOc6ed?eQFr#^e^pjKB)yka-bP@Gwrq
z6PSjBQ;mtnGHi&GZF?%l851;>ZpAFXMx3w&YjGJiMGw71VFIe76x4;%u?=>^4mbko
z(A1#LTWH%$Fp2gf){U4zdl$xYeY2km|Cl3uG{bLD9bQHas9j5Di<ziJ$+zti)CKQC
z4R9*5cxEPEgL6>>sl#}D7@xs)*cS(0%gS+mvw(^&yb9alCR7LeQ6qgHGw>^n!I*So
zI${E5VK2<XGHi_@)UB#V-J0X5^Uq*+OyWKd!$BCFL}euv&ENuR20vjRY(Q_CVLr~r
zBGiobT3<(<|Bh`RL#^0Hw*3Vb&_0D4coz3d*Xf3hv1c3Be+ZQV4rrzi;61n&^@A2|
z-Q#Ug?JlSedf9fqZ5LXLQ3EW+CO8`PJ1<tFA2ab&?1hb-AfupiqvMXe3bjk;qJDTc
zs>AzHBVLBulxt9%YBOGse?r}|6Q~tCj~eJ@)CzgHuWC0&^_zg|CpAb#_vSk6f+f}k
zs0(jHbx@DGz#h~}9YD5&`OqG}fb1*Nkd2}Nv_=g$6SetrQ5WowTA32;kHK+N#!*>|
z1$Z7E%wq>F#nHGJKgJF?fsb6g4>jQ3ScfNZ63)2J9q19%rv3so<MXJA{ESi9kXiE>
z2Td#$jl4B#q`gryD8yte#YX70$ETn=tVA}nnTMLuYSb;+Xx)Vx(A%i<J7>BtxE`p1
z-Gb3v-%O&S5luxc$xPJJZpSh_fSPG`miyS;hTUjywjM`bb|yO8{k}D7Px(=M<7wo9
zG6#`GG+*OVY|_b?F<jq-sHlU}sHN4fv^(>V)iP7@He88g@icbDft}s=MI~zBAsm87
zF&3}QaVORuV`yg~ch_{ohByj?y7yzLFiBI7OvZeOT9F1!I}T%zYno=LThR|SfI@77
z)i?zgVQ>5zC!@nj`h6X0K&!0luqo|LU0Hv1T+e~l_$g|sE@2_2vCjE89=VNXE$Y_1
ziW=xg7>^Bkt;qz8#&pySGw>Shh#Ejo)JpV64SaBS)?XtT#Q}BTwO`Dz?fIw<mSO^~
zw#T=i9<O@T4ENgho2Y>vL9Nt}_V^Xld2!rdT_+jUZX2YcrOvhoy4Vx?phh|fHS!Yc
z7)+u)!L}<=6PS<c_yJVMkD}iF>rwseM9p|F>bwJ}euKxUXaJv~MtlNw;%Q98i>M34
z<hkEBNBuAz6Fs~Wa4PMdJ&ei04X8bJ7)vmVM}fcOrWUoySKu_<j64lNlgL)rJ?nuQ
zX+COc3sFlx95tf}r~y`B9R`pWh`ETGKs-B7{Ul-%rlNzLFbjvFCQ^esZ!yN{`G1f~
zDhEQS4xd9^cpqx1-a`jJ!RGi2w#8)rMC$uI>j2b>4Z~(Q9yO5wYJl@lE4L8!yE=@C
zJpWX*<WJyk+=|6m*4OQ5E2h%kgPC{~wJCo_4K(fs_dU=Ob%A{3D>Dcgt67LQ<8I7G
zJyPsP(+Pu`$#^Q<E^{~XkE!QFKRAoCvG<Mc47Q_|E{xoEvj=r+zC}&sN7T&b_H%FL
z{iyGk+x8mN@7LS*mVW%KfCDdZKuh&4>K^}O+rQ#4+KqX=X~wtW0`#F~`Xy?qzd>F2
zGHR(~2e=n%ifX4=TcUo~2DNgT1A^{>-W<4x0|l6cui$Vzg&IJw0=J{Zs258eYQW1-
zGg^Zh;8UoMpT`!s7kNjSW2oa%1Kr=Hpa#}9NJS&+U=QS=o`PJ|4{pHgaVToZXJcpF
zhT1b9pa$|4YV)4M$c1il->505O`D4uSd6+Q(@?(;)>6^P7o(PP73wkBghg17<@f_?
zZ;a=?tWCHUSKvNeh{FfDD|ZOF3+5tf;63T&S@dEV#t(KM&uMtAw#`B+T7kz=Gv8?4
z=AK}7U~7&aLe1<9YUG!&CB_bM_e=(AW?88IaxoqAQRk0Ey%)+c4d-CFw(UwP`oZ_8
z5nn+EI~BVF8irA{M<J_gZo|&F4t@9*>T$}snGK3%*adf6Pa-olDMQ^A?TS3%rWSL!
zzS&Nt4Ss?h@e;1b40hh__!?@atxDJj*b5n>xfgZ*0j$LDa2!r7bvNB!%%*)7HSpBo
z#*D;q*ci8AP&3;_B^LK!Ccci^<!4X>IA@O!9pQFVg*tyHHpQ2b*SR@pk9)XE4(-O6
zfPL_8EJp32{kRA{x3K=|Xz?xX^ScbyehhW5Heh!Qqkec2yI{NDxG$`c$TiIp%);Z?
z3a?-{OdsX;Q-T^u88*V1s0r4NV*L}T%;SJA{18TC2(?7(unBHK&2$IG<39WSyY~18
zsK@N2{r(ch(2g1H_M3olw9`<p<P6k6ZVyt?0PaE!pb~X~`KSRbMctxRs1DYk2C@Ow
z!FJSuccOm(5~{y9Q0E^<o&Py%B4<(k|BTv{!RRsWNZX-K%toEi8`VLf{k{}+fibA_
zCZNunj=JDn)PNpDUFZ??pvpX#$gTV*b!~c;{i@bcVK9;MEuT|uUHAJfTjzF~r${n+
zjVvek6BYe|S{14BpJB-R$h>0PMc9oDBX^JxSwd9aBp0p@<$=f{cS-o0WBx<Z$vJzR
z$wbN=K6{dPNqf?kbRsIRx<o$p9#HWT?R@sFIYLg8$B2rawBKtfw0!>}+L78cYsev@
zQbD$o8KfEcfLtwKQaM8wlh5oy_MMqYrjX}}Zq?PYi^@Tw{dAs`lRJC!p>me2CD)OG
zWH5P>@aRY0b}9HeDJ56S8&rnahJ(k*pUEO}nEViGnUo$^PfcZ0s9#dso;#@N?WeMW
z3?&b$LHV4#OrBAL(%;2=7+RH-9;~7DSMoIJOD+?YKe|LdxAQrP=wbgiSwPm2T5`4Q
zrSdhIU=MsMJv<UHg8YtLPgW8YAMtqDDFG_eb%e4n^2y&_%&>KFiu^?Wt_I}*c_>oj
z<zN*r*!l@9BQ0!u12!Rg^d2TEjmS~GHmazUkY!{fQ3;ccWFq+od7HE%SIex>m&wV&
zmuPk%zmQ+aZldxxa*;erJ|=e(z43n}spK!Dn0!M1zdUXmU2#0wOl~4O$sfpAa-3Wt
zIs99U`G`tOqB4yPh}7Iy$~(61w?2WtCEt*3p%+rxm%d2tIr2W4O9qkqNJpY_i8Lk)
zNgA0?RC3ApWDm(A4al=vkTG9SQ^_V>$amx(qEb!TkmjTZsU-K3)#N>L4cS8Uzf6~+
z$|GcbcuDgS@iA3%d{g}1K=_FBQln=68MCJQC;NTnPGN;V;H&n9AL_WHNmQR3a&yB4
zdCQ|46y<~u^*!65*GO-5^_-biHO_2b)f8WKwJ$KhDe?y<dnZ*m<$j-2lvC>UPtO@x
zUZpP`pFc3gH_;dJ^lP5?zn^+*C+iC*;H&jjJGFswhi=M!0jJzs?acC3*-o7Kwc*?Q
z)q7%#syMU885m9+aLN-K8F%%hitvSkanWhF`l{$km#?8Ockq6`4V4Tz(EnDyZ#vx$
z@&=}Lrt{C8QH-#{&lPm}Szd1yW2mX|Ii>zUZ4GBKsfktU%c<~A4Cfbjjcr=u^Oy63
UX)^<X8eb?lGA;b%$Q@Dt1pxH3VgLXD

delta 5730
zcmYk<349gB0mtzPgdBt;2_YQ8WCIwk#0UmZB!mbU!eO}NROusGk{EnIUIK{VL$m^l
z77SNg6etC&pn%U>0ktBch=2-I1%#p&DGE|V4y8nY|F^@Z-4Flwo!PfLJ2N}GFRa`U
zvH!)0;PJ%BrAAwXF|D9gj4|U>jt}oO^P3vekKzJsgCF4tynsd6KiL?HW(6kU%Qyjd
zVsp%BW=s_3VO_k_)(2p$F+nrbE0}Ruj{{t+#tLkRUt%PlLpAgx>OxmB72~-|Tg*lp
zG$T;Q-Dm4ACQ_elor{gBFU2^nZ`M)ZpV`7k0`5UI_ywv%5iN{qg3+i+NwM`z)CGH^
zIyeBCJX3^?a5SnTr5J~PT#qyHHcW5H%yE4)j)E>c71QxiR0Hc!J$)5h<GUD*r!WK0
zVS7wYG3FM`!y7Pwx>bu&x8|>?<3GgC_yZ2aw%qSvF@-4<G=f8@5gf)_@hj8_Q)qP>
z-iR8}O6ywG@h{qX2sLBdZ2fKQP5pgT$78r(x=uXS$EK;we*p!D9U5sF&c+$26E4~P
zwYJ_U&1)bT^?i!1x3RWIbubGXU=HfId<<YAw!=5E8=g!H8q<|RE63~kFw`m?jXLoj
zRD&g`9#^0i<uufydJH?^a?~x`i5lSn)XaQl>nBj{okX2~7IjOm1}WS`p*1&N4n<vX
z4yu89sD>AzW@r_1+s!7se-E;r%wg26x`68FHPoVuVd3b4NvIiVjlD1%$6(M;p*Mxy
z=wK`>=W*<ab8!o{#T-7m;22a#7venJj>XvLMz5pKqZadPs1ff*4di2t#KWk^_c+q=
zpt(RnJ#EN*Xap^=3AVv{*xl~WMKxG}EMQZF8c_x6R?I+k<Vn<V=aBVlE~7e>)XtmP
z3{*$5u$P|yE)+DSQ*k^lM2+wa>M==aZ_LeDYF&ZJ)IUIde*(3JGCO!{VFK#HPa~6O
zHsIs<5#Eg>J9_7D#4cRl?4+R8cnO&dlhug@h{JIdZp3Vi%=F$5IjDO$5({uC#^5p3
z$iBg7{0_OR<^tBm<Sg%=w?xKfsxV0B%}NS7aTmto9^{(l5b73aI@EzEY=GUc6#HOz
z+<+7DYt;DzI9MGTVZ9d{QlE%ww+eYBnAO?LzozOfcJ#rccsr&s-`qAc4s~nhqB{C4
z#^HO`0~kg9IBJ9^u@Rm|b>IqWCL(z4spGMzjwGYnY1^6k*B3Y29l59m3b8Scw)@Ml
zKJ_Zp2!po10M*eYsF~Vs_wPU*w-<GxPi_4x)J&hT_48^-2V6z<G@55jJ#TDnj#}O6
zww{9;K`!dNfv5|OLcQyKsCK5K1{Opew-D9t3RDNypgJ5}PeBK6#CY6_y1*WLz~`tF
zkL&vgethtL>Q`=Ip<;24x2P85AnM;Czs%-V9tk}qL$Cr%QBT7`)GfP=bTnvcDQIe=
zcmy=%38)dJqk7m0=V52mi(@Nl1p8499mGUDf)1X=_SlG(seyDy9oG-l?jUT2BQZ(O
zzn_9G{3vRwYS6(|*c9K!H2l<lf5}>hpGeJEBTT?F)Id6;I@l96bNQ%t2cT}vNYsqq
zhp*}Rub|K$Ti@n2RDsQ?&&GDR6tyVdwC=@p>PJx*xQ6^QQ9ZoJu{Rb{pMf3l9b|c#
zGpK>2@`!PlOfL-TaSQOF6E@*A{0TLJDLuWZt440OnT49d&A0})p+<I3t~atW)b~?t
zeI{z^=i2%L>`i?!YNih4GXJ{A$Lx-;aUk{YQ6uibYwjT|M2&P8YO436E_?#j(KDzE
zowxNX)@!Kq>g0J-9*3$o$Jv;k7xWg(Dt6q(j@_sZH0$j(T#S0Ll%aY&33Z|As181i
zT02i+GCqsEbIhx#{U=c!yokE+&$eDS-<z?RAO#&5kDbs#P4ytm#5t(N@)D{8+fYxz
zF4TEP@CN)AwOC{B@ZR~Us9TYbI)5Ol!=q6%Sc-Z&f)7&YM`0e8;6CK`n=ZVMwfOw_
z6fVPuv29;(#?~UUYxbf#9!DcDV0RpkU!oq%{5!o@_z2VtOh!EgGdzQ4jy+&LY9wn>
zBin)M`6t){k7GT&f*M&Zs==57@9%*G)bUxU3->?`XfW!yS5O_@jt-u}Xg&Wi{k?k>
zj~)1;DQ03Gx;P2-_#D8I7+L83eK5}Y1h!=VR%FoT5b{KumIJ&u<Zw)-{s?B^YJ3jg
z$FW@BOk~ArggcOZ<|xuRlQGCU!H-j^FU2t!J=j}hKI}mK8RYhxH*g5nVtp)PMMvUT
zjKT5P4$DxBdJzW4QdnZYIEQMeS&?_b7;H#=0(QkIcK>?JqP__m<1w6tXOT%V_tT3x
z7(!h*XQ=nM=A!C_s9Q8_DD&T$g3Asqy5)Ei9z?yN>J0P#li3~HQ=f;ea5L&L+lPr*
zi|R<iaBq#Iqej>c<FOO!!aXqx`=MrN&~WCz0fkZQ&`3)#4lC^e58M3<P><Jg`~6E8
zO?@k>;T;%@dyt<8a|pFq8;tNekcc|24XXW2R0nPiQqVo>gKD5Zsw2Zt4g3bx<B6yS
z9zcy~8tV9YsN)x-2C@oufsLp|`8ukj2T{izwcnpcogcht5BLRjf#|!v1LIK*rJ^p_
z5!IpFQ5VX`2-G&iBYZ3WMOp6&Z9B>1gr>vW89vKxS+{!^*AG{@eddp(3HdvDk~~VZ
zRg*>G691FMKI9Es?}s;&fn*$chCD{Jy-R)wm%P6pRMd>{(_+q(6mr&HKm2z&_3*D>
zSKLF|kTlYfXnWHm{HgbVHXnJ2uwKna<P^ES=}}upG<)BYx<t2PDfy6SE7kbdlSw3j
z{DWNI{z>69d4zmnce1XG-<DrQ-P7w^h{6X%>*+tFglI8p`;IIlHxfPKcalGlTps!G
z+b#)rkiq2o_6~&tTXFCc@;9PR?<E&&Zc9vw-9$;-nwonP)4Fb^q_>~8g=7GkuL|2S
zvYq@{6*m2TX#1>YOJYheKxrR&mgvu!pNY1YJ;I+G`79=S*w2xfWCf`r*SBpHz9IM7
z9Y?X2Tp>kd73oBNN3^-*7Y*tG3KiPJ_LhhF3R~N<I7u#(PgP-ipDYNM`0tNZY_R1o
zaXd-3_2;kwi6u|jef98T-KnV*29YPo5Tb1hSxqL86XZRjSK#$+a!o{1li*gWZOK(~
zjl4><9U?!H8giK2OU9B*q#1de^e0Ei|8L7}B^&P{e<F8~SIA3b6gf!#OS1T_HJ?*x
zLA2dZ^1>zWm9pEG%dEf0#pK`QFE#s;+6;b;(hKAOnNIqWxg>*V`-#*ivq^LEAko%^
zTp+KL_M{GZUK4WnaZ1`c5dETjPi7Hql_ZrkB{^gYnM0P4{iG3DOZ0yGtz>(etPHJd
zS`-(mbzZL*`XFO-gUD_@x^xfCzGY!lgd2+Makfs^;pMJV=9}R9ox-w8XQ1o%PoG>_
z<xF!cOWi=g_2)SSuD;cA6UwWqTpd@FaC?){PPM<pnO<J$1l+2b98uy6{O^2U^+d-l
z_p{sYR`WT^rBR&_C@w26uF&CRid*TpgMH<b9G`cEN?&y#G%a^aM7_J*YR4DK&N~$m
zO3xn|RkNsIcSc{IzrxMbg#zLJ=mNA{K8dcm<uo5~ru!;G%lc=>bnX{$s;YI#fHTQ0
lFUfQmW2IBVD181>cjDyA5_;r1!`*T|D|~)`==6|K<gd11tYZKG

diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index 8f4ee10978..3640458d3c 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 16:27+0100\n"
+"POT-Creation-Date: 2005-11-04 18:22+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"
@@ -108,11 +108,11 @@ msgstr "%s zur 
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugef�gt."
 
-#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
 msgid "You may edit it again below."
 msgstr "Das Element kann jetzt weiter ge�ndert werden."
 
-#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:656
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
 #, python-format
 msgid "You may add another %s below."
 msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden."
@@ -122,36 +122,36 @@ msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden."
 msgid "Add %s"
 msgstr "%s zuf�gen"
 
-#: contrib/admin/views/main.py:612
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "Added %s."
 msgstr "%s hinzugef�gt."
 
-#: contrib/admin/views/main.py:612 contrib/admin/views/main.py:614
-#: contrib/admin/views/main.py:616
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
 msgid "and"
 msgstr "und"
 
-#: contrib/admin/views/main.py:614
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "Changed %s."
 msgstr "%s ge�ndert"
 
-#: contrib/admin/views/main.py:616
+#: contrib/admin/views/main.py:617
 #, python-format
 msgid "Deleted %s."
 msgstr "%s gel�scht."
 
-#: contrib/admin/views/main.py:619
+#: contrib/admin/views/main.py:620
 msgid "No fields changed."
 msgstr "Keine Felder ge�ndert."
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:645
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich ge�ndert."
 
-#: contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:654
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -159,31 +159,31 @@ msgstr ""
 "%(name)s \"%(obj)s\" wurde erfolgreich zugef�gt. Das Element kann jetzt "
 "ge�ndert werden."
 
-#: contrib/admin/views/main.py:691
+#: contrib/admin/views/main.py:692
 #, python-format
 msgid "Change %s"
 msgstr "%s �ndern"
 
-#: contrib/admin/views/main.py:771
+#: contrib/admin/views/main.py:772
 #, 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:776
+#: contrib/admin/views/main.py:777
 #, 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:805
+#: contrib/admin/views/main.py:806
 #, 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:808
+#: contrib/admin/views/main.py:809
 msgid "Are you sure?"
 msgstr "Sicher? Ganz sicher?"
 
-#: contrib/admin/views/main.py:823
+#: contrib/admin/views/main.py:824
 #, python-format
 msgid "Change history: %s"
 msgstr "�nderungsgeschichte: %s"
@@ -293,9 +293,10 @@ msgstr "Keine vorhanden"
 #: contrib/admin/templates/admin/change_form.html:12
 #: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "Start"
 
@@ -369,9 +370,14 @@ msgstr "Passwort:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Ja, ich bin sicher"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Seite nicht gefunden"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Leider konnte die angeforderte Seite nicht gefunden werden."
 
 #: contrib/admin/templates/admin/change_form.html:20
 msgid "View on site"
@@ -463,6 +469,49 @@ msgstr "Erfolgreiche Kennwort
 msgid "Your password was changed."
 msgstr "Ihr Kennwort wurde ge�ndert."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "Kennwort zur�cksetzen"
+
+#: 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 ""
+"Passwort vergessen? Einfach die E-Mail-Adresse eingeben und wir setzen "
+"das Passwort auf ein neues und senden das per E-Mail zu."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-Mail-Adresse:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Mein Kennwort zur�cksetzen"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Vielen Dank, da� Sie hier ein paar nette Minuten verbracht haben."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Erneut Anmelden"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Erfolgreich Kennwort zur�ckgesetzt"
+
+#: 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 ""
+"Wir haben Ihnen ein neues Kennwort per eMail zugeschickt an die Adresse, die "
+"Sie uns gegeben haben. Es sollte in K�rze ankommen."
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -488,25 +537,6 @@ msgstr "Kennwortwiederholung:"
 msgid "Change my password"
 msgstr "Mein Kennwort �ndern"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Kennwort zur�cksetzen"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Erfolgreich Kennwort zur�ckgesetzt"
-
-#: 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 ""
-"Wir haben Ihnen ein neues Kennwort per eMail zugeschickt an die Adresse, die "
-"Sie uns gegeben haben. Es sollte in K�rze ankommen."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "Sie erhalten diese Mail, weil Sie ein neues Kennwort"
@@ -878,34 +908,38 @@ msgstr "Wichtige Daten"
 msgid "Message"
 msgstr "Mitteilung"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:38
 msgid "German"
 msgstr "Deutsch"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:39
 msgid "English"
 msgstr "Englisch"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:41
 msgid "French"
 msgstr "Franz�sisch"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr "Galicisch"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr "Italienisch"
 
+#: conf/global_settings.py:44
+msgid "Norwegian"
+msgstr "Norwegisch"
+
 #: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr "Brasilianisch"
@@ -920,7 +954,7 @@ msgstr "Serbisch"
 
 #: conf/global_settings.py:48
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "Vereinfachtes Chinesisch"
 
 #: core/validators.py:58
 msgid "This value must contain only letters, numbers and underscores."
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index 73d55e8c6f11378dc8cdd79e5e5eae115042d63c..053b81a3e4450397ba8e381e5e7c6f10b13fb102 100644
GIT binary patch
delta 18
acmZ3=yp(yuJ`O_*D<dOq1H*~O?gIcgSq5+b

delta 18
acmZ3=yp(yuJ`Mv*D<ex?1G9<8?gIcgsRn)k

diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 611d2e0746..b5814f89a5 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,38 +16,282 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, python-format
+msgid "Changed %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, python-format
+msgid "Change %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, python-format
+msgid "Change history: %s"
+msgstr ""
+
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+msgid "Date (without time)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:267
+msgid "Date (with time)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:268
+msgid "E-mail address"
+msgstr ""
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+msgid "Decimal number"
+msgstr ""
+
+#: contrib/admin/views/doc.py:274
+msgid "IP address"
+msgstr ""
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+msgid "Phone number"
+msgstr ""
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr ""
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr ""
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr ""
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr ""
-
 #: contrib/admin/templates/admin/500.html:4
 msgid "Server error"
 msgstr ""
@@ -67,6 +311,7 @@ msgid ""
 msgstr ""
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr ""
 
@@ -100,6 +345,45 @@ msgstr ""
 msgid "Django administration"
 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 ""
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr ""
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
 msgid ""
@@ -119,52 +403,36 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
 msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
 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 ""
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr ""
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr ""
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
 msgstr ""
 
 #: contrib/admin/templates/registration/password_change_done.html:4
@@ -183,6 +451,45 @@ msgstr ""
 msgid "Your password was changed."
 msgstr ""
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr ""
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr ""
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -205,23 +512,6 @@ msgstr ""
 msgid "Change my password"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr ""
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr ""
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
@@ -253,48 +543,6 @@ msgstr ""
 msgid "The %(site_name)s team"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr ""
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr ""
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr ""
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr ""
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr ""
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr ""
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr ""
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr ""
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr ""
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr ""
@@ -471,10 +719,6 @@ msgstr ""
 msgid "redirects"
 msgstr ""
 
-#: models/core.py:81
-msgid "URL"
-msgstr ""
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -628,51 +872,51 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -921,11 +1165,11 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 4e8c6e290555cc2fa127febf0d11d565c0934417..53da5d0f8477fef9c7dda71111355dc7b0a3b7e1 100644
GIT binary patch
delta 21
ccmcbtaam)-2W}2S3o9cdZ3Dy2Ke(eg09qdhRsaA1

delta 21
ccmcbtaam)-2W}1nODiKwT?4btKe(eg09uO&WB>pF

diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 689a7624c3..789a08ba64 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: 2005-10-04 20:59GMT\n"
 "Last-Translator: Ricardo Javier C�rdenes Medina <ricardo.cardenes@gmail."
 "com>\n"
@@ -17,38 +17,287 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bienvenido,"
+#: contrib/admin/models/admin.py:6
+#, fuzzy
+msgid "action time"
+msgstr "Fecha/hora"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Registrarse"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Cambie para modificar"
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Agregar"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "Cambiar clave"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Terminar"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "Fecha/hora"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Fecha/hora"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "Direcci�n de correo:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+msgid "Decimal number"
+msgstr ""
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "Direcci�n de correo:"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+msgid "Phone number"
+msgstr ""
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr ""
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Agregar"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modificar"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "No tiene permiso para editar nada."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Acciones recientes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mis acciones"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ninguno disponible"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "Inicio"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "P�gina no encontrada"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Lo sentimos, pero no se encuentra la p�gina solicitada."
-
 #: contrib/admin/templates/admin/500.html:4
 #, fuzzy
 msgid "Server error"
@@ -72,6 +321,7 @@ msgstr ""
 "paciencia"
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Hist�rico"
 
@@ -107,6 +357,45 @@ msgstr "Sitio de administraci
 msgid "Django administration"
 msgstr "Administraci�n de Django"
 
+#: 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>?"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "P�gina no encontrada"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Lo sentimos, pero no se encuentra la p�gina solicitada."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
 msgid ""
@@ -131,53 +420,37 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "S�, estoy seguro"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Agregar"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bienvenido,"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modificar"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambiar clave"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "No tiene permiso para editar nada."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Terminar"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Acciones recientes"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mis acciones"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ninguno disponible"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Usuario:"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
 
-#: 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>?"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Registrarse"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Registrarse de nuevo"
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr ""
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -195,6 +468,49 @@ msgstr "Cambio de clave con 
 msgid "Your password was changed."
 msgstr "Su clave ha cambiado."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "Recuperar clave"
+
+#: 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 ""
+"�Ha olvidado su clave? Introduzca su direcci�n de correo, y crearemos una "
+"nueva que le enviaremos por correo."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Direcci�n de correo:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Recuperar mi clave"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Registrarse de nuevo"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Recuperaci�n de clave con �xito"
+
+#: 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 ""
+"Le hemos enviado una clave nueva a la direcci�n que ha suministrado. Deber�a "
+"recibirla en breve."
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -219,25 +535,6 @@ msgstr "Confirme clave:"
 msgid "Change my password"
 msgstr "Cambiar mi clave"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Recuperar clave"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Recuperaci�n de clave con �xito"
-
-#: 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 ""
-"Le hemos enviado una clave nueva a la direcci�n que ha suministrado. Deber�a "
-"recibirla en breve."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "Recibe este mensaje debido a que solicit� recuperar la clave"
@@ -269,51 +566,6 @@ msgstr "
 msgid "The %(site_name)s team"
 msgstr "El equipo de %(site_name)s"
 
-#: 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 ""
-"�Ha olvidado su clave? Introduzca su direcci�n de correo, y crearemos una "
-"nueva que le enviaremos por correo."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Direcci�n de correo:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Recuperar mi clave"
-
-#: contrib/admin/models/admin.py:6
-#, fuzzy
-msgid "action time"
-msgstr "Fecha/hora"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr ""
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr ""
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr ""
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr ""
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr ""
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr ""
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr ""
@@ -491,10 +743,6 @@ msgstr ""
 msgid "redirects"
 msgstr ""
 
-#: models/core.py:81
-msgid "URL"
-msgstr ""
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -652,51 +900,51 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -947,17 +1195,14 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
 #~ msgid "Server error <em>(500)</em>"
 #~ msgstr "Error del servidor <em>(500)</em>"
-
-#~ msgid "Click to change"
-#~ msgstr "Cambie para modificar"
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 464c81b67c1277e0ba7aa76266acf397e9414f76..adddc070f5e28a314e8eaca3d53fb6ae44e54e41 100644
GIT binary patch
delta 23
ecmaFd#rU|3aYMBRhoOa)k&(86;pS$I2QmO@p9m!Y

delta 23
ecmaFd#rU|3aYMBRhk>P)k)^JI+2&@A2QmO^3kWj+

diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 3d7fb33a85..259ffcb0b4 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: 2005-10-18 12:27+0200\n"
 "Last-Translator: Laurent Rahuel <laurent.rahuel@gmail.com>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
@@ -15,38 +15,288 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bienvenue,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "heure de l'action"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id de l'objet"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr de l'objet"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "drapeau de l'action"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "message de modification"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "entr�e de log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "entr�es de log"
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Connectez vous"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Ajouter"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modifier"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modifier"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "Modifier votre mot de passe"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "D�connection"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "heure de l'action"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Date/Heure"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "Courriel:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "D�cembre"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "courriel"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Entrez un nombre entier."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Ajouter"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modifier"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Vous n'avez pas la permission d'�diter quoi que ce soit."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Actions r�centes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mes actions"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Aucun(e) disponible"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "Accueil"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Cette page n'a pas �t� trouv�e"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Nous sommes d�sol�s, mais la page demand�e est introuvable."
-
 #: contrib/admin/templates/admin/500.html:4
 #, fuzzy
 msgid "Server error"
@@ -70,6 +320,7 @@ msgstr ""
 "pour votre patience."
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Historique"
 
@@ -105,6 +356,45 @@ msgstr "Site d'administration de Django"
 msgid "Django administration"
 msgstr "Administration de Django"
 
+#: 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>?"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Cette page n'a pas �t� trouv�e"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Nous sommes d�sol�s, mais la page demand�e est introuvable."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
 msgid ""
@@ -129,53 +419,38 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Oui, je suis certain"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Ajouter"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bienvenue,"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modifier"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Modifier votre mot de passe"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Vous n'avez pas la permission d'�diter quoi que ce soit."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "D�connection"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Actions r�centes"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mes actions"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Aucun(e) disponible"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Nom d'utilisateur"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
 
-#: 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>?"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Connectez vous"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Merci pour le temps que vous avez accord� au site aujourd'hui."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Connectez vous � nouveau"
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "actif"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -193,6 +468,50 @@ msgstr "Mot de passe modifi
 msgid "Your password was changed."
 msgstr "Votre mot de passe a �t� modifi�."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "R�initialisation de votre mot de passe"
+
+#: 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 ""
+"Mot de passe perdu ? Saisissez votre adresse de courriel ci-dessous et nous "
+"annulerons votre mot de passe actuel avant de vous en faire parvenir un "
+"nouveau par courriel."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Courriel:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "R�initialiser mon mot de passe"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Merci pour le temps que vous avez accord� au site aujourd'hui."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Connectez vous � nouveau"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Mot de passe r�initialis� avec succ�s"
+
+#: 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 ""
+"Nous vous avons envoy� par courriel un nouveau mot de passe. Vous devriez le "
+"recevoir rapidement."
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -218,25 +537,6 @@ msgstr "Confirmation de votre nouveau mot de passe"
 msgid "Change my password"
 msgstr "Modifier mon mot de passe"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "R�initialisation de votre mot de passe"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Mot de passe r�initialis� avec succ�s"
-
-#: 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 ""
-"Nous vous avons envoy� par courriel un nouveau mot de passe. Vous devriez le "
-"recevoir rapidement."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
@@ -269,51 +569,6 @@ msgstr "Merci d'utiliser notre site!"
 msgid "The %(site_name)s team"
 msgstr "L'�quipe %(site_name)s"
 
-#: 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 ""
-"Mot de passe perdu ? Saisissez votre adresse de courriel ci-dessous et nous "
-"annulerons votre mot de passe actuel avant de vous en faire parvenir un "
-"nouveau par courriel."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Courriel:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "R�initialiser mon mot de passe"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "heure de l'action"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id de l'objet"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "repr de l'objet"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "drapeau de l'action"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "message de modification"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "entr�e de log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "entr�es de log"
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Lundi"
@@ -494,10 +749,6 @@ msgstr "redirection"
 msgid "redirects"
 msgstr "redirections"
 
-#: models/core.py:81
-msgid "URL"
-msgstr "URL"
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -660,53 +911,53 @@ msgstr "Dates importantes"
 msgid "Message"
 msgstr "Message"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr "Tch�que"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr "Allemand"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr "Anglais"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr "Fran�ais"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr "Galicien"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 #, fuzzy
 msgid "Italian"
 msgstr "Italien"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr "Br�silien"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr "Russe"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 #, fuzzy
 msgid "Serbian"
 msgstr "Serbe"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -984,11 +1235,11 @@ 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/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr "S�parez les ID par des virgules."
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index fba30cef6bab1da61ea118195562b9c99d06afe6..4f78d05d9dbad5219183563d7a28ff3d169ff334 100644
GIT binary patch
delta 21
dcmX@5c}jD`2W}2S3o9cdZ3Dy2Ke#V(003Fb2fY9Q

delta 21
dcmX@5c}jD`2W}1nODiKwT?4btKe#V(003Gy2g?8e

diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index be76b18722..b22af25bd3 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: 2005-10-16 14:29+0100\n"
 "Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n"
 "Language-Team: Galego\n"
@@ -17,38 +17,287 @@ msgstr ""
 "X-Poedit-Language: Galician\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Benvido,"
+#: contrib/admin/models/admin.py:6
+#, fuzzy
+msgid "action time"
+msgstr "Data/hora"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Entrar"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Faga clic para modificar"
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Engadir"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "Cambiar contrasinal"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Saír"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "Data/hora"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Data/hora"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "Enderezo de correo electrónico:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+msgid "Decimal number"
+msgstr ""
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "Enderezo de correo electrónico:"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+msgid "Phone number"
+msgstr ""
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr ""
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Engadir"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modificar"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Non ten permiso para editar nada."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Accións recentes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "As miñas accións"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ningunha dispoñíbel"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "Inicio"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Páxina non atopada"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Sentímolo, pero non se atopou a páxina solicitada."
-
 #: contrib/admin/templates/admin/500.html:4
 #, fuzzy
 msgid "Server error"
@@ -71,6 +320,7 @@ msgstr ""
 "electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia."
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Histórico"
 
@@ -106,6 +356,45 @@ msgstr "Administración de sitio Django"
 msgid "Django administration"
 msgstr "Administración de Django"
 
+#: 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>?"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Páxina non atopada"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Sentímolo, pero non se atopou a páxina solicitada."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
 msgid ""
@@ -130,53 +419,37 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Si, estou seguro"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Engadir"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Benvido,"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modificar"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambiar contrasinal"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Non ten permiso para editar nada."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Saír"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Accións recentes"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "As miñas accións"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ningunha dispoñíbel"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Usuario:"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
 
-#: 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>?"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Entrar"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Grazas polo tempo que dedicou ao sitio web."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Entrar de novo"
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr ""
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -194,6 +467,49 @@ msgstr "O seu contrasinal cambiouse correctamente."
 msgid "Your password was changed."
 msgstr "Cambiouse o seu contrasinal."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "Recuperar o contrasinal"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Esqueceu o contrasinal? Introduza o seu enderezo de correo electrónico "
+"embaixo e enviarémoslle un novo contrasinal."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Enderezo de correo electrónico:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Recuperar o meu contrasinal"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Grazas polo tempo que dedicou ao sitio web."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Entrar de novo"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "O contrasinal foi recuperado correctamente"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Acabamos de enviarlle un novo contrasinal ao enderezo de correo indicado. "
+"Debería recibilo en breve."
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -218,25 +534,6 @@ msgstr "Confirmar contrasinal:"
 msgid "Change my password"
 msgstr "Cambiar o contrasinal"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Recuperar o contrasinal"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "O contrasinal foi recuperado correctamente"
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"Acabamos de enviarlle un novo contrasinal ao enderezo de correo indicado. "
-"Debería recibilo en breve."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "Recibe esta mensaxe porque solicitou recuperar o contrasinal"
@@ -268,51 +565,6 @@ msgstr "Grazas por usar o noso sitio web!"
 msgid "The %(site_name)s team"
 msgstr "O equipo de %(site_name)s"
 
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"Esqueceu o contrasinal? Introduza o seu enderezo de correo electrónico "
-"embaixo e enviarémoslle un novo contrasinal."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Enderezo de correo electrónico:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Recuperar o meu contrasinal"
-
-#: contrib/admin/models/admin.py:6
-#, fuzzy
-msgid "action time"
-msgstr "Data/hora"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr ""
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr ""
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr ""
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr ""
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr ""
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr ""
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr ""
@@ -490,10 +742,6 @@ msgstr ""
 msgid "redirects"
 msgstr ""
 
-#: models/core.py:81
-msgid "URL"
-msgstr ""
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -651,51 +899,51 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -946,14 +1194,11 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
-
-#~ msgid "Click to change"
-#~ msgstr "Faga clic para modificar"
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 82fe59f4462499c5c176e28eb9bf0e9c17f59796..6ed184d01710831da9fbd31b7ff0bf5d66a78312 100644
GIT binary patch
delta 23
ecmdne%($hQaYLI1hoOa)k&(86;pRRKHAw(q00$BP

delta 23
ecmdne%($hQaYLI1hk>P)k)^JI+2%eCHAw(qYzH6!

diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 573012ce87..e99405bcb1 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,38 +16,288 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Benvenuto,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "data azione"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id dell'oggetto"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "rappresentazione dell'oggetto"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "flag azione"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "messaggio"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "voce di log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "voci di log"
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Accedi"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Clicca per cambiare"
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Aggiungi"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Cambia"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Cambia"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "Cambia la password"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Esci"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "data azione"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Data/ora"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "Indirizzo e-mail:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "Dicembre"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "indirizzo e-mail"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Inserire un numero."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Aggiungi"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Cambia"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Non hai i permessi di modificare nulla."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Azioni Recenti"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Azioni Proprie"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nessuna disponibile"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "Pagina iniziale"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Pagina non trovata"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Spiacente, ma la pagina richiesta non esiste."
-
 #: contrib/admin/templates/admin/500.html:4
 #, fuzzy
 msgid "Server error"
@@ -70,6 +320,7 @@ msgstr ""
 "mail e verr� risolto a breve. Grazie per la pazienza."
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Storia"
 
@@ -105,6 +356,45 @@ msgstr "Amministrazione sito Django"
 msgid "Django administration"
 msgstr "Amministrazione Django"
 
+#: 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>?"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Pagina non trovata"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Spiacente, ma la pagina richiesta non esiste."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
 msgid ""
@@ -129,53 +419,38 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "S�, sono sicuro"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Aggiungi"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Benvenuto,"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Cambia"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambia la password"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Non hai i permessi di modificare nulla."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Esci"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Azioni Recenti"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Azioni Proprie"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nessuna disponibile"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Nome utente:"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
 
-#: 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>?"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Accedi"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Grazie per aver speso il tuo tempo prezioso con questo sito."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Accedi di nuovo"
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "attivo"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -193,6 +468,49 @@ msgstr "La password 
 msgid "Your password was changed."
 msgstr "La tua password � stata cambiata."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "Resetta la password"
+
+#: 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 ""
+"Hai dimenticato la tua password? Inserisci il tuo indirizzo e-mail qui "
+"sotto, la tua password sar� resettata e te ne verr� spedita una nuova."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Indirizzo e-mail:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Resetta la mia password"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Grazie per aver speso il tuo tempo prezioso con questo sito."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Accedi di nuovo"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Password resettata con successo"
+
+#: 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 ""
+"Ti abbiamo inviato la nuova password all'indirizzo e-mail da te selezionato. "
+"Dovresti riceverla a 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 "
@@ -217,25 +535,6 @@ msgstr "Conferma password:"
 msgid "Change my password"
 msgstr "Cambia la mia password"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Resetta la password"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Password resettata con successo"
-
-#: 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 ""
-"Ti abbiamo inviato la nuova password all'indirizzo e-mail da te selezionato. "
-"Dovresti riceverla a breve."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
@@ -268,50 +567,6 @@ msgstr "Ti ringraziamo per l'utilizzo del nostro sito!"
 msgid "The %(site_name)s team"
 msgstr "Il team di %(site_name)s"
 
-#: 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 ""
-"Hai dimenticato la tua password? Inserisci il tuo indirizzo e-mail qui "
-"sotto, la tua password sar� resettata e te ne verr� spedita una nuova."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Indirizzo e-mail:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Resetta la mia password"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "data azione"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id dell'oggetto"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "rappresentazione dell'oggetto"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "flag azione"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "messaggio"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "voce di log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "voci di log"
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Luned�"
@@ -491,10 +746,6 @@ msgstr "redirigi"
 msgid "redirects"
 msgstr "redirezioni"
 
-#: models/core.py:81
-msgid "URL"
-msgstr "URL"
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -653,52 +904,52 @@ msgstr "Date importanti"
 msgid "Message"
 msgstr "Messaggio"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr "Tedesco"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr "Inglese"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr "Francese"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr "Galiziano"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr "Brasiliano"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr "Russo"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 #, fuzzy
 msgid "Serbian"
 msgstr "Serbo"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -966,11 +1217,11 @@ msgstr ""
 "L'attributo \"%(attr)s\" alla linea %(line)s ha un valore non valido. (La "
 "linea comincia con \"%(start)s\".)"
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr " Separa ID multipli con virgole."
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi� di uno."
@@ -980,6 +1231,3 @@ msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi
 
 #~ msgid "Server error <em>(500)</em>"
 #~ msgstr "Errore del server <em>(500)</em>"
-
-#~ msgid "Click to change"
-#~ msgstr "Clicca per cambiare"
diff --git a/django/conf/locale/no_NB/LC_MESSAGES/django.mo b/django/conf/locale/no_NB/LC_MESSAGES/django.mo
index 16046ade759d2679e9293c01e5de030fdd9d6e9a..2225f1a9ff42c850ff311900a97a4bd6a9f6064b 100644
GIT binary patch
delta 23
fcmZ41&bX|dal;Bt4nqqoBO`4C!_6BszexfBVx$NZ

delta 23
fcmZ41&bX|dal;Bt4g*UoBTHQav&|bczexfBV-N@;

diff --git a/django/conf/locale/no_NB/LC_MESSAGES/django.po b/django/conf/locale/no_NB/LC_MESSAGES/django.po
index 761a564872..782d7ae652 100644
--- a/django/conf/locale/no_NB/LC_MESSAGES/django.po
+++ b/django/conf/locale/no_NB/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
 "Language-Team: Norwegian\n"
@@ -16,38 +16,288 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Velkommen"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "handlings tid"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "objekt id"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "objekt repr"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "handlings flagg"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "endre melding"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "logg notis"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "logg innlegg"
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Log inn"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Legg til"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Endre"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Endre"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "Endre passord"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Log ut"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "handlings tid"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Dato/tid"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "Epost adresse:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "Desember"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "e-post adresse"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Skriv inn et helt nummer."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr "Internettadresse"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Legg til"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Endre"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Du har ikke rettigheter til å endre."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Siste handlinger"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mine handlinger"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ingen tilgjengelige"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "Hjem"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Fant ikke siden"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Beklager, men siden du spør etter finnest ikke."
-
 #: contrib/admin/templates/admin/500.html:4
 msgid "Server error"
 msgstr "Tjener feil"
@@ -69,6 +319,7 @@ msgstr ""
 "mail, og vill bli fikset snart. Takk for din tålmodighet."
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Historie"
 
@@ -104,6 +355,45 @@ msgstr "Django administrasjonsside"
 msgid "Django administration"
 msgstr "Django administrasjon"
 
+#: 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>?"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Fant ikke siden"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Beklager, men siden du spør etter finnest ikke."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
 msgid ""
@@ -127,53 +417,38 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ja, jeg er sikker"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Legg til"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Velkommen"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Endre"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Endre passord"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Du har ikke rettigheter til å endre."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Log ut"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Siste handlinger"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mine handlinger"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ingen tilgjengelige"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Brukernavn:"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
 
-#: 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>?"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Log inn"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Takk for å bruke tid på internett siden i dag."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Log inn igjen"
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "aktiv"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -191,6 +466,49 @@ msgstr "Passordet er endret"
 msgid "Your password was changed."
 msgstr "Ditt passord er endret."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "Tilbakestill passord"
+
+#: 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 ""
+"Har du glemt passordet ditt? Skriv inn epost adressen din under, så sender "
+"vi deg et nytt passord via epost."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Epost adresse:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Tilbakestill mitt passord"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Takk for å bruke tid på internett siden i dag."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Log inn igjen"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Passordet ble tilbakestilt"
+
+#: 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 ""
+"Vi sender deg et nytt passord til epost adressen du oppgav. Du villmotta det "
+"snart."
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -215,25 +533,6 @@ msgstr "Gjenta nytt passord:"
 msgid "Change my password"
 msgstr "Endre passord"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Tilbakestill passord"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Passordet ble tilbakestilt"
-
-#: 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 ""
-"Vi sender deg et nytt passord til epost adressen du oppgav. Du villmotta det "
-"snart."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
@@ -266,50 +565,6 @@ msgstr "Takk for at du bruker vår side!"
 msgid "The %(site_name)s team"
 msgstr "Hilsen %(site_name)s"
 
-#: 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 ""
-"Har du glemt passordet ditt? Skriv inn epost adressen din under, så sender "
-"vi deg et nytt passord via epost."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Epost adresse:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Tilbakestill mitt passord"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "handlings tid"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "objekt id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "objekt repr"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "handlings flagg"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "endre melding"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "logg notis"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "logg innlegg"
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Mondag"
@@ -490,10 +745,6 @@ msgstr "videresend"
 msgid "redirects"
 msgstr "vidersesendelser"
 
-#: models/core.py:81
-msgid "URL"
-msgstr "Internettadresse"
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -654,51 +905,51 @@ msgstr "Viktige datoer"
 msgid "Message"
 msgstr "Meldinger"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr "Tsjekkisk"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr "Tysk"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr "Engelsk"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr "Spansk"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr "Fransk"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr "Galisisk"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr "Italiensk"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr "Brasiliansk"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr "Russisk"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Serbian"
 msgstr "Serbisk"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -970,11 +1221,11 @@ msgstr ""
 "\"%(attr)s\" tillegg på linje $(line)s har en ikke godkjent verdi. (Linja "
 "starter med \"%(start)s\".)"
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr "Separer Id-ene med kommaer."
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 714d81f6a13e552943c9728bc7e8c6792cbc08e4..9da77a190e62617ab36fb464aa67bff0414476b8 100644
GIT binary patch
delta 23
ecmbQ!#5kvkaYK$ehoOa)k&(86;pP(c6_Nm2xd$u&

delta 23
ecmbQ!#5kvkaYK$ehk>P)k)^JI+2#`U6_Nm3B?meH

diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index e423cb6ace..5d694acbf3 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: 2005-10-11 09:12GMT-3\n"
 "Last-Translator: João Paulo Farias <jpaulofarias@gmail.com>\n"
 "Language-Team: Português do Brasil <pt-br@li.org>\n"
@@ -16,38 +16,288 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bem vindo,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "hora da ação"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id do objeto"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr do objeto"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "flag de ação"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "alterar mensagem"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "entrada de log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "entradas de log"
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Acessar"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "Clique para alterar"
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Adicionar"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Modificar"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "Alterar senha"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Encerrar sessão"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "hora da ação"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Data/hora"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "Endereço de e-mail:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "Dezembro"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "endereço de e-mail:"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Informe um número inteiro."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Adicionar"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modificar"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Você não tem permissão para edição."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Ações Recentes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Minhas Ações"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nenhuma disponível"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "Início"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Página não encontrada"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
-
 #: contrib/admin/templates/admin/500.html:4
 #, fuzzy
 msgid "Server error"
@@ -70,6 +320,7 @@ msgstr ""
 "mail e deve ser consertado em breve. Obrigado pela compreensão."
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Histórico"
 
@@ -105,6 +356,45 @@ msgstr "Site de administração do Django"
 msgid "Django administration"
 msgstr "Administração do Django"
 
+#: 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>?"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Página não encontrada"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
 msgid ""
@@ -129,53 +419,38 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Sim, tenho certeza"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Adicionar"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bem vindo,"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modificar"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Alterar senha"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Você não tem permissão para edição."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Encerrar sessão"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Ações Recentes"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Minhas Ações"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nenhuma disponível"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Usuário:"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
 
-#: 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>?"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Acessar"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Obrigado por visitar nosso Web site hoje."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Acessar novamente"
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "ativar"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -193,6 +468,49 @@ msgstr "Senha alterada com sucesso"
 msgid "Your password was changed."
 msgstr "Sua senha foi alterada."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "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ê."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Endereço de e-mail:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Reinicializar minha senha"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Obrigado por visitar nosso Web site hoje."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Acessar novamente"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+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."
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -217,25 +535,6 @@ msgstr "Confirme a senha:"
 msgid "Change my password"
 msgstr "Alterar minha senha"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Reinicializar senha"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-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."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "Você está recebendo este e-mail porque você pediu uma nova senha"
@@ -267,50 +566,6 @@ msgstr "Obrigado por usar nosso site!"
 msgid "The %(site_name)s team"
 msgstr "Time do %(site_name)s"
 
-#: 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ê."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Endereço de e-mail:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Reinicializar minha senha"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "hora da ação"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id do objeto"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "repr do objeto"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "flag de ação"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "alterar mensagem"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "entrada de log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "entradas de log"
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Segunda Feira"
@@ -492,10 +747,6 @@ msgstr "redirecionar"
 msgid "redirects"
 msgstr "redirecionamentos"
 
-#: models/core.py:81
-msgid "URL"
-msgstr "URL"
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -657,52 +908,52 @@ msgstr "Datas importantes"
 msgid "Message"
 msgstr "Mensagem"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr "Tcheco"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr "Alemão"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr "Inglês"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr "Francês"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr "Galiciano"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr "Brazileiro"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr "Russo"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 #, fuzzy
 msgid "Serbian"
 msgstr "Sérvio"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -970,16 +1221,13 @@ msgstr ""
 "O atributo \"%(attr)s\" na linha %(line)s tem um valor inválido. (Linha "
 "começa com \"%(start)s\".)"
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr " Separe IDs múltiplos com vírgulas."
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 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 "Click to change"
-#~ msgstr "Clique para alterar"
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index a9c99e74d21e9eae63cd07c80876dd9da31ba8a8..40a18a0f00363cf5d0584da5b7547c050fdac7d2 100644
GIT binary patch
delta 21
ccmeCv=+oHnft$n7!pg`<+rV)14{k9I08Y&YhX4Qo

delta 21
ccmeCv=+oHnft$m?(#ptE*T8J^4{k9I08cpvl>h($

diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index b5cfd4a867..3af227c301 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: 2005-10-05 00:00\n"
 "Last-Translator: Dmitry Sorokin <ds@@dial.com.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,38 +15,287 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "����� ����������,"
+#: contrib/admin/models/admin.py:6
+#, fuzzy
+msgid "action time"
+msgstr "����/�����"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "����"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, fuzzy, python-format
+msgid "Select %s to change"
+msgstr "�������� ��� ���������"
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "��������"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "��������"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "��������"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "��������� ������"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "�����"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "����/�����"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "����/�����"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "E-mail �����:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+msgid "Decimal number"
+msgstr ""
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "E-mail �����:"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+msgid "Phone number"
+msgstr ""
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr ""
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "��������"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "��������"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "������������ ���� ��� ��������������."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "��������� ��������"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "��� ��������"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "����������"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "������"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "�������� �� �������"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "� ���������, ������������� ���� �������� �� �������."
-
 #: contrib/admin/templates/admin/500.html:4
 #, fuzzy
 msgid "Server error"
@@ -69,6 +318,7 @@ msgstr ""
 "��� ������ ���� ������ ����������. ���������� ��� �� �������� � ������."
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "�������"
 
@@ -104,6 +354,45 @@ msgstr "
 msgid "Django administration"
 msgstr "����������������� Django"
 
+#: 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>?"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "�������� �� �������"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "� ���������, ������������� ���� �������� �� �������."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
 msgid ""
@@ -128,53 +417,37 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "��, � ������"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "��������"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "����� ����������,"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "��������"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "��������� ������"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "������������ ���� ��� ��������������."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "�����"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "��������� ��������"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "��� ��������"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "����������"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "���:"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+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>?"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "����"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "���������� �� ����������� ���� ������� ����� �� ���� �����."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "��������� ����"
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr ""
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -192,6 +465,49 @@ msgstr "La password 
 msgid "Your password was changed."
 msgstr "��� ������ ��� �������."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "����� ������"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"������ ������? ������� ��� e-mail ����� ���� � �� ������� ��� ������ ������, "
+"� ������ ��� �� e-mail �����."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-mail �����:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "������� ������"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "���������� �� ����������� ���� ������� ����� �� ���� �����."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "��������� ����"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "�������� ������� ������"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"�� ��������� ����� ������ �� ���������� ���� ������ ����������� �����. �� "
+"������ �������� ��� ����� ������."
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -216,25 +532,6 @@ msgstr "
 msgid "Change my password"
 msgstr "��������� ������"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "����� ������"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "�������� ������� ������"
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"�� ��������� ����� ������ �� ���������� ���� ������ ����������� �����. �� "
-"������ �������� ��� ����� ������."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "�� �������� ��� ��������� ������ ��� ���� ��������� ������� ������"
@@ -266,51 +563,6 @@ msgstr "
 msgid "The %(site_name)s team"
 msgstr "������� ����� di %(site_name)s"
 
-#: 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 ""
-"������ ������? ������� ��� e-mail ����� ���� � �� ������� ��� ������ ������, "
-"� ������ ��� �� e-mail �����."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "E-mail �����:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "������� ������"
-
-#: contrib/admin/models/admin.py:6
-#, fuzzy
-msgid "action time"
-msgstr "����/�����"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr ""
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr ""
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr ""
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr ""
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr ""
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr ""
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr ""
@@ -488,10 +740,6 @@ msgstr ""
 msgid "redirects"
 msgstr ""
 
-#: models/core.py:81
-msgid "URL"
-msgstr ""
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -649,51 +897,51 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -944,17 +1192,14 @@ msgid ""
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
 #~ msgid "Server error <em>(500)</em>"
 #~ msgstr "������ ������� <em>(500)</em>"
-
-#~ msgid "Click to change"
-#~ msgstr "�������� ��� ���������"
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index e4e7ad0d0af5a88df78d4b3a089febe87131b30f..c0e6d9b8f5cbbd7e6f6a70db1fb9647496a3b1a9 100644
GIT binary patch
delta 23
ecmdne$hf7Eal=A&4nqqoBO`4C!_6zzxg`N%f(Iu6

delta 23
ecmdne$hf7Eal=A&4g*UoBTHQav&}2jxg`N%?guph

diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 9954f46249..e99b2697a6 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Serbian (latin) translation v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: 2005-11-03 00:28+0100\n"
 "Last-Translator: Petar Marić <petar.maric@gmail.com>\n"
 "Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail."
@@ -17,38 +17,290 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: ../../../../\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Dobrodošli,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "Datum/vreme akcije"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id objekta"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "opis objekta"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "akcija"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "opis promene"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "unos u dnevnik izmena"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "unosi u dnevnik izmena"
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Prijavi se"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Dodaj"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Izmena"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Izmena"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "Izmeni lozinku"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odjavi se"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "Datum/vreme akcije"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "Datum/vreme"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "E-mail adresa:"
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "Decembar"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "e-mail adresa"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "Unesite celi broj."
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+# nesh: ovo se valjda ne prevodi
+# petar: ne prevodi se
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr ""
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Dodaj"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Izmena"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nemate prava da vršite izmene."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Skorije akcije"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Moje akcije"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nema dostupnih"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "Početna strana"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Strana nije pronađena"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Tražena strana ne postoji."
-
 #: contrib/admin/templates/admin/500.html:4
 #, fuzzy
 msgid "Server error"
@@ -71,6 +323,7 @@ msgstr ""
 "uskoro. Hvala Vam na strpljenju."
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "Istorija"
 
@@ -106,6 +359,46 @@ msgstr "Django administracija sajta"
 msgid "Django administration"
 msgstr "Django administracija"
 
+#: 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>?"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Strana nije pronađena"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Tražena strana ne postoji."
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
 msgid ""
@@ -129,53 +422,38 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Da, siguran sam"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Dodaj"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Dobrodošli,"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Izmena"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Izmeni lozinku"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nemate prava da vršite izmene."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odjavi se"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Skorije akcije"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Moje akcije"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nema dostupnih"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Korisničko ime:"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
 
-#: 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>?"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Prijavi se"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Hvala Vam na poseti."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Prijavi se ponovo"
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "aktivan"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -193,6 +471,49 @@ msgstr "Lozinka je uspešno izmenjena"
 msgid "Your password was changed."
 msgstr "Vaša lozinka je izmenjena."
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "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."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-mail adresa:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Resetuj moju lozinku"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Hvala Vam na poseti."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Prijavi se ponovo"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+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."
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -217,25 +538,6 @@ msgstr "Potvrdite novu lozinku:"
 msgid "Change my password"
 msgstr "Izmeni moju lozinku"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Resetovanje lozinke"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-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."
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "Primili ste ovaj e-mail jer ste tražili resetovanje lozinke"
@@ -267,50 +569,6 @@ msgstr "Hvala Vam na poseti!"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s tim"
 
-#: 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."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "E-mail adresa:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Resetuj moju lozinku"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "Datum/vreme akcije"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id objekta"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "opis objekta"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "akcija"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "opis promene"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "unos u dnevnik izmena"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "unosi u dnevnik izmena"
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Ponedeljak"
@@ -491,12 +749,6 @@ msgstr "redirekcija"
 msgid "redirects"
 msgstr "redirekcije"
 
-# nesh: ovo se valjda ne prevodi
-# petar: ne prevodi se
-#: models/core.py:81
-msgid "URL"
-msgstr ""
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -657,51 +909,51 @@ msgstr "Važni datumi"
 msgid "Message"
 msgstr "Poruka"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr "Češki"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr "Nemački"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr "Engleski"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr "Španski"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr "Francuski"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr "Italijanski"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr "Brazilski"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr "Ruski"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Serbian"
 msgstr "Srpski"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -973,11 +1225,11 @@ msgstr ""
 "Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje "
 "sa \"%(start)s\".)"
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr " Odvojite višestruke ID-ove zarezima."
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 0ef8ebaabe4ada26918e60094fe28f86c7ae145f..aa7f4f69bcca4c2b86c1cf61ab0ee87fdb3aaeb6 100644
GIT binary patch
delta 21
ccmeCG>Z;l>Q;oyW!pg`<+rV)1LbXgW09Gdl3;+NC

delta 21
ccmeCG>Z;l>Q;oyG(#ptE*T8J^LbXgW09KO+8UO$Q

diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index fec4e4376f..1ccd5459b9 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-04 18:22+0100\n"
 "PO-Revision-Date: 2005-10-30 15:46+0800\n"
 "Last-Translator: limodou <limodou@gmail.com>\n"
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
@@ -18,38 +18,288 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "欢迎，"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "动作时间"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "对象id"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "对象表示"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "动作标志"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "修改消息"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "日志记录"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "日志记录"
+
+#: contrib/admin/templatetags/admin_list.py:256
+msgid "All dates"
+msgstr ""
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "登录"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/views/main.py:78 contrib/admin/views/main.py:106
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:128 contrib/admin/views/main.py:167
+#: contrib/admin/views/main.py:187
+#, python-format
+msgid "<h3>By %s:</h3><ul>\n"
+msgstr ""
+
+#: contrib/admin/views/main.py:210
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:211
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:572 contrib/admin/views/main.py:648
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:580 contrib/admin/views/main.py:657
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:597
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "增加"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:613 contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:617
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:615
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "修改"
+
+#: contrib/admin/views/main.py:617
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:620
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:645
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:654
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:692
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "修改"
+
+#: contrib/admin/views/main.py:772
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:777
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:806
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:809
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:824
+#, fuzzy, python-format
+msgid "Change history: %s"
 msgstr "修改口令"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "注销"
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+msgid "Integer"
+msgstr ""
+
+#: contrib/admin/views/doc.py:263
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:264
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:265
+msgid "Comma-separated integers"
+msgstr ""
+
+#: contrib/admin/views/doc.py:266
+#, fuzzy
+msgid "Date (without time)"
+msgstr "动作时间"
+
+#: contrib/admin/views/doc.py:267
+#, fuzzy
+msgid "Date (with time)"
+msgstr "日期/时间"
+
+#: contrib/admin/views/doc.py:268
+#, fuzzy
+msgid "E-mail address"
+msgstr "邮箱地址："
+
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+msgid "File path"
+msgstr ""
+
+#: contrib/admin/views/doc.py:270
+#, fuzzy
+msgid "Decimal number"
+msgstr "十二月"
+
+#: contrib/admin/views/doc.py:274
+#, fuzzy
+msgid "IP address"
+msgstr "邮件地址"
+
+#: contrib/admin/views/doc.py:276
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:277
+#, fuzzy
+msgid "Phone number"
+msgstr "输入整数。"
+
+#: contrib/admin/views/doc.py:280
+msgid "String (up to 50)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:282
+msgid "Text"
+msgstr ""
+
+#: contrib/admin/views/doc.py:283
+msgid "Time"
+msgstr ""
+
+#: contrib/admin/views/doc.py:284 models/core.py:81
+msgid "URL"
+msgstr ""
+
+#: contrib/admin/views/doc.py:285
+msgid "U.S. state (two uppercase letters)"
+msgstr ""
+
+#: contrib/admin/views/doc.py:286
+msgid "XML text"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "增加"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "修改"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "你无权修改任何东西。"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "最近动作"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "我的动作"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "无可用的"
 
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Home"
 msgstr "首页"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "页面没有找到"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "很报歉，请求页面无法找到。"
-
 #: contrib/admin/templates/admin/500.html:4
 #, fuzzy
 msgid "Server error"
@@ -72,6 +322,7 @@ msgstr ""
 "谢你的关心。"
 
 #: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
 msgstr "历史"
 
@@ -105,6 +356,45 @@ msgstr "Django管理站点"
 msgid "Django administration"
 msgstr "Django管理员"
 
+#: 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>？"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "页面没有找到"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "很报歉，请求页面无法找到。"
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
 msgid ""
@@ -127,53 +417,38 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "是的，我确定"
 
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "增加"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "欢迎，"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "修改"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "修改口令"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "你无权修改任何东西。"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "注销"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "最近动作"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "我的动作"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
 
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "无可用的"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "用户名："
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+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>？"
-
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "登录"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "感谢今天在本网站花费了您的一些宝贵时间。"
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "重新登录"
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "活动"
 
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -191,6 +466,48 @@ msgstr "口令修改成功"
 msgid "Your password was changed."
 msgstr "你的口令已经被修改。"
 
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
+msgstr "口令重设"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮"
+"件发送给你。"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "邮箱地址："
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "重设我的口令"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "感谢今天在本网站花费了您的一些宝贵时间。"
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "重新登录"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "口令重设成功"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
+
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
@@ -215,24 +532,6 @@ msgstr "确认口令："
 msgid "Change my password"
 msgstr "修改我的口令"
 
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "口令重设"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "口令重设成功"
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
-
 #: contrib/admin/templates/registration/password_reset_email.html:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "你所收到的这封邮件是由于你请求了口令重设"
@@ -264,50 +563,6 @@ msgstr "感谢使用我们的站点！"
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s 小组"
 
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮"
-"件发送给你。"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "邮箱地址："
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "重设我的口令"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "动作时间"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "对象id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "对象表示"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "动作标志"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "修改消息"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "日志记录"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "日志记录"
-
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "星期一"
@@ -484,10 +739,6 @@ msgstr "重定向"
 msgid "redirects"
 msgstr "重定向"
 
-#: models/core.py:81
-msgid "URL"
-msgstr ""
-
 #: models/core.py:82
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
@@ -643,52 +894,52 @@ msgstr "重要日期"
 msgid "Message"
 msgstr "消息"
 
-#: conf/global_settings.py:36
+#: conf/global_settings.py:37
 msgid "Czech"
 msgstr "捷克语"
 
-#: conf/global_settings.py:37
+#: conf/global_settings.py:38
 msgid "German"
 msgstr "德语"
 
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
 msgid "English"
 msgstr "英语"
 
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr "西斑牙语"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "French"
 msgstr "法语"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr "加利西亚语"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "Italian"
 msgstr "意大利语"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Brazilian"
 msgstr "巴西语"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Russian"
 msgstr "俄语"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 #, fuzzy
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -945,11 +1196,11 @@ msgid ""
 msgstr ""
 "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
 
-#: core/meta/fields.py:95
+#: core/meta/fields.py:114
 msgid " Separate multiple IDs with commas."
 msgstr " 用逗号分隔多个ID。"
 
-#: core/meta/fields.py:98
+#: core/meta/fields.py:117
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr " 按下 \"Control\"，或者在Mac上按 \"Command\" 来选择一个或多个值。"