Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated translation templates

  • Loading branch information...
commit 244e765a94c02633c028260228b18618906ea46b 1 parent 0a22f7a
@claudep claudep authored
View
464 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-01-01 16:10+0100\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -13,777 +13,809 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:51
msgid "Afrikaans"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:52
msgid "Arabic"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:53
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:54
msgid "Bulgarian"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:55
msgid "Belarusian"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:56
msgid "Bengali"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:57
msgid "Breton"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:58
msgid "Bosnian"
msgstr ""
-#: conf/global_settings.py:56
+#: conf/global_settings.py:59
msgid "Catalan"
msgstr ""
-#: conf/global_settings.py:57
+#: conf/global_settings.py:60
msgid "Czech"
msgstr ""
-#: conf/global_settings.py:58
+#: conf/global_settings.py:61
msgid "Welsh"
msgstr ""
-#: conf/global_settings.py:59
+#: conf/global_settings.py:62
msgid "Danish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:63
msgid "German"
msgstr ""
-#: conf/global_settings.py:61
+#: conf/global_settings.py:64
msgid "Greek"
msgstr ""
-#: conf/global_settings.py:62
+#: conf/global_settings.py:65
msgid "English"
msgstr ""
-#: conf/global_settings.py:63
+#: conf/global_settings.py:66
msgid "British English"
msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:67
msgid "Esperanto"
msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:68
msgid "Spanish"
msgstr ""
-#: conf/global_settings.py:66
+#: conf/global_settings.py:69
msgid "Argentinian Spanish"
msgstr ""
-#: conf/global_settings.py:67
+#: conf/global_settings.py:70
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:71
msgid "Nicaraguan Spanish"
msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:72
msgid "Venezuelan Spanish"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:73
msgid "Estonian"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:74
msgid "Basque"
msgstr ""
-#: conf/global_settings.py:72
+#: conf/global_settings.py:75
msgid "Persian"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:76
msgid "Finnish"
msgstr ""
-#: conf/global_settings.py:74
+#: conf/global_settings.py:77
msgid "French"
msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:78
msgid "Frisian"
msgstr ""
-#: conf/global_settings.py:76
+#: conf/global_settings.py:79
msgid "Irish"
msgstr ""
-#: conf/global_settings.py:77
+#: conf/global_settings.py:80
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:81
msgid "Hebrew"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:82
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:83
msgid "Croatian"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:84
msgid "Hungarian"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:85
msgid "Interlingua"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:86
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:87
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:85
+#: conf/global_settings.py:88
msgid "Italian"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:89
msgid "Japanese"
msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:90
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
+msgid "Burmese"
+msgstr ""
+
+#: conf/global_settings.py:102
msgid "Norwegian Bokmal"
msgstr ""
-#: conf/global_settings.py:99
+#: conf/global_settings.py:103
msgid "Nepali"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:104
msgid "Dutch"
msgstr ""
-#: conf/global_settings.py:101
+#: conf/global_settings.py:105
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:106
+msgid "Ossetic"
+msgstr ""
+
+#: conf/global_settings.py:107
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:103
+#: conf/global_settings.py:108
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:109
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:110
msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:106
+#: conf/global_settings.py:111
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:112
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:108
+#: conf/global_settings.py:113
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:109
+#: conf/global_settings.py:114
msgid "Slovenian"
msgstr ""
-#: conf/global_settings.py:110
+#: conf/global_settings.py:115
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:111
+#: conf/global_settings.py:116
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:112
+#: conf/global_settings.py:117
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:113
+#: conf/global_settings.py:118
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:114
+#: conf/global_settings.py:119
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:115
+#: conf/global_settings.py:120
msgid "Tamil"
msgstr ""
-#: conf/global_settings.py:116
+#: conf/global_settings.py:121
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:117
+#: conf/global_settings.py:122
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:118
+#: conf/global_settings.py:123
msgid "Turkish"
msgstr ""
-#: conf/global_settings.py:119
+#: conf/global_settings.py:124
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:125
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:121
+#: conf/global_settings.py:126
msgid "Ukrainian"
msgstr ""
-#: conf/global_settings.py:122
+#: conf/global_settings.py:127
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:123
+#: conf/global_settings.py:128
msgid "Vietnamese"
msgstr ""
-#: conf/global_settings.py:124
+#: conf/global_settings.py:129
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:130
msgid "Traditional Chinese"
msgstr ""
-#: core/validators.py:21 forms/fields.py:52
+#: core/validators.py:21
msgid "Enter a valid value."
msgstr ""
-#: core/validators.py:104 forms/fields.py:464
+#: core/validators.py:53 forms/fields.py:627
+msgid "Enter a valid URL."
+msgstr ""
+
+#: core/validators.py:83
msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:107 forms/fields.py:1013
+#: core/validators.py:131
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
+#: core/validators.py:134 core/validators.py:153
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:115 core/validators.py:130
+#: core/validators.py:139 core/validators.py:154
msgid "Enter a valid IPv6 address."
msgstr ""
-#: core/validators.py:125 core/validators.py:128
+#: core/validators.py:149 core/validators.py:152
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: core/validators.py:151 db/models/fields/__init__.py:655
+#: core/validators.py:175 db/models/fields/__init__.py:704
msgid "Enter only digits separated by commas."
msgstr ""
-#: core/validators.py:157
+#: core/validators.py:181
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:176 forms/fields.py:210 forms/fields.py:263
+#: core/validators.py:200
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:182 forms/fields.py:211 forms/fields.py:264
+#: core/validators.py:206
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:189
+#: core/validators.py:214
#, python-format
msgid ""
+"Ensure this value has at least %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: core/validators.py:196
+#: core/validators.py:224
#, python-format
msgid ""
+"Ensure this value has at most %(limit_value)d character (it has "
+"%(show_value)d)."
+msgid_plural ""
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: db/models/base.py:857
+#: db/models/base.py:882
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:880 forms/models.py:573
+#: db/models/base.py:905 forms/models.py:590
msgid "and"
msgstr ""
-#: db/models/base.py:881 db/models/fields/__init__.py:70
+#: db/models/base.py:906 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:67
+#: db/models/fields/__init__.py:80
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:68
+#: db/models/fields/__init__.py:81
msgid "This field cannot be null."
msgstr ""
-#: db/models/fields/__init__.py:69
+#: db/models/fields/__init__.py:82
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:76
+#: db/models/fields/__init__.py:89
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
+#: db/models/fields/__init__.py:568 db/models/fields/__init__.py:1034
msgid "Integer"
msgstr ""
-#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:572 db/models/fields/__init__.py:1032
#, python-format
msgid "'%s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:569
+#: db/models/fields/__init__.py:620
#, python-format
msgid "'%s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:571
+#: db/models/fields/__init__.py:622
msgid "Boolean (Either True or False)"
msgstr ""
-#: db/models/fields/__init__.py:622
+#: db/models/fields/__init__.py:671
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:650
+#: db/models/fields/__init__.py:699
msgid "Comma-separated integers"
msgstr ""
-#: db/models/fields/__init__.py:664
+#: db/models/fields/__init__.py:713
#, python-format
msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
msgstr ""
-#: db/models/fields/__init__.py:666 db/models/fields/__init__.py:754
+#: db/models/fields/__init__.py:715 db/models/fields/__init__.py:803
#, python-format
msgid ""
"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
msgstr ""
-#: db/models/fields/__init__.py:669
+#: db/models/fields/__init__.py:718
msgid "Date (without time)"
msgstr ""
-#: db/models/fields/__init__.py:752
+#: db/models/fields/__init__.py:801
#, python-format
msgid ""
"'%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:756
+#: db/models/fields/__init__.py:805
#, python-format
msgid ""
"'%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:760
+#: db/models/fields/__init__.py:809
msgid "Date (with time)"
msgstr ""
-#: db/models/fields/__init__.py:849
+#: db/models/fields/__init__.py:898
#, python-format
msgid "'%s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:851
+#: db/models/fields/__init__.py:900
msgid "Decimal number"
msgstr ""
-#: db/models/fields/__init__.py:908
+#: db/models/fields/__init__.py:957
msgid "Email address"
msgstr ""
-#: db/models/fields/__init__.py:927
+#: db/models/fields/__init__.py:976
msgid "File path"
msgstr ""
-#: db/models/fields/__init__.py:954
+#: db/models/fields/__init__.py:1003
#, python-format
msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:956
+#: db/models/fields/__init__.py:1005
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:1017
+#: db/models/fields/__init__.py:1066
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:1031
+#: db/models/fields/__init__.py:1080
msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:1047
+#: db/models/fields/__init__.py:1096
msgid "IP address"
msgstr ""
-#: db/models/fields/__init__.py:1090
+#: db/models/fields/__init__.py:1139
#, python-format
msgid "'%s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1092
+#: db/models/fields/__init__.py:1141
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: db/models/fields/__init__.py:1141
+#: db/models/fields/__init__.py:1190
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1152
+#: db/models/fields/__init__.py:1201
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1163
+#: db/models/fields/__init__.py:1212
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1181
+#: db/models/fields/__init__.py:1230
msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1187
+#: db/models/fields/__init__.py:1236
msgid "Text"
msgstr ""
-#: db/models/fields/__init__.py:1205
+#: db/models/fields/__init__.py:1254
#, python-format
msgid ""
"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
msgstr ""
-#: db/models/fields/__init__.py:1207
+#: db/models/fields/__init__.py:1256
#, python-format
msgid ""
"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
"time."
msgstr ""
-#: db/models/fields/__init__.py:1210
+#: db/models/fields/__init__.py:1259
msgid "Time"
msgstr ""
-#: db/models/fields/__init__.py:1272
+#: db/models/fields/__init__.py:1321
msgid "URL"
msgstr ""
-#: db/models/fields/files.py:216
+#: db/models/fields/__init__.py:1338
+msgid "Raw binary data"
+msgstr ""
+
+#: db/models/fields/files.py:215
msgid "File"
msgstr ""
-#: db/models/fields/files.py:323
+#: db/models/fields/files.py:322
msgid "Image"
msgstr ""
-#: db/models/fields/related.py:979
+#: db/models/fields/related.py:1133
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:981
+#: db/models/fields/related.py:1135
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:1111
+#: db/models/fields/related.py:1272
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1178
+#: db/models/fields/related.py:1339
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1203
+#: db/models/fields/related.py:1366
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: forms/fields.py:51
+#: forms/fields.py:56
msgid "This field is required."
msgstr ""
-#: forms/fields.py:209
+#: forms/fields.py:225
msgid "Enter a whole number."
msgstr ""
-#: forms/fields.py:241 forms/fields.py:262
+#: forms/fields.py:266 forms/fields.py:294
msgid "Enter a number."
msgstr ""
-#: forms/fields.py:265
+#: forms/fields.py:295
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr ""
-#: forms/fields.py:266
+#: forms/fields.py:296
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr ""
-#: forms/fields.py:267
+#: forms/fields.py:297
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
-#: forms/fields.py:355 forms/fields.py:953
+#: forms/fields.py:393 forms/fields.py:1045
msgid "Enter a valid date."
msgstr ""
-#: forms/fields.py:378 forms/fields.py:954
+#: forms/fields.py:417 forms/fields.py:1046
msgid "Enter a valid time."
msgstr ""
-#: forms/fields.py:399
+#: forms/fields.py:438
msgid "Enter a valid date/time."
msgstr ""
-#: forms/fields.py:475
+#: forms/fields.py:512
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
-#: forms/fields.py:476
+#: forms/fields.py:513
msgid "No file was submitted."
msgstr ""
-#: forms/fields.py:477
+#: forms/fields.py:514
msgid "The submitted file is empty."
msgstr ""
-#: forms/fields.py:478
+#: forms/fields.py:516
#, python-format
-msgid ""
+msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
+msgid_plural ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
-#: forms/fields.py:479
+#: forms/fields.py:519
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:534
+#: forms/fields.py:580
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: forms/fields.py:580
-msgid "Enter a valid URL."
-msgstr ""
-
-#: forms/fields.py:666 forms/fields.py:746
+#: forms/fields.py:733 forms/fields.py:811
#, python-format
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:1002
+#: forms/fields.py:812 forms/fields.py:915 forms/models.py:1026
msgid "Enter a list of values."
msgstr ""
-#: forms/formsets.py:324 forms/formsets.py:326
+#: forms/forms.py:158
+#, python-format
+msgid "(Hidden field %(name)s) %(error)s"
+msgstr ""
+
+#: forms/formsets.py:305
+#, python-format
+msgid "Please submit %s or fewer forms."
+msgstr ""
+
+#: forms/formsets.py:331 forms/formsets.py:333
msgid "Order"
msgstr ""
-#: forms/formsets.py:328
+#: forms/formsets.py:335
msgid "Delete"
msgstr ""
-#: forms/models.py:567
+#: forms/models.py:584
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:571
+#: forms/models.py:588
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:577
+#: forms/models.py:594
#, 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:585
+#: forms/models.py:602
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:852
+#: forms/models.py:868
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:913
+#: forms/models.py:932
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:1003
+#: forms/models.py:1027
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:1005
+#: forms/models.py:1029
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/util.py:81
+#: forms/util.py:84
#, 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:336
+#: forms/widgets.py:326
msgid "Currently"
msgstr ""
-#: forms/widgets.py:337
+#: forms/widgets.py:327
msgid "Change"
msgstr ""
-#: forms/widgets.py:338
+#: forms/widgets.py:328
msgid "Clear"
msgstr ""
-#: forms/widgets.py:594
+#: forms/widgets.py:546
msgid "Unknown"
msgstr ""
-#: forms/widgets.py:595
+#: forms/widgets.py:547
msgid "Yes"
msgstr ""
-#: forms/widgets.py:596
+#: forms/widgets.py:548
msgid "No"
msgstr ""
-#: template/defaultfilters.py:794
+#: template/defaultfilters.py:785
msgid "yes,no,maybe"
msgstr ""
-#: template/defaultfilters.py:822 template/defaultfilters.py:833
+#: template/defaultfilters.py:813 template/defaultfilters.py:824
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:835
+#: template/defaultfilters.py:826
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:837
+#: template/defaultfilters.py:828
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:830
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:841
+#: template/defaultfilters.py:832
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:842
+#: template/defaultfilters.py:833
#, python-format
msgid "%s PB"
msgstr ""
@@ -1090,63 +1122,59 @@ msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:239
+#: utils/text.py:225
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:256
+#: utils/text.py:242 utils/timesince.py:54
msgid ", "
msgstr ""
#: utils/timesince.py:22
-msgid "year"
-msgid_plural "years"
+#, python-format
+msgid "%d year"
+msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
#: utils/timesince.py:23
-msgid "month"
-msgid_plural "months"
+#, python-format
+msgid "%d month"
+msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
#: utils/timesince.py:24
-msgid "week"
-msgid_plural "weeks"
+#, python-format
+msgid "%d week"
+msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
#: utils/timesince.py:25
-msgid "day"
-msgid_plural "days"
+#, python-format
+msgid "%d day"
+msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
#: utils/timesince.py:26
-msgid "hour"
-msgid_plural "hours"
+#, python-format
+msgid "%d hour"
+msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
#: utils/timesince.py:27
-msgid "minute"
-msgid_plural "minutes"
+#, python-format
+msgid "%d minute"
+msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
#: utils/timesince.py:43
-msgid "minutes"
-msgstr ""
-
-#: utils/timesince.py:48
-#, python-format
-msgid "%(number)d %(type)s"
-msgstr ""
-
-#: utils/timesince.py:54
-#, python-format
-msgid ", %(number)d %(type)s"
+msgid "0 minutes"
msgstr ""
#: views/static.py:56
@@ -1158,7 +1186,7 @@ msgstr ""
msgid "\"%(path)s\" does not exist"
msgstr ""
-#: views/static.py:98
+#: views/static.py:99
#, python-format
msgid "Index of %(directory)s"
msgstr ""
@@ -1179,19 +1207,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:368 views/generic/dates.py:393
+#: views/generic/dates.py:368 views/generic/dates.py:396
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:646
+#: views/generic/dates.py:649
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:678
+#: views/generic/dates.py:681
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1201,16 +1229,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:51
+#: views/generic/list.py:54
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:56
+#: views/generic/list.py:59
#, python-format
msgid "Invalid page (%(page_number)s): %(message)s"
msgstr ""
-#: views/generic/list.py:137
+#: views/generic/list.py:150
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
View
124 django/contrib/admin/locale/en/LC_MESSAGES/django.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-01 16:10+0100\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2013-01-02 08:52+0000\n"
"Last-Translator: Ramiro Morales <cramm0@gmail.com>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: actions.py:48
@@ -21,12 +21,12 @@ msgstr ""
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Successfully deleted %(count)d %(items)s."
-#: actions.py:60 options.py:1347
+#: actions.py:60 options.py:1361
#, python-format
msgid "Cannot delete %(name)s"
msgstr "Cannot delete %(name)s"
-#: actions.py:62 options.py:1349
+#: actions.py:62 options.py:1363
msgid "Are you sure?"
msgstr "Are you sure?"
@@ -88,93 +88,93 @@ msgstr "Please log in again, because your session has expired."
msgid "Action:"
msgstr "Action:"
-#: models.py:24
+#: models.py:25
msgid "action time"
msgstr "action time"
-#: models.py:27
+#: models.py:28
msgid "object id"
msgstr "object id"
-#: models.py:28
+#: models.py:29
msgid "object repr"
msgstr "object repr"
-#: models.py:29
+#: models.py:30
msgid "action flag"
msgstr "action flag"
-#: models.py:30
+#: models.py:31
msgid "change message"
msgstr "change message"
-#: models.py:35
+#: models.py:36
msgid "log entry"
msgstr "log entry"
-#: models.py:36
+#: models.py:37
msgid "log entries"
msgstr "log entries"
-#: models.py:45
+#: models.py:46
#, python-format
msgid "Added \"%(object)s\"."
msgstr "Added \"%(object)s\"."
-#: models.py:47
+#: models.py:48
#, python-format
msgid "Changed \"%(object)s\" - %(changes)s"
msgstr "Changed \"%(object)s\" - %(changes)s"
-#: models.py:52
+#: models.py:53
#, python-format
msgid "Deleted \"%(object)s.\""
msgstr "Deleted \"%(object)s.\""
-#: models.py:54
+#: models.py:55
msgid "LogEntry Object"
msgstr "LogEntry Object"
-#: options.py:156 options.py:172
+#: options.py:163 options.py:192
msgid "None"
msgstr "None"
-#: options.py:684
+#: options.py:710
#, python-format
msgid "Changed %s."
msgstr "Changed %s."
-#: options.py:684 options.py:694
+#: options.py:710 options.py:720 options.py:1510
msgid "and"
msgstr "and"
-#: options.py:689
+#: options.py:715
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Added %(name)s \"%(object)s\"."
-#: options.py:693
+#: options.py:719
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Changed %(list)s for %(name)s \"%(object)s\"."
-#: options.py:698
+#: options.py:724
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Deleted %(name)s \"%(object)s\"."
-#: options.py:702
+#: options.py:728
msgid "No fields changed."
msgstr "No fields changed."
-#: options.py:807 options.py:860
+#: options.py:831 options.py:874
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-#: options.py:835
+#: options.py:849
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may add another "
@@ -183,12 +183,12 @@ msgstr ""
"The %(name)s \"%(obj)s\" was added successfully. You may add another "
"%(name)s below."
-#: options.py:839
+#: options.py:853
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "The %(name)s \"%(obj)s\" was added successfully."
-#: options.py:853
+#: options.py:867
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
@@ -197,7 +197,7 @@ msgstr ""
"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
"below."
-#: options.py:867
+#: options.py:881
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
@@ -206,12 +206,12 @@ msgstr ""
"The %(name)s \"%(obj)s\" was changed successfully. You may add another "
"%(name)s below."
-#: options.py:873
+#: options.py:887
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "The %(name)s \"%(obj)s\" was changed successfully."
-#: options.py:951 options.py:1211
+#: options.py:965 options.py:1225
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
@@ -219,69 +219,84 @@ msgstr ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
-#: options.py:970
+#: options.py:984
msgid "No action selected."
msgstr "No action selected."
-#: options.py:1050
+#: options.py:1064
#, python-format
msgid "Add %s"
msgstr "Add %s"
-#: options.py:1074 options.py:1319
+#: options.py:1088 options.py:1333
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "%(name)s object with primary key %(key)r does not exist."
-#: options.py:1140
+#: options.py:1154
#, python-format
msgid "Change %s"
msgstr "Change %s"
-#: options.py:1190
+#: options.py:1204
msgid "Database error"
msgstr "Database error"
-#: options.py:1253
+#: options.py:1267
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
msgstr[0] "%(count)s %(name)s was changed successfully."
msgstr[1] "%(count)s %(name)s were changed successfully."
-#: options.py:1280
+#: options.py:1294
#, python-format
msgid "%(total_count)s selected"
msgid_plural "All %(total_count)s selected"
msgstr[0] "%(total_count)s selected"
msgstr[1] "All %(total_count)s selected"
-#: options.py:1285
+#: options.py:1299
#, python-format
msgid "0 of %(cnt)s selected"
msgstr "0 of %(cnt)s selected"
-#: options.py:1335
+#: options.py:1349
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "The %(name)s \"%(obj)s\" was deleted successfully."
-#: options.py:1382
+#: options.py:1402
#, python-format
msgid "Change history: %s"
msgstr "Change history: %s"
-#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#. Translators: Model verbose name and instance representation, suitable to be an item in a list
+#: options.py:1504
+#, python-format
+msgid "%(class_name)s %(instance)s"
+msgstr ""
+
+#: options.py:1511
+#, fuzzy, python-format
+msgid ""
+"Deleting %(class_name)s %(instance)s would require deleting the following "
+"protected related objects: %(related_objects)s"
+msgstr ""
+"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
+"following protected related objects:"
+
+#: sites.py:324 tests.py:71 templates/admin/login.html:48
#: templates/registration/password_reset_complete.html:19
#: views/decorators.py:24
msgid "Log in"
msgstr "Log in"
-#: sites.py:388
+#: sites.py:392
msgid "Site administration"
msgstr "Site administration"
-#: sites.py:440
+#: sites.py:446
#, python-format
msgid "%s administration"
msgstr "%s administration"
@@ -298,15 +313,15 @@ msgstr "Time:"
msgid "Lookup"
msgstr "Lookup"
-#: widgets.py:271
+#: widgets.py:260
msgid "Add Another"
msgstr "Add Another"
-#: widgets.py:316
+#: widgets.py:302
msgid "Currently:"
msgstr "Currently:"
-#: widgets.py:317
+#: widgets.py:303
msgid "Change:"
msgstr "Change:"
@@ -788,13 +803,20 @@ msgid "Password reset successful"
msgstr "Password reset successful"
#: templates/registration/password_reset_done.html:17
+#, fuzzy
msgid ""
-"We've emailed you instructions for setting your password to the email "
-"address you submitted. You should be receiving it shortly."
+"We've emailed you instructions for setting your password. You should be "
+"receiving them shortly."
msgstr ""
"We've emailed you instructions for setting your password to the email "
"address you submitted. You should be receiving it shortly."
+#: templates/registration/password_reset_done.html:19
+msgid ""
+"If you don't receive an email, please make sure you've entered the address "
+"you registered with, and check your spam folder."
+msgstr ""
+
#: templates/registration/password_reset_email.html:2
#, python-format
msgid ""
@@ -837,20 +859,20 @@ msgstr "Email address:"
msgid "Reset my password"
msgstr "Reset my password"
-#: templatetags/admin_list.py:344
+#: templatetags/admin_list.py:348
msgid "All dates"
msgstr "All dates"
-#: views/main.py:33
+#: views/main.py:37
msgid "(None)"
msgstr "(None)"
-#: views/main.py:76
+#: views/main.py:86
#, python-format
msgid "Select %s"
msgstr "Select %s"
-#: views/main.py:78
+#: views/main.py:88
#, python-format
msgid "Select %s to change"
msgstr "Select %s to change"
View
12 django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-23 02:35+0100\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2012-03-08 10:42+0000\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: static/admin/js/SelectFilter2.js:45
@@ -93,7 +93,7 @@ msgstr ""
"You have unsaved changes on individual editable fields. If you run an "
"action, your unsaved changes will be lost."
-#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5
msgid ""
"You have selected an action, but you haven't saved your changes to "
"individual fields yet. Please click OK to save. You'll need to re-run the "
@@ -113,7 +113,7 @@ msgstr ""
"fields. You're probably looking for the Go button rather than the Save "
"button."
-#: static/admin/js/calendar.js:26
+#: static/admin/js/calendar.js:8
msgid ""
"January February March April May June July August September October November "
"December"
@@ -121,7 +121,7 @@ msgstr ""
"January February March April May June July August September October November "
"December"
-#: static/admin/js/calendar.js:27
+#: static/admin/js/calendar.js:9
msgid "S M T W T F S"
msgstr "S M T W T F S"
@@ -130,7 +130,7 @@ msgstr "S M T W T F S"
msgid "Show"
msgstr "Show"
-#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
+#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1
msgid "Hide"
msgstr "Hide"
View
30 django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
@@ -6,69 +6,69 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-22 09:28+0200\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2012-10-22 08:46+0000\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: views.py:58 views.py:60 views.py:62
+#: views.py:59 views.py:61 views.py:63
msgid "tag:"
msgstr "tag:"
-#: views.py:93 views.py:95 views.py:97
+#: views.py:94 views.py:96 views.py:98
msgid "filter:"
msgstr "filter:"
-#: views.py:156 views.py:158 views.py:160
+#: views.py:157 views.py:159 views.py:161
msgid "view:"
msgstr "view:"
-#: views.py:188
+#: views.py:189
#, python-format
msgid "App %r not found"
msgstr "App %r not found"
-#: views.py:195
+#: views.py:196
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr "Model %(model_name)r not found in app %(app_label)r"
-#: views.py:207
+#: views.py:208
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "the related `%(app_label)s.%(data_type)s` object"
-#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
-#: views.py:264
+#: views.py:208 views.py:227 views.py:232 views.py:246 views.py:260
+#: views.py:265
msgid "model:"
msgstr "model:"
-#: views.py:222 views.py:254
+#: views.py:223 views.py:255
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "related `%(app_label)s.%(object_name)s` objects"
-#: views.py:226 views.py:259
+#: views.py:227 views.py:260
#, python-format
msgid "all %s"
msgstr "all %s"
-#: views.py:231 views.py:264
+#: views.py:232 views.py:265
#, python-format
msgid "number of %s"
msgstr "number of %s"
-#: views.py:269
+#: views.py:270
#, python-format
msgid "Fields on %s objects"
msgstr "Fields on %s objects"
-#: views.py:361
+#: views.py:362
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s does not appear to be a urlpattern object"
View
111 django/contrib/auth/locale/en/LC_MESSAGES/django.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-15 23:27+0100\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2012-12-16 08:51+0000\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: admin.py:41
@@ -28,56 +28,56 @@ msgstr "Permissions"
msgid "Important dates"
msgstr "Important dates"
-#: admin.py:126
+#: admin.py:132
msgid "Password changed successfully."
msgstr "Password changed successfully."
-#: admin.py:136
+#: admin.py:142
#, python-format
msgid "Change password: %s"
msgstr "Change password: %s"
-#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384
+#: forms.py:33 tests/forms.py:261 tests/forms.py:266 tests/forms.py:407
msgid "No password set."
msgstr "No password set."
-#: forms.py:37 tests/forms.py:261 tests/forms.py:267
+#: forms.py:39 tests/forms.py:271 tests/forms.py:277
msgid "Invalid password format or unknown hashing algorithm."
msgstr "Invalid password format or unknown hashing algorithm."
-#: forms.py:67
+#: forms.py:72
msgid "A user with that username already exists."
msgstr "A user with that username already exists."
-#: forms.py:68 forms.py:269 forms.py:329
+#: forms.py:73 forms.py:254 forms.py:314
msgid "The two password fields didn't match."
msgstr "The two password fields didn't match."
-#: forms.py:70 forms.py:115
+#: forms.py:75 forms.py:120
msgid "Username"
msgstr "Username"
-#: forms.py:72 forms.py:116
+#: forms.py:77 forms.py:121
msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
msgstr "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-#: forms.py:75 forms.py:119
+#: forms.py:80 forms.py:124
msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
msgstr "This value may contain only letters, numbers and @/./+/-/_ characters."
-#: forms.py:77 forms.py:121 forms.py:148 forms.py:331
+#: forms.py:82 forms.py:126 forms.py:153 forms.py:316
msgid "Password"
msgstr "Password"
-#: forms.py:79
+#: forms.py:84
msgid "Password confirmation"
msgstr "Password confirmation"
-#: forms.py:81
+#: forms.py:86
msgid "Enter the same password as above, for verification."
msgstr "Enter the same password as above, for verification."
-#: forms.py:122
+#: forms.py:127
msgid ""
"Raw passwords are not stored, so there is no way to see this user's "
"password, but you can change the password using <a href=\"password/\">this "
@@ -87,7 +87,7 @@ msgstr ""
"password, but you can change the password using <a href=\"password/\">this "
"form</a>."
-#: forms.py:151
+#: forms.py:156
#, python-format
msgid ""
"Please enter a correct %(username)s and password. Note that both fields may "
@@ -96,80 +96,57 @@ msgstr ""
"Please enter a correct %(username)s and password. Note that both fields may "
"be case-sensitive."
-#: forms.py:153
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-
-#: forms.py:155
+#: forms.py:158
msgid "This account is inactive."
msgstr "This account is inactive."
#: forms.py:206
-msgid ""
-"That email address doesn't have an associated user account. Are you sure "
-"you've registered?"
-msgstr ""
-"That email address doesn't have an associated user account. Are you sure "
-"you've registered?"
-
-#: forms.py:208 tests/forms.py:374
-msgid ""
-"The user account associated with this email address cannot reset the "
-"password."
-msgstr ""
-"The user account associated with this email address cannot reset the "
-"password."
-
-#: forms.py:211
msgid "Email"
msgstr "Email"
-#: forms.py:271
+#: forms.py:256
msgid "New password"
msgstr "New password"
-#: forms.py:273
+#: forms.py:258
msgid "New password confirmation"
msgstr "New password confirmation"
-#: forms.py:302
+#: forms.py:287
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr "Your old password was entered incorrectly. Please enter it again."
-#: forms.py:305
+#: forms.py:290
msgid "Old password"
msgstr "Old password"
-#: forms.py:333
+#: forms.py:318
msgid "Password (again)"
msgstr "Password (again)"
-#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
-#: hashers.py:412
+#: hashers.py:243 hashers.py:317 hashers.py:365 hashers.py:393 hashers.py:426
+#: hashers.py:459 hashers.py:493
msgid "algorithm"
msgstr "algorithm"
-#: hashers.py:242
+#: hashers.py:244
msgid "iterations"
msgstr "iterations"
-#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
+#: hashers.py:245 hashers.py:319 hashers.py:366 hashers.py:394 hashers.py:494
msgid "salt"
msgstr "salt"
-#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
+#: hashers.py:246 hashers.py:367 hashers.py:395 hashers.py:427 hashers.py:460
+#: hashers.py:495
msgid "hash"
msgstr "hash"
-#: hashers.py:293
+#: hashers.py:318
msgid "work factor"
msgstr "work factor"
-#: hashers.py:295
+#: hashers.py:320
msgid "checksum"
msgstr "checksum"
@@ -287,7 +264,7 @@ msgstr "user"
msgid "users"
msgstr "users"
-#: views.py:94
+#: views.py:89
msgid "Logged out"
msgstr "Logged out"
@@ -295,3 +272,29 @@ msgstr "Logged out"
#, python-format
msgid "Password reset on %(site_name)s"
msgstr "Password reset on %(site_name)s"
+
+#: tests/forms.py:325
+#, fuzzy
+msgid "Enter a valid email address."
+msgstr "Enter a valid username."
+
+#~ msgid ""
+#~ "Your Web browser doesn't appear to have cookies enabled. Cookies are "
+#~ "required for logging in."
+#~ msgstr ""
+#~ "Your Web browser doesn't appear to have cookies enabled. Cookies are "
+#~ "required for logging in."
+
+#~ msgid ""
+#~ "That email address doesn't have an associated user account. Are you sure "
+#~ "you've registered?"
+#~ msgstr ""
+#~ "That email address doesn't have an associated user account. Are you sure "
+#~ "you've registered?"
+
+#~ msgid ""
+#~ "The user account associated with this email address cannot reset the "
+#~ "password."
+#~ msgstr ""
+#~ "The user account associated with this email address cannot reset the "
+#~ "password."
View
63 django/contrib/comments/locale/en/LC_MESSAGES/django.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2012-02-14 13:24+0000\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: admin.py:25
@@ -25,42 +25,38 @@ msgid "Metadata"
msgstr "Metadata"
#: admin.py:55
-msgid "flagged"
-msgid_plural "flagged"
-msgstr[0] "flagged"
-msgstr[1] "flagged"
+#, fuzzy, python-format
+msgid "%d comment was successfully flagged"
+msgid_plural "%d comments were successfully flagged"
+msgstr[0] "1 comment was successfully %(action)s."
+msgstr[1] "%(count)s comments were successfully %(action)s."
-#: admin.py:56
+#: admin.py:57
msgid "Flag selected comments"
msgstr "Flag selected comments"
-#: admin.py:60
-msgid "approved"
-msgid_plural "approved"
-msgstr[0] "approved"
-msgstr[1] "approved"
-
#: admin.py:61
+#, fuzzy, python-format
+msgid "%d comment was successfully approved"
+msgid_plural "%d comments were successfully approved"
+msgstr[0] "1 comment was successfully %(action)s."
+msgstr[1] "%(count)s comments were successfully %(action)s."
+
+#: admin.py:63
msgid "Approve selected comments"
msgstr "Approve selected comments"
-#: admin.py:65
-msgid "removed"
-msgid_plural "removed"
-msgstr[0] "removed"
-msgstr[1] "removed"
+#: admin.py:67
+#, fuzzy, python-format
+msgid "%d comment was successfully removed"
+msgid_plural "%d comments were successfully removed"
+msgstr[0] "1 comment was successfully %(action)s."
+msgstr[1] "%(count)s comments were successfully %(action)s."
-#: admin.py:66
+#: admin.py:69
msgid "Remove selected comments"
msgstr "Remove selected comments"
-#: admin.py:78
-#, python-format
-msgid "1 comment was successfully %(action)s."
-msgid_plural "%(count)s comments were successfully %(action)s."
-msgstr[0] "1 comment was successfully %(action)s."
-msgstr[1] "%(count)s comments were successfully %(action)s."
-
#: feeds.py:14
#, python-format
msgid "%(site_name)s comments"
@@ -301,3 +297,18 @@ msgstr "Post your comment"
#: templates/comments/preview.html:16
msgid "or make changes"
msgstr "or make changes"
+
+#~ msgid "flagged"
+#~ msgid_plural "flagged"
+#~ msgstr[0] "flagged"
+#~ msgstr[1] "flagged"
+
+#~ msgid "approved"
+#~ msgid_plural "approved"
+#~ msgstr[0] "approved"
+#~ msgstr[1] "approved"
+
+#~ msgid "removed"
+#~ msgid_plural "removed"
+#~ msgstr[0] "removed"
+#~ msgstr[1] "removed"
View
4 django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2012-03-08 11:45+0000\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: models.py:130
View
12 django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2012-10-18 10:56+0000\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: admin.py:10
@@ -79,19 +79,19 @@ msgstr ""
msgid "registration required"
msgstr "registration required"
-#: models.py:17
+#: models.py:18
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"If this is checked, only logged-in users will be able to view the page."
-#: models.py:22
+#: models.py:24
msgid "flat page"
msgstr "flat page"
-#: models.py:23
+#: models.py:25
msgid "flat pages"
msgstr "flat pages"
-#: tests/forms.py:97
+#: tests/forms.py:98
msgid "This field is required."
msgstr "This field is required."
View
17 django/contrib/formtools/locale/en/LC_MESSAGES/django.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2012-02-14 13:42+0000\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: templates/formtools/wizard/wizard_form.html:15
@@ -28,10 +28,9 @@ msgstr "prev step"
msgid "submit"
msgstr "submit"
-#: wizard/legacy.py:159
-msgid ""
-"We apologize, but your form has expired. Please continue filling out the "
-"form from this page."
-msgstr ""
-"We apologize, but your form has expired. Please continue filling out the "
-"form from this page."
+#~ msgid ""
+#~ "We apologize, but your form has expired. Please continue filling out the "
+#~ "form from this page."
+#~ msgstr ""
+#~ "We apologize, but your form has expired. Please continue filling out the "
+#~ "form from this page."
View
26 django/contrib/gis/locale/en/LC_MESSAGES/django.po
@@ -6,14 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:56+0200\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2012-03-08 12:32+0000\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: views.py:9
@@ -29,47 +29,47 @@ msgstr "Slug %r isn't registered."
msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
msgstr "The base GIS field -- maps to the OpenGIS Specification Geometry type."
-#: db/models/fields.py:271
+#: db/models/fields.py:270
msgid "Point"
msgstr "Point"
-#: db/models/fields.py:275
+#: db/models/fields.py:274
msgid "Line string"
msgstr "Line string"
-#: db/models/fields.py:279
+#: db/models/fields.py:278
msgid "Polygon"
msgstr "Polygon"
-#: db/models/fields.py:283
+#: db/models/fields.py:282
msgid "Multi-point"
msgstr "Multi-point"
-#: db/models/fields.py:287
+#: db/models/fields.py:286
msgid "Multi-line string"
msgstr "Multi-line string"
-#: db/models/fields.py:291
+#: db/models/fields.py:290
msgid "Multi polygon"
msgstr "Multi polygon"
-#: db/models/fields.py:295
+#: db/models/fields.py:294
msgid "Geometry collection"
msgstr "Geometry collection"
-#: forms/fields.py:19
+#: forms/fields.py:23
msgid "No geometry value provided."
msgstr "No geometry value provided."
-#: forms/fields.py:20
+#: forms/fields.py:24
msgid "Invalid geometry value."
msgstr "Invalid geometry value."
-#: forms/fields.py:21
+#: forms/fields.py:25
msgid "Invalid geometry type."
msgstr "Invalid geometry type."
-#: forms/fields.py:22
+#: forms/fields.py:26
msgid ""
"An error occurred when transforming the geometry to the SRID of the geometry "
"form field."
View
98 django/contrib/humanize/locale/en/LC_MESSAGES/django.po
@@ -6,286 +6,286 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-15 10:57+0200\n"
+"POT-Creation-Date: 2013-03-28 10:04+0100\n"
"PO-Revision-Date: 2012-02-14 13:08+0000\n"
"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
"Language-Team: English <en@li.org>\n"
+"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: tests.py:125 templatetags/humanize.py:167
+#: tests.py:131 templatetags/humanize.py:168
msgid "today"
msgstr "today"
-#: tests.py:125 templatetags/humanize.py:171
+#: tests.py:131 templatetags/humanize.py:172
msgid "yesterday"
msgstr "yesterday"
-#: tests.py:125 templatetags/humanize.py:169
+#: tests.py:131 templatetags/humanize.py:170
msgid "tomorrow"
msgstr "tomorrow"
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:26
msgid "th"
msgstr "th"
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:26
msgid "st"
msgstr "st"
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:26
msgid "nd"
msgstr "nd"
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:26
msgid "rd"
msgstr "rd"
-#: templatetags/humanize.py:54
+#: templatetags/humanize.py:55
#, python-format
msgid "%(value).1f million"
msgid_plural "%(value).1f million"
msgstr[0] "%(value).1f million"
msgstr[1] "%(value).1f million"
-#: templatetags/humanize.py:55
+#: templatetags/humanize.py:56
#, python-format
msgid "%(value)s million"
msgid_plural "%(value)s million"
msgstr[0] "%(value)s million"
msgstr[1] "%(value)s million"
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:59
#, python-format
msgid "%(value).1f billion"
msgid_plural "%(value).1f billion"
msgstr[0] "%(value).1f billion"
msgstr[1] "%(value).1f billion"
-#: templatetags/humanize.py:59
+#: templatetags/humanize.py:60
#, python-format
msgid "%(value)s billion"
msgid_plural "%(value)s billion"
msgstr[0] "%(value)s billion"
msgstr[1] "%(value)s billion"
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:63
#, python-format
msgid "%(value).1f trillion"
msgid_plural "%(value).1f trillion"
msgstr[0] "%(value).1f trillion"
msgstr[1] "%(value).1f trillion"
-#: templatetags/humanize.py:63
+#: templatetags/humanize.py:64
#, python-format
msgid "%(value)s trillion"
msgid_plural "%(value)s trillion"
msgstr[0] "%(value)s trillion"
msgstr[1] "%(value)s trillion"
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:67
#, python-format
msgid "%(value).1f quadrillion"
msgid_plural "%(value).1f quadrillion"
msgstr[0] "%(value).1f quadrillion"
msgstr[1] "%(value).1f quadrillion"
-#: templatetags/humanize.py:67
+#: templatetags/humanize.py:68
#, python-format
msgid "%(value)s quadrillion"
msgid_plural "%(value)s quadrillion"
msgstr[0] "%(value)s quadrillion"
msgstr[1] "%(value)s quadrillion"
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:71
#, python-format