[1.6.x] Updated translation templates

2 files changed, 137 insertions, 119 deletions

diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index f8069f07d2..a707cb9ba5 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: 2013-06-11 18:44+0200\n"
+"POT-Creation-Date: 2013-08-16 15:07+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -337,10 +337,14 @@ msgstr ""
 msgid "Enter a valid value."
 msgstr ""
 
-#: core/validators.py:53 forms/fields.py:639
+#: core/validators.py:53 forms/fields.py:650
 msgid "Enter a valid URL."
 msgstr ""
 
+#: core/validators.py:79
+msgid "Enter a valid integer."
+msgstr ""
+
 #: core/validators.py:83
 msgid "Enter a valid email address."
 msgstr ""
@@ -362,7 +366,7 @@ msgstr ""
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:175 db/models/fields/__init__.py:706
+#: core/validators.py:175 db/models/fields/__init__.py:712
 msgid "Enter only digits separated by commas."
 msgstr ""
 
@@ -371,17 +375,17 @@ msgstr ""
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:200
+#: core/validators.py:196
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:206
+#: core/validators.py:202
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:214
+#: core/validators.py:210
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d character (it has "
@@ -392,7 +396,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:224
+#: core/validators.py:220
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d character (it has "
@@ -403,23 +407,23 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: db/models/base.py:882
+#: db/models/base.py:884
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:905 forms/models.py:643
+#: db/models/base.py:907 forms/models.py:686
 msgid "and"
 msgstr ""
 
-#: db/models/base.py:906 db/models/fields/__init__.py:83
+#: db/models/base.py:908 db/models/fields/__init__.py:83
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr ""
 
 #: db/models/fields/__init__.py:80
 #, python-format
-msgid "Value %r is not a valid choice."
+msgid "Value %(value)r is not a valid choice."
 msgstr ""
 
 #: db/models/fields/__init__.py:81
@@ -435,181 +439,185 @@ msgstr ""
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1036
+#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1063
 msgid "Integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1034
+#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1061
 #, python-format
-msgid "'%s' value must be an integer."
+msgid "'%(value)s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:622
+#: db/models/fields/__init__.py:625
 #, python-format
-msgid "'%s' value must be either True or False."
+msgid "'%(value)s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:624
+#: db/models/fields/__init__.py:627
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: db/models/fields/__init__.py:673
+#: db/models/fields/__init__.py:679
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:701
+#: db/models/fields/__init__.py:707
 msgid "Comma-separated integers"
 msgstr ""
 
-#: db/models/fields/__init__.py:715
+#: db/models/fields/__init__.py:721
 #, python-format
-msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
 msgstr ""
 
-#: db/models/fields/__init__.py:717 db/models/fields/__init__.py:805
+#: db/models/fields/__init__.py:723 db/models/fields/__init__.py:817
 #, python-format
 msgid ""
-"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
 msgstr ""
 
-#: db/models/fields/__init__.py:720
+#: db/models/fields/__init__.py:726
 msgid "Date (without time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:815
 #, python-format
 msgid ""
-"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
 "uuuuuu]][TZ] format."
 msgstr ""
 
-#: db/models/fields/__init__.py:807
+#: db/models/fields/__init__.py:819
 #, python-format
 msgid ""
-"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
-"it is an invalid date/time."
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
 msgstr ""
 
-#: db/models/fields/__init__.py:811
+#: db/models/fields/__init__.py:823
 msgid "Date (with time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:900
+#: db/models/fields/__init__.py:921
 #, python-format
-msgid "'%s' value must be a decimal number."
+msgid "'%(value)s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:923
 msgid "Decimal number"
 msgstr ""
 
-#: db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:983
 msgid "Email address"
 msgstr ""
 
-#: db/models/fields/__init__.py:978
+#: db/models/fields/__init__.py:1002
 msgid "File path"
 msgstr ""
 
-#: db/models/fields/__init__.py:1005
+#: db/models/fields/__init__.py:1029
 #, python-format
-msgid "'%s' value must be a float."
+msgid "'%(value)s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:1068
+#: db/models/fields/__init__.py:1098
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1082
+#: db/models/fields/__init__.py:1112
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1098
+#: db/models/fields/__init__.py:1128
 msgid "IP address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1141
+#: db/models/fields/__init__.py:1175
 #, python-format
-msgid "'%s' value must be either None, True or False."
+msgid "'%(value)s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1143
+#: db/models/fields/__init__.py:1177
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1192
+#: db/models/fields/__init__.py:1229
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1203
+#: db/models/fields/__init__.py:1240
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1214
+#: db/models/fields/__init__.py:1252
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1232
+#: db/models/fields/__init__.py:1270
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1238
+#: db/models/fields/__init__.py:1276
 msgid "Text"
 msgstr ""
 
-#: db/models/fields/__init__.py:1256
+#: db/models/fields/__init__.py:1294
 #, python-format
 msgid ""
-"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
 msgstr ""
 
-#: db/models/fields/__init__.py:1258
+#: db/models/fields/__init__.py:1296
 #, python-format
 msgid ""
-"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
-"time."
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
 msgstr ""
 
-#: db/models/fields/__init__.py:1261
+#: db/models/fields/__init__.py:1299
 msgid "Time"
 msgstr ""
 
-#: db/models/fields/__init__.py:1323
+#: db/models/fields/__init__.py:1368
 msgid "URL"
 msgstr ""
 
-#: db/models/fields/__init__.py:1340
+#: db/models/fields/__init__.py:1384
 msgid "Raw binary data"
 msgstr ""
 
-#: db/models/fields/files.py:215
+#: db/models/fields/files.py:217
 msgid "File"
 msgstr ""
 
-#: db/models/fields/files.py:322
+#: db/models/fields/files.py:324
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:1118
+#: db/models/fields/related.py:1128
 #, python-format
-msgid "Model %(model)s with pk %(pk)r does not exist."
+msgid "%(model)s instance with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1130
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1257
+#: db/models/fields/related.py:1271
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1324
+#: db/models/fields/related.py:1338
 msgid "Many-to-many relationship"
 msgstr ""
 
@@ -617,29 +625,29 @@ msgstr ""
 msgid "This field is required."
 msgstr ""
 
-#: forms/fields.py:227
+#: forms/fields.py:225
 msgid "Enter a whole number."
 msgstr ""
 
-#: forms/fields.py:268 forms/fields.py:296
+#: forms/fields.py:266 forms/fields.py:294
 msgid "Enter a number."
 msgstr ""
 
-#: forms/fields.py:298
+#: forms/fields.py:296
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:302
+#: forms/fields.py:300
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:306
+#: forms/fields.py:304
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
@@ -648,31 +656,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:408 forms/fields.py:1064
+#: forms/fields.py:415 forms/fields.py:1088
 msgid "Enter a valid date."
 msgstr ""
 
-#: forms/fields.py:432 forms/fields.py:1065
+#: forms/fields.py:439 forms/fields.py:1089
 msgid "Enter a valid time."
 msgstr ""
 
-#: forms/fields.py:454
+#: forms/fields.py:461
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: forms/fields.py:531
+#: forms/fields.py:539
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: forms/fields.py:532
+#: forms/fields.py:540
 msgid "No file was submitted."
 msgstr ""
 
-#: forms/fields.py:533
+#: forms/fields.py:541
 msgid "The submitted file is empty."
 msgstr ""
 
-#: forms/fields.py:535
+#: forms/fields.py:543
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
 msgid_plural ""
@@ -680,22 +688,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:538
+#: forms/fields.py:546
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:599
+#: forms/fields.py:607
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: forms/fields.py:749 forms/fields.py:828 forms/models.py:1096
+#: forms/fields.py:757 forms/fields.py:844 forms/models.py:1145
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: forms/fields.py:829 forms/fields.py:933 forms/models.py:1095
+#: forms/fields.py:845 forms/fields.py:957 forms/models.py:1144
 msgid "Enter a list of values."
 msgstr ""
 
@@ -709,129 +717,131 @@ msgstr ""
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 
-#. Translators: If found as last label character, these punctuation
-#. characters will prevent the default label_suffix to be appended to the label
-#: forms/forms.py:525
+#: forms/forms.py:527
 msgid ":?.!"
 msgstr ""
 
-#: forms/formsets.py:310
+#: forms/formsets.py:88
+msgid "ManagementForm data is missing or has been tampered with"
+msgstr ""
+
+#: forms/formsets.py:321
 #, python-format
 msgid "Please submit %d or fewer forms."
 msgid_plural "Please submit %d or fewer forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/formsets.py:337 forms/formsets.py:339
+#: forms/formsets.py:350 forms/formsets.py:352
 msgid "Order"
 msgstr ""
 
-#: forms/formsets.py:341
+#: forms/formsets.py:354
 msgid "Delete"
 msgstr ""
 
-#: forms/models.py:637
+#: forms/models.py:680
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:641
+#: forms/models.py:684
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:647
+#: forms/models.py:690
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
 
-#: forms/models.py:655
+#: forms/models.py:698
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:937
+#: forms/models.py:986
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:1001
+#: forms/models.py:1050
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1098
+#: forms/models.py:1147
 #, python-format
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/models.py:1109
+#: forms/models.py:1158
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: forms/util.py:84
+#: forms/util.py:83
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 
-#: forms/widgets.py:327
+#: forms/widgets.py:326
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:328
+#: forms/widgets.py:327
 msgid "Change"
 msgstr ""
 
-#: forms/widgets.py:329
+#: forms/widgets.py:328
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:547
+#: forms/widgets.py:546
 msgid "Unknown"
 msgstr ""
 
-#: forms/widgets.py:548
+#: forms/widgets.py:547
 msgid "Yes"
 msgstr ""
 
-#: forms/widgets.py:549
+#: forms/widgets.py:548
 msgid "No"
 msgstr ""
 
-#: template/defaultfilters.py:785
+#: template/defaultfilters.py:784
 msgid "yes,no,maybe"
 msgstr ""
 
-#: template/defaultfilters.py:813 template/defaultfilters.py:825
+#: template/defaultfilters.py:812 template/defaultfilters.py:824
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/defaultfilters.py:827
+#: template/defaultfilters.py:826
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:829
+#: template/defaultfilters.py:828
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: template/defaultfilters.py:831
+#: template/defaultfilters.py:830
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: template/defaultfilters.py:833
+#: template/defaultfilters.py:832
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:835
+#: template/defaultfilters.py:834
 #, python-format
 msgid "%s PB"
 msgstr ""
@@ -1142,64 +1152,68 @@ msgstr ""
 msgid "The '_imaging' module for the PIL could not be imported: %s"
 msgstr ""
 
-#: utils/text.py:70
+#: utils/ipv6.py:9
+msgid "This is not a valid IPv6 address."
+msgstr ""
+
+#: utils/text.py:69
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:225
+#: utils/text.py:224
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:242 utils/timesince.py:55
+#: utils/text.py:241 utils/timesince.py:56
 msgid ", "
 msgstr ""
 
-#: utils/timesince.py:23
+#: utils/timesince.py:24
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:24
+#: utils/timesince.py:25
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:25
+#: utils/timesince.py:26
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:26
+#: utils/timesince.py:27
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:27
+#: utils/timesince.py:28
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:28
+#: utils/timesince.py:29
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:44
+#: utils/timesince.py:45
 msgid "0 minutes"
 msgstr ""
 
diff --git a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po b/django/contrib/formtools/locale/en/LC_MESSAGES/django.po
index 048b9fea45..caea4ba791 100644
--- a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/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: 2013-05-02 16:18+0200\n"
+"POT-Creation-Date: 2013-08-16 15:07+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -24,3 +24,7 @@ msgstr ""
 #: templates/formtools/wizard/wizard_form.html:18
 msgid "submit"
 msgstr ""
+
+#: wizard/views.py:275
+msgid "ManagementForm data is missing or has been tampered."
+msgstr ""