From 3f2f50699ee9502281fcde8497a0915cb414fff3 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Tue, 1 Jan 2013 16:13:37 +0100
Subject: [PATCH] [1.5.x] Updated translation catalogs for core and admin

---
 django/conf/locale/en/LC_MESSAGES/django.po   | 37 +++++-------
 .../admin/locale/en/LC_MESSAGES/django.po     | 59 ++++++++++---------
 2 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index a819dac4d0..f17385b3a0 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-23 22:54+0100\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -383,16 +383,16 @@ msgid ""
 "%(show_value)d)."
 msgstr ""
 
-#: db/models/base.py:843
+#: db/models/base.py:857
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:866 forms/models.py:573
+#: db/models/base.py:880 forms/models.py:573
 msgid "and"
 msgstr ""
 
-#: db/models/base.py:867 db/models/fields/__init__.py:70
+#: db/models/base.py:881 db/models/fields/__init__.py:70
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr ""
@@ -564,16 +564,11 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#: db/models/fields/files.py:211
-#, python-format
-msgid "Filename is %(extra)d characters too long."
-msgstr ""
-
-#: db/models/fields/files.py:221
+#: db/models/fields/files.py:216
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:347
+#: db/models/fields/files.py:323
 msgid "Image"
 msgstr ""
 
@@ -675,15 +670,15 @@ msgstr ""
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: forms/fields.py:747 forms/fields.py:835 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/formsets.py:325 forms/formsets.py:327
+#: forms/formsets.py:324 forms/formsets.py:326
 msgid "Order"
 msgstr ""
 
-#: forms/formsets.py:329
+#: forms/formsets.py:328
 msgid "Delete"
 msgstr ""
 
@@ -708,20 +703,20 @@ msgstr ""
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:849
+#: forms/models.py:852
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:910
+#: forms/models.py:913
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1000
+#: forms/models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1002
+#: forms/models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
@@ -745,15 +740,15 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:591
+#: forms/widgets.py:594
 msgid "Unknown"
 msgstr ""
 
-#: forms/widgets.py:592
+#: forms/widgets.py:595
 msgid "Yes"
 msgstr ""
 
-#: forms/widgets.py:593
+#: forms/widgets.py:596
 msgid "No"
 msgstr ""
 
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
index ea06d05fe1..d769576c94 100644
--- a/django/contrib/admin/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-18 09:15-0300\n"
+"POT-Creation-Date: 2013-01-01 16:10+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: actions.py:60 options.py:1357
+#: actions.py:60 options.py:1347
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:62 options.py:1359
+#: actions.py:62 options.py:1349
 msgid "Are you sure?"
 msgstr ""
 
@@ -69,9 +69,10 @@ msgid "This year"
 msgstr ""
 
 #: forms.py:9
+#, python-format
 msgid ""
-"Please enter the correct username and password for a staff account. Note "
-"that both fields are case-sensitive."
+"Please enter the correct %(username)s and password for a staff account. Note "
+"that both fields may be case-sensitive."
 msgstr ""
 
 #: forms.py:19
@@ -129,129 +130,129 @@ msgstr ""
 msgid "LogEntry Object"
 msgstr ""
 
-#: options.py:153 options.py:169
+#: options.py:156 options.py:172
 msgid "None"
 msgstr ""
 
-#: options.py:674
+#: options.py:684
 #, python-format
 msgid "Changed %s."
 msgstr ""
 
-#: options.py:674 options.py:684
+#: options.py:684 options.py:694
 msgid "and"
 msgstr ""
 
-#: options.py:679
+#: options.py:689
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:683
+#: options.py:693
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:688
+#: options.py:698
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:692
+#: options.py:702
 msgid "No fields changed."
 msgstr ""
 
-#: options.py:802 options.py:887
+#: options.py:807 options.py:860
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: options.py:819
+#: options.py:835
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may add another "
 "%(name)s below."
 msgstr ""
 
-#: options.py:826
+#: options.py:839
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: options.py:877
+#: options.py:853
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
 "below."
 msgstr ""
 
-#: options.py:895
+#: options.py:867
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was changed successfully. You may add another "
 "%(name)s below."
 msgstr ""
 
-#: options.py:902
+#: options.py:873
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: options.py:962 options.py:1221
+#: options.py:951 options.py:1211
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: options.py:981
+#: options.py:970
 msgid "No action selected."
 msgstr ""
 
-#: options.py:1061
+#: options.py:1050
 #, python-format
 msgid "Add %s"
 msgstr ""
 
-#: options.py:1085 options.py:1329
+#: options.py:1074 options.py:1319
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: options.py:1151
+#: options.py:1140
 #, python-format
 msgid "Change %s"
 msgstr ""
 
-#: options.py:1200
+#: options.py:1190
 msgid "Database error"
 msgstr ""
 
-#: options.py:1263
+#: options.py:1253
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1290
+#: options.py:1280
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1295
+#: options.py:1285
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: options.py:1345
+#: options.py:1335
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: options.py:1392
+#: options.py:1382
 #, python-format
 msgid "Change history: %s"
 msgstr ""