Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated base translation files

  • Loading branch information...
commit 58365401c92d2377c93def71d33165a77f36157b 1 parent afbf913
@claudep claudep authored
View
292 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-03-23 02:29+0100\n"
+"POT-Creation-Date: 2012-10-15 10:55+0200\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -297,385 +297,386 @@ msgstr ""
msgid "Traditional Chinese"
msgstr ""
-#: core/validators.py:24 forms/fields.py:51
+#: core/validators.py:21 forms/fields.py:52
msgid "Enter a valid value."
msgstr ""
-#: core/validators.py:99 forms/fields.py:601
-msgid "This URL appears to be a broken link."
+#: core/validators.py:104 forms/fields.py:464
+msgid "Enter a valid email address."
msgstr ""
-#: core/validators.py:131 forms/fields.py:600
-msgid "Enter a valid URL."
-msgstr ""
-
-#: core/validators.py:165 forms/fields.py:474
-msgid "Enter a valid e-mail address."
-msgstr ""
-
-#: core/validators.py:168 forms/fields.py:1023
+#: core/validators.py:107 forms/fields.py:1013
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:171 core/validators.py:188 forms/fields.py:997
+#: core/validators.py:110 core/validators.py:129 forms/fields.py:987
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:175 core/validators.py:189
+#: core/validators.py:115 core/validators.py:130
msgid "Enter a valid IPv6 address."
msgstr ""
-#: core/validators.py:184 core/validators.py:187
+#: core/validators.py:125 core/validators.py:128
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: core/validators.py:209 db/models/fields/__init__.py:638
+#: core/validators.py:151 db/models/fields/__init__.py:655
msgid "Enter only digits separated by commas."
msgstr ""
-#: core/validators.py:215
+#: core/validators.py:157
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262
+#: core/validators.py:176 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263
+#: core/validators.py:182 forms/fields.py:211 forms/fields.py:264
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:244
+#: core/validators.py:189
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr ""
-#: core/validators.py:250
+#: core/validators.py:196
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)."
msgstr ""
-#: db/models/base.py:764
+#: db/models/base.py:843
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:787 forms/models.py:577
+#: db/models/base.py:866 forms/models.py:573
msgid "and"
msgstr ""
-#: db/models/base.py:788 db/models/fields/__init__.py:65
+#: db/models/base.py:867 db/models/fields/__init__.py:70
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:68
msgid "This field cannot be null."
msgstr ""
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:69
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:71
+#: db/models/fields/__init__.py:76
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
+#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985
msgid "Integer"
msgstr ""
-#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959
+#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983
#, python-format
msgid "'%s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:552
+#: db/models/fields/__init__.py:569
#, python-format
msgid "'%s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:554
+#: db/models/fields/__init__.py:571
msgid "Boolean (Either True or False)"
msgstr ""
-#: db/models/fields/__init__.py:605
+#: db/models/fields/__init__.py:622
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:633
+#: db/models/fields/__init__.py:650
msgid "Comma-separated integers"
msgstr ""
-#: db/models/fields/__init__.py:647
+#: db/models/fields/__init__.py:664
#, python-format
msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
msgstr ""
-#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734
+#: db/models/fields/__init__.py:666 db/models/fields/__init__.py:754
#, python-format
msgid ""
"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
msgstr ""
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:669
msgid "Date (without time)"
msgstr ""
-#: db/models/fields/__init__.py:732
+#: db/models/fields/__init__.py:752
#, 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:736
+#: db/models/fields/__init__.py:756
#, 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:740
+#: db/models/fields/__init__.py:760
msgid "Date (with time)"
msgstr ""
-#: db/models/fields/__init__.py:831
+#: db/models/fields/__init__.py:849
#, python-format
msgid "'%s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:833
+#: db/models/fields/__init__.py:851
msgid "Decimal number"
msgstr ""
-#: db/models/fields/__init__.py:890
-msgid "E-mail address"
+#: db/models/fields/__init__.py:908
+msgid "Email address"
msgstr ""
-#: db/models/fields/__init__.py:906
+#: db/models/fields/__init__.py:927
msgid "File path"
msgstr ""
-#: db/models/fields/__init__.py:930
+#: db/models/fields/__init__.py:954
#, python-format
msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:932
+#: db/models/fields/__init__.py:956
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:993
+#: db/models/fields/__init__.py:1017
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:1007
+#: db/models/fields/__init__.py:1031
msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:1023
+#: db/models/fields/__init__.py:1047
msgid "IP address"
msgstr ""
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1090
#, python-format
msgid "'%s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1067
+#: db/models/fields/__init__.py:1092
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: db/models/fields/__init__.py:1116
+#: db/models/fields/__init__.py:1141
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:1127
+#: db/models/fields/__init__.py:1152
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:1138
+#: db/models/fields/__init__.py:1163
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1156
+#: db/models/fields/__init__.py:1181
msgid "Small integer"
msgstr ""
-#: db/models/fields/__init__.py:1162
+#: db/models/fields/__init__.py:1187
msgid "Text"
msgstr ""
-#: db/models/fields/__init__.py:1180
+#: db/models/fields/__init__.py:1205
#, python-format
msgid ""
"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
msgstr ""
-#: db/models/fields/__init__.py:1182
+#: db/models/fields/__init__.py:1207
#, 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:1185
+#: db/models/fields/__init__.py:1210
msgid "Time"
msgstr ""
-#: db/models/fields/__init__.py:1249
+#: db/models/fields/__init__.py:1272
msgid "URL"
msgstr ""
-#: db/models/fields/files.py:214
+#: db/models/fields/files.py:211
+#, python-format
+msgid "Filename is %(extra)d characters too long."
+msgstr ""
+
+#: db/models/fields/files.py:221
msgid "File"
msgstr ""
-#: db/models/fields/files.py:321
+#: db/models/fields/files.py:347
msgid "Image"
msgstr ""
-#: db/models/fields/related.py:903
+#: db/models/fields/related.py:950
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:905
+#: db/models/fields/related.py:952
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:1033
+#: db/models/fields/related.py:1082
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1149
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1120
+#: db/models/fields/related.py:1174
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: forms/fields.py:50
+#: forms/fields.py:51
msgid "This field is required."
msgstr ""
-#: forms/fields.py:208
+#: forms/fields.py:209
msgid "Enter a whole number."
msgstr ""
-#: forms/fields.py:240 forms/fields.py:261
+#: forms/fields.py:241 forms/fields.py:262
msgid "Enter a number."
msgstr ""
-#: forms/fields.py:264
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr ""
-#: forms/fields.py:265
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr ""
-#: forms/fields.py:266
+#: forms/fields.py:267
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
-#: forms/fields.py:365 forms/fields.py:963
+#: forms/fields.py:355 forms/fields.py:953
msgid "Enter a valid date."
msgstr ""
-#: forms/fields.py:388 forms/fields.py:964
+#: forms/fields.py:378 forms/fields.py:954
msgid "Enter a valid time."
msgstr ""
-#: forms/fields.py:409
+#: forms/fields.py:399
msgid "Enter a valid date/time."
msgstr ""
-#: forms/fields.py:485
+#: forms/fields.py:475
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
-#: forms/fields.py:486
+#: forms/fields.py:476
msgid "No file was submitted."
msgstr ""
-#: forms/fields.py:487
+#: forms/fields.py:477
msgid "The submitted file is empty."
msgstr ""
-#: forms/fields.py:488
+#: forms/fields.py:478
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-#: forms/fields.py:489
+#: forms/fields.py:479
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:544
+#: forms/fields.py:534
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: forms/fields.py:689 forms/fields.py:769
+#: forms/fields.py:580
+msgid "Enter a valid URL."
+msgstr ""
+
+#: forms/fields.py:666 forms/fields.py:746
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999
+#: forms/fields.py:747 forms/fields.py:835 forms/models.py:999
msgid "Enter a list of values."
msgstr ""
-#: forms/formsets.py:317 forms/formsets.py:319
+#: forms/formsets.py:323 forms/formsets.py:325
msgid "Order"
msgstr ""
-#: forms/formsets.py:321
+#: forms/formsets.py:327
msgid "Delete"
msgstr ""
-#: forms/models.py:571
+#: forms/models.py:567
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:575
+#: forms/models.py:571
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:581
+#: forms/models.py:577
#, 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:589
+#: forms/models.py:585
msgid "Please correct the duplicate values below."
msgstr ""
@@ -697,94 +698,94 @@ msgstr ""
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/util.py:70
+#: forms/util.py:81
#, 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:325
+#: forms/widgets.py:336
msgid "Currently"
msgstr ""
-#: forms/widgets.py:326
+#: forms/widgets.py:337
msgid "Change"
msgstr ""
-#: forms/widgets.py:327
+#: forms/widgets.py:338
msgid "Clear"
msgstr ""
-#: forms/widgets.py:582
+#: forms/widgets.py:591
msgid "Unknown"
msgstr ""
-#: forms/widgets.py:583
+#: forms/widgets.py:592
msgid "Yes"
msgstr ""
-#: forms/widgets.py:584
+#: forms/widgets.py:593
msgid "No"
msgstr ""
-#: template/defaultfilters.py:797
+#: template/defaultfilters.py:794
msgid "yes,no,maybe"
msgstr ""
-#: template/defaultfilters.py:825 template/defaultfilters.py:830
+#: template/defaultfilters.py:822 template/defaultfilters.py:833
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:832
+#: template/defaultfilters.py:835
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:834
+#: template/defaultfilters.py:837
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:836
+#: template/defaultfilters.py:839
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:841
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:839
+#: template/defaultfilters.py:842
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:45
+#: utils/dateformat.py:47
msgid "p.m."
msgstr ""
-#: utils/dateformat.py:46
+#: utils/dateformat.py:48
msgid "a.m."
msgstr ""
-#: utils/dateformat.py:51
+#: utils/dateformat.py:53
msgid "PM"
msgstr ""
-#: utils/dateformat.py:52
+#: utils/dateformat.py:54
msgid "AM"
msgstr ""
-#: utils/dateformat.py:101
+#: utils/dateformat.py:103
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:103
+#: utils/dateformat.py:105
msgid "noon"
msgstr ""
@@ -1060,148 +1061,133 @@ msgctxt "alt. month"
msgid "December"
msgstr ""
-#: utils/text.py:65
+#: utils/text.py:70
#, python-format
msgctxt "String to return when truncating text"
msgid "%(truncated_text)s..."
msgstr ""
-#: utils/text.py:234
+#: utils/text.py:239
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:251
+#: utils/text.py:256
msgid ", "
msgstr ""
-#: utils/timesince.py:20
+#: utils/timesince.py:22
msgid "year"
msgid_plural "years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:21
+#: utils/timesince.py:23
msgid "month"
msgid_plural "months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:22
+#: utils/timesince.py:24
msgid "week"
msgid_plural "weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:23
+#: utils/timesince.py:25
msgid "day"
msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:24
+#: utils/timesince.py:26
msgid "hour"
msgid_plural "hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:27
msgid "minute"
msgid_plural "minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:41
+#: utils/timesince.py:43
msgid "minutes"
msgstr ""
-#: utils/timesince.py:46
+#: utils/timesince.py:48
#, python-format
msgid "%(number)d %(type)s"
msgstr ""
-#: utils/timesince.py:52
+#: utils/timesince.py:54
#, python-format
msgid ", %(number)d %(type)s"
msgstr ""
-#: views/static.py:52
+#: views/static.py:55
msgid "Directory indexes are not allowed here."
msgstr ""
-#: views/static.py:54
+#: views/static.py:57
#, python-format
msgid "\"%(path)s\" does not exist"
msgstr ""
-#: views/static.py:95
+#: views/static.py:98
#, python-format
msgid "Index of %(directory)s"
msgstr ""
-#: views/generic/create_update.py:121
-#, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr ""
-
-#: views/generic/create_update.py:164
-#, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr ""
-
-#: views/generic/create_update.py:207
-#, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr ""
-
-#: views/generic/dates.py:33
+#: views/generic/dates.py:42
msgid "No year specified"
msgstr ""
-#: views/generic/dates.py:58
+#: views/generic/dates.py:98
msgid "No month specified"
msgstr ""
-#: views/generic/dates.py:99
+#: views/generic/dates.py:157
msgid "No day specified"
msgstr ""
-#: views/generic/dates.py:138
+#: views/generic/dates.py:213
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:215
+#: views/generic/dates.py:368 views/generic/dates.py:393
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:467
+#: views/generic/dates.py:646
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:501
+#: views/generic/dates.py:678
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
-#: views/generic/detail.py:51
+#: views/generic/detail.py:54
#, python-format
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:45
+#: views/generic/list.py:49
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:50
+#: views/generic/list.py:54
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:117
+#: views/generic/list.py:134
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
View
345 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-03-23 02:34+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -32,39 +32,39 @@ msgstr ""
msgid "Delete selected %(verbose_name_plural)s"
msgstr ""
-#: filters.py:101 filters.py:191 filters.py:231 filters.py:268 filters.py:378
+#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380
msgid "All"
msgstr ""
-#: filters.py:232
+#: filters.py:238
msgid "Yes"
msgstr ""
-#: filters.py:233
+#: filters.py:239
msgid "No"
msgstr ""
-#: filters.py:247
+#: filters.py:253
msgid "Unknown"
msgstr ""
-#: filters.py:306
+#: filters.py:308
msgid "Any date"
msgstr ""
-#: filters.py:307
+#: filters.py:309
msgid "Today"
msgstr ""
-#: filters.py:311
+#: filters.py:313
msgid "Past 7 days"
msgstr ""
-#: filters.py:315
+#: filters.py:317
msgid "This month"
msgstr ""
-#: filters.py:319
+#: filters.py:321
msgid "This year"
msgstr ""
@@ -74,134 +74,129 @@ msgid ""
"that both fields are case-sensitive."
msgstr ""
-#: forms.py:18
+#: forms.py:19
msgid "Please log in again, because your session has expired."
msgstr ""
-#: forms.py:37
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-
-#: helpers.py:20
+#: helpers.py:23
msgid "Action:"
msgstr ""
-#: models.py:19
+#: models.py:24
msgid "action time"
msgstr ""
-#: models.py:22
+#: models.py:27
msgid "object id"
msgstr ""
-#: models.py:23
+#: models.py:28
msgid "object repr"
msgstr ""
-#: models.py:24
+#: models.py:29
msgid "action flag"
msgstr ""
-#: models.py:25
+#: models.py:30
msgid "change message"
msgstr ""
-#: models.py:30
+#: models.py:35
msgid "log entry"
msgstr ""
-#: models.py:31
+#: models.py:36
msgid "log entries"
msgstr ""
-#: models.py:40
+#: models.py:45
#, python-format
msgid "Added \"%(object)s\"."
msgstr ""
-#: models.py:42
+#: models.py:47
#, python-format
msgid "Changed \"%(object)s\" - %(changes)s"
msgstr ""
-#: models.py:44
+#: models.py:49
#, python-format
msgid "Deleted \"%(object)s.\""
msgstr ""
-#: models.py:46
+#: models.py:51
msgid "LogEntry Object"
msgstr ""
-#: options.py:150 options.py:166
+#: options.py:151 options.py:167
msgid "None"
msgstr ""
-#: options.py:671
+#: options.py:672
#, python-format
msgid "Changed %s."
msgstr ""
-#: options.py:671 options.py:681
+#: options.py:672 options.py:682
msgid "and"
msgstr ""
-#: options.py:676
+#: options.py:677
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr ""
-#: options.py:680
+#: options.py:681
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr ""
-#: options.py:685
+#: options.py:686
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr ""
-#: options.py:689
+#: options.py:690
msgid "No fields changed."
msgstr ""
-#: options.py:772
+#: options.py:773
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: options.py:776 options.py:824
+#: options.py:777 options.py:825
msgid "You may edit it again below."
msgstr ""
-#: options.py:788 options.py:837
+#: options.py:789 options.py:838
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: options.py:822
+#: options.py:823
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: options.py:830
+#: options.py:831
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: options.py:899 options.py:1159
+#: options.py:900 options.py:1159
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
-#: options.py:918
+#: options.py:919
msgid "No action selected."
msgstr ""
-#: options.py:998
+#: options.py:999
#, python-format
msgid "Add %s"
msgstr ""
@@ -249,34 +244,34 @@ msgstr ""
msgid "Change history: %s"
msgstr ""
-#: sites.py:315 tests.py:61 templates/admin/login.html:49
-#: templates/registration/password_reset_complete.html:20
-#: views/decorators.py:23
+#: sites.py:322 tests.py:57 templates/admin/login.html:48
+#: templates/registration/password_reset_complete.html:19
+#: views/decorators.py:24
msgid "Log in"
msgstr ""
-#: sites.py:380
+#: sites.py:388
msgid "Site administration"
msgstr ""
-#: sites.py:432
+#: sites.py:440
#, python-format
msgid "%s administration"
msgstr ""
-#: widgets.py:87
+#: widgets.py:90
msgid "Date:"
msgstr ""
-#: widgets.py:87
+#: widgets.py:91
msgid "Time:"
msgstr ""
-#: widgets.py:161
+#: widgets.py:165
msgid "Lookup"
msgstr ""
-#: widgets.py:267
+#: widgets.py:271
msgid "Add Another"
msgstr ""
@@ -288,39 +283,39 @@ msgstr ""
msgid "We're sorry, but the requested page could not be found."
msgstr ""
-#: templates/admin/500.html:7 templates/admin/app_index.html:8
-#: templates/admin/base.html:45 templates/admin/change_form.html:21
-#: templates/admin/change_list.html:43
-#: templates/admin/delete_confirmation.html:8
-#: templates/admin/delete_selected_confirmation.html:8
-#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
-#: templates/admin/auth/user/change_password.html:15
-#: templates/registration/logged_out.html:5
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_reset_complete.html:7
-#: templates/registration/password_reset_confirm.html:7
-#: templates/registration/password_reset_done.html:7
-#: templates/registration/password_reset_form.html:7
+#: templates/admin/500.html:6 templates/admin/app_index.html:7
+#: templates/admin/base.html:47 templates/admin/change_form.html:19
+#: templates/admin/change_list.html:41
+#: templates/admin/delete_confirmation.html:7
+#: templates/admin/delete_selected_confirmation.html:7
+#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7
+#: templates/admin/auth/user/change_password.html:13
+#: templates/registration/logged_out.html:4
+#: templates/registration/password_change_done.html:6
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_form.html:6
msgid "Home"
msgstr ""
-#: templates/admin/500.html:8
+#: templates/admin/500.html:7
msgid "Server error"
msgstr ""
-#: templates/admin/500.html:12
+#: templates/admin/500.html:11
msgid "Server error (500)"
msgstr ""
-#: templates/admin/500.html:15
+#: templates/admin/500.html:14
msgid "Server Error <em>(500)</em>"
msgstr ""
-#: templates/admin/500.html:16
+#: templates/admin/500.html:15
msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
+"There's been an error. It's been reported to the site administrators via "
+"email and should be fixed shortly. Thanks for your patience."
msgstr ""
#: templates/admin/actions.html:4
@@ -344,7 +339,7 @@ msgstr ""
msgid "Clear selection"
msgstr ""
-#: templates/admin/app_index.html:11 templates/admin/index.html:19
+#: templates/admin/app_index.html:10 templates/admin/index.html:21
#, python-format
msgid "%(name)s"
msgstr ""
@@ -354,22 +349,22 @@ msgid "Welcome,"
msgstr ""
#: templates/admin/base.html:33
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
msgid "Documentation"
msgstr ""
-#: templates/admin/base.html:35
-#: templates/admin/auth/user/change_password.html:19
-#: templates/admin/auth/user/change_password.html:53
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:36
+#: templates/admin/auth/user/change_password.html:17
+#: templates/admin/auth/user/change_password.html:51
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
msgid "Change password"
msgstr ""
-#: templates/admin/base.html:36
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_form.html:5
+#: templates/admin/base.html:38
+#: templates/registration/password_change_done.html:3
+#: templates/registration/password_change_form.html:4
msgid "Log out"
msgstr ""
@@ -381,35 +376,35 @@ msgstr ""
msgid "Django administration"
msgstr ""
-#: templates/admin/change_form.html:24 templates/admin/index.html:29
+#: templates/admin/change_form.html:22 templates/admin/index.html:33
msgid "Add"
msgstr ""
-#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
+#: templates/admin/change_form.html:32 templates/admin/object_history.html:11
msgid "History"
msgstr ""
-#: templates/admin/change_form.html:35
+#: templates/admin/change_form.html:33
#: templates/admin/edit_inline/stacked.html:9
#: templates/admin/edit_inline/tabular.html:30
msgid "View on site"
msgstr ""
-#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
-#: templates/admin/login.html:18
-#: templates/admin/auth/user/change_password.html:29
-#: templates/registration/password_change_form.html:21
+#: templates/admin/change_form.html:44 templates/admin/change_list.html:67
+#: templates/admin/login.html:17
+#: templates/admin/auth/user/change_password.html:27
+#: templates/registration/password_change_form.html:20
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: templates/admin/change_list.html:60
+#: templates/admin/change_list.html:58
#, python-format
msgid "Add %(name)s"
msgstr ""
-#: templates/admin/change_list.html:80
+#: templates/admin/change_list.html:78
msgid "Filter"
msgstr ""
@@ -426,12 +421,12 @@ msgstr ""
msgid "Toggle sorting"
msgstr ""
-#: templates/admin/delete_confirmation.html:12
+#: templates/admin/delete_confirmation.html:11
#: templates/admin/submit_line.html:4
msgid "Delete"
msgstr ""
-#: templates/admin/delete_confirmation.html:19
+#: templates/admin/delete_confirmation.html:18
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -439,30 +434,30 @@ msgid ""
"following types of objects:"
msgstr ""
-#: templates/admin/delete_confirmation.html:27
+#: templates/admin/delete_confirmation.html:26
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
"following protected related objects:"
msgstr ""
-#: templates/admin/delete_confirmation.html:35
+#: templates/admin/delete_confirmation.html:34
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
"All of the following related items will be deleted:"
msgstr ""
-#: templates/admin/delete_confirmation.html:40
-#: templates/admin/delete_selected_confirmation.html:45
+#: templates/admin/delete_confirmation.html:39
+#: templates/admin/delete_selected_confirmation.html:44
msgid "Yes, I'm sure"
msgstr ""
-#: templates/admin/delete_selected_confirmation.html:11
+#: templates/admin/delete_selected_confirmation.html:10
msgid "Delete multiple objects"
msgstr ""
-#: templates/admin/delete_selected_confirmation.html:18
+#: templates/admin/delete_selected_confirmation.html:17
#, python-format
msgid ""
"Deleting the selected %(objects_name)s would result in deleting related "
@@ -470,14 +465,14 @@ msgid ""
"types of objects:"
msgstr ""
-#: templates/admin/delete_selected_confirmation.html:26
+#: templates/admin/delete_selected_confirmation.html:25
#, python-format
msgid ""
"Deleting the selected %(objects_name)s would require deleting the following "
"protected related objects:"
msgstr ""
-#: templates/admin/delete_selected_confirmation.html:34
+#: templates/admin/delete_selected_confirmation.html:33
#, python-format
msgid ""
"Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -489,67 +484,63 @@ msgstr ""
msgid " By %(filter_title)s "
msgstr ""
-#: templates/admin/index.html:18
+#: templates/admin/index.html:20
#, python-format
-msgid "Models available in the %(name)s application."
+msgid "Models in the %(name)s application"
msgstr ""
-#: templates/admin/index.html:35
+#: templates/admin/index.html:39
msgid "Change"
msgstr ""
-#: templates/admin/index.html:45
+#: templates/admin/index.html:49
msgid "You don't have permission to edit anything."
msgstr ""
-#: templates/admin/index.html:53
+#: templates/admin/index.html:57
msgid "Recent Actions"
msgstr ""
-#: templates/admin/index.html:54
+#: templates/admin/index.html:58
msgid "My Actions"
msgstr ""
-#: templates/admin/index.html:58
+#: templates/admin/index.html:62
msgid "None available"
msgstr ""
-#: templates/admin/index.html:72
+#: templates/admin/index.html:76
msgid "Unknown content"
msgstr ""
-#: templates/admin/invalid_setup.html:13
+#: templates/admin/invalid_setup.html:12
msgid ""
"Something's wrong with your database installation. Make sure the appropriate "
"database tables have been created, and make sure the database is readable by "
"the appropriate user."
msgstr ""
-#: templates/admin/login.html:34
-msgid "Username:"
-msgstr ""
-
-#: templates/admin/login.html:38
+#: templates/admin/login.html:37
msgid "Password:"
msgstr ""
-#: templates/admin/login.html:45
+#: templates/admin/login.html:44
msgid "Forgotten your password or username?"
msgstr ""
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:23
msgid "Date/time"
msgstr ""
-#: templates/admin/object_history.html:25
+#: templates/admin/object_history.html:24
msgid "User"
msgstr ""
-#: templates/admin/object_history.html:26
+#: templates/admin/object_history.html:25
msgid "Action"
msgstr ""
-#: templates/admin/object_history.html:40
+#: templates/admin/object_history.html:39
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
@@ -601,147 +592,147 @@ msgstr ""
msgid "Enter a username and password."
msgstr ""
-#: templates/admin/auth/user/change_password.html:33
+#: templates/admin/auth/user/change_password.html:31
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
msgstr ""
-#: templates/admin/auth/user/change_password.html:40
+#: templates/admin/auth/user/change_password.html:38
msgid "Password"
msgstr ""
-#: templates/admin/auth/user/change_password.html:46
-#: templates/registration/password_change_form.html:43
+#: templates/admin/auth/user/change_password.html:44
+#: templates/registration/password_change_form.html:42
msgid "Password (again)"
msgstr ""
-#: templates/admin/auth/user/change_password.html:47
+#: templates/admin/auth/user/change_password.html:45
msgid "Enter the same password as above, for verification."
msgstr ""
-#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:115
-#, python-format
-msgid "Add another %(verbose_name)s"
+#: templates/admin/edit_inline/stacked.html:26
+#: templates/admin/edit_inline/tabular.html:76
+msgid "Remove"
msgstr ""
-#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:118
-msgid "Remove"
+#: templates/admin/edit_inline/stacked.html:27
+#: templates/admin/edit_inline/tabular.html:75
+#, python-format
+msgid "Add another %(verbose_name)s"
msgstr ""
#: templates/admin/edit_inline/tabular.html:17
msgid "Delete?"
msgstr ""
-#: templates/registration/logged_out.html:9
+#: templates/registration/logged_out.html:8
msgid "Thanks for spending some quality time with the Web site today."
msgstr ""
-#: templates/registration/logged_out.html:11
+#: templates/registration/logged_out.html:10
msgid "Log in again"
msgstr ""
-#: templates/registration/password_change_done.html:8
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:13
-#: templates/registration/password_change_form.html:25
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_change_form.html:12
+#: templates/registration/password_change_form.html:24
msgid "Password change"
msgstr ""
-#: templates/registration/password_change_done.html:12
-#: templates/registration/password_change_done.html:16
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:15
msgid "Password change successful"
msgstr ""
-#: templates/registration/password_change_done.html:18
+#: templates/registration/password_change_done.html:17
msgid "Your password was changed."
msgstr ""
-#: templates/registration/password_change_form.html:27
+#: templates/registration/password_change_form.html:26
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:32
msgid "Old password"
msgstr ""
-#: templates/registration/password_change_form.html:38
+#: templates/registration/password_change_form.html:37
msgid "New password"
msgstr ""
-#: templates/registration/password_change_form.html:49
-#: templates/registration/password_reset_confirm.html:27
+#: templates/registration/password_change_form.html:48
+#: templates/registration/password_reset_confirm.html:26
msgid "Change my password"
msgstr ""
-#: templates/registration/password_reset_complete.html:8
-#: templates/registration/password_reset_confirm.html:12
-#: templates/registration/password_reset_done.html:8
-#: templates/registration/password_reset_form.html:8
-#: templates/registration/password_reset_form.html:12
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:11
+#: templates/registration/password_reset_form.html:15
msgid "Password reset"
msgstr ""
-#: templates/registration/password_reset_complete.html:12
-#: templates/registration/password_reset_complete.html:16
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_complete.html:15
msgid "Password reset complete"
msgstr ""
-#: templates/registration/password_reset_complete.html:18
+#: templates/registration/password_reset_complete.html:17
msgid "Your password has been set. You may go ahead and log in now."
msgstr ""
-#: templates/registration/password_reset_confirm.html:8
+#: templates/registration/password_reset_confirm.html:7
msgid "Password reset confirmation"
msgstr ""
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:17
msgid "Enter new password"
msgstr ""
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:19
msgid ""
"Please enter your new password twice so we can verify you typed it in "
"correctly."
msgstr ""
-#: templates/registration/password_reset_confirm.html:24
+#: templates/registration/password_reset_confirm.html:23
msgid "New password:"
msgstr ""
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:25
msgid "Confirm password:"
msgstr ""
-#: templates/registration/password_reset_confirm.html:32
+#: templates/registration/password_reset_confirm.html:31
msgid "Password reset unsuccessful"
msgstr ""
-#: templates/registration/password_reset_confirm.html:34
+#: templates/registration/password_reset_confirm.html:33
msgid ""
"The password reset link was invalid, possibly because it has already been "
"used. Please request a new password reset."
msgstr ""
-#: templates/registration/password_reset_done.html:12
-#: templates/registration/password_reset_done.html:16
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_done.html:15
msgid "Password reset successful"
msgstr ""
-#: templates/registration/password_reset_done.html:18
+#: templates/registration/password_reset_done.html:17
msgid ""
-"We've e-mailed you instructions for setting your password to the e-mail "
+"We've emailed you instructions for setting your password to the email "
"address you submitted. You should be receiving it shortly."
msgstr ""
#: templates/registration/password_reset_email.html:2
#, python-format
msgid ""
-"You're receiving this e-mail because you requested a password reset for your "
+"You're receiving this email because you requested a password reset for your "
"user account at %(site_name)s."
msgstr ""
@@ -762,34 +753,34 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: templates/registration/password_reset_form.html:18
+#: templates/registration/password_reset_form.html:17
msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"Forgotten your password? Enter your email address below, and we'll email "
"instructions for setting a new one."
msgstr ""
-#: templates/registration/password_reset_form.html:22
-msgid "E-mail address:"
+#: templates/registration/password_reset_form.html:21
+msgid "Email address:"
msgstr ""
-#: templates/registration/password_reset_form.html:22
+#: templates/registration/password_reset_form.html:21
msgid "Reset my password"
msgstr ""
-#: templatetags/admin_list.py:336
+#: templatetags/admin_list.py:344
msgid "All dates"
msgstr ""
-#: views/main.py:31
+#: views/main.py:33
msgid "(None)"
msgstr ""
-#: views/main.py:74
+#: views/main.py:76
#, python-format
msgid "Select %s"
msgstr ""
-#: views/main.py:76
+#: views/main.py:78
#, python-format
msgid "Select %s to change"
msgstr ""
View
101 django/contrib/admindocs/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-03-23 02:36+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -13,63 +13,75 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: views.py:57 views.py:59 views.py:61
+#: views.py:58 views.py:60 views.py:62
msgid "tag:"
msgstr ""
-#: views.py:92 views.py:94 views.py:96
+#: views.py:93 views.py:95 views.py:97
msgid "filter:"
msgstr ""
-#: views.py:155 views.py:157 views.py:159
+#: views.py:156 views.py:158 views.py:160
msgid "view:"
msgstr ""
-#: views.py:187
+#: views.py:188
#, python-format
msgid "App %r not found"
msgstr ""
-#: views.py:194
+#: views.py:195
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr ""
-#: views.py:206
+#: views.py:207
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr ""
-#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
-#: views.py:263
+#: views.py:207 views.py:226 views.py:231 views.py:245 views.py:259
+#: views.py:264
msgid "model:"
msgstr ""
-#: views.py:221 views.py:253
+#: views.py:222 views.py:254
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr ""
-#: views.py:225 views.py:258
+#: views.py:226 views.py:259
#, python-format
msgid "all %s"
msgstr ""
-#: views.py:230 views.py:263
+#: views.py:231 views.py:264
#, python-format
msgid "number of %s"
msgstr ""
-#: views.py:268
+#: views.py:269
#, python-format
msgid "Fields on %s objects"
msgstr ""
-#: views.py:360
+#: views.py:361
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr ""
+#: templates/admin_doc/bookmarklets.html:6 templates/admin_doc/index.html:6
+#: templates/admin_doc/missing_docutils.html:6
+#: templates/admin_doc/model_detail.html:14
+#: templates/admin_doc/model_index.html:8
+#: templates/admin_doc/template_detail.html:6
+#: templates/admin_doc/template_filter_index.html:7
+#: templates/admin_doc/template_tag_index.html:7
+#: templates/admin_doc/view_detail.html:6
+#: templates/admin_doc/view_index.html:7
+msgid "Home"
+msgstr ""
+
#: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
#: templates/admin_doc/missing_docutils.html:7
#: templates/admin_doc/model_detail.html:15
@@ -79,30 +91,18 @@ msgstr ""
#: templates/admin_doc/template_tag_index.html:8
#: templates/admin_doc/view_detail.html:7
#: templates/admin_doc/view_index.html:8
-msgid "Home"
-msgstr ""
-
-#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
-#: templates/admin_doc/missing_docutils.html:8
-#: templates/admin_doc/model_detail.html:16
-#: templates/admin_doc/model_index.html:10
-#: templates/admin_doc/template_detail.html:8
-#: templates/admin_doc/template_filter_index.html:9
-#: templates/admin_doc/template_tag_index.html:9
-#: templates/admin_doc/view_detail.html:8
-#: templates/admin_doc/view_index.html:9
msgid "Documentation"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:9
+#: templates/admin_doc/bookmarklets.html:8
msgid "Bookmarklets"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:12
+#: templates/admin_doc/bookmarklets.html:11
msgid "Documentation bookmarklets"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:16
+#: templates/admin_doc/bookmarklets.html:15
msgid ""
"\n"
"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -113,60 +113,73 @@ msgid ""
"your computer is \"internal\").</p>\n"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:26
+#: templates/admin_doc/bookmarklets.html:25
msgid "Documentation for this page"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:26
msgid ""
"Jumps you from any page to the documentation for the view that generates "
"that page."
msgstr ""
-#: templates/admin_doc/bookmarklets.html:29
+#: templates/admin_doc/bookmarklets.html:28
msgid "Show object ID"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:30
+#: templates/admin_doc/bookmarklets.html:29
msgid ""
"Shows the content-type and unique ID for pages that represent a single "
"object."
msgstr ""
-#: templates/admin_doc/bookmarklets.html:32
+#: templates/admin_doc/bookmarklets.html:31
msgid "Edit this object (current window)"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:33
+#: templates/admin_doc/bookmarklets.html:32
msgid "Jumps to the admin page for pages that represent a single object."
msgstr ""
-#: templates/admin_doc/bookmarklets.html:35
+#: templates/admin_doc/bookmarklets.html:34
msgid "Edit this object (new window)"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:36
+#: templates/admin_doc/bookmarklets.html:35
msgid "As above, but opens the admin page in a new window."
msgstr ""
-#: templates/admin_doc/model_detail.html:17
-#: templates/admin_doc/model_index.html:11
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
msgid "Models"
msgstr ""
-#: templates/admin_doc/template_detail.html:9
+#: templates/admin_doc/template_detail.html:8
msgid "Templates"
msgstr ""
-#: templates/admin_doc/template_filter_index.html:10
+#: templates/admin_doc/template_filter_index.html:9
msgid "Filters"
msgstr ""
-#: templates/admin_doc/template_tag_index.html:10
+#: templates/admin_doc/template_tag_index.html:9
msgid "Tags"
msgstr ""
-#: templates/admin_doc/view_detail.html:9
-#: templates/admin_doc/view_index.html:10
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
msgid "Views"
msgstr ""
+
+#: tests/__init__.py:23
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: tests/__init__.py:29
+msgid "A custom field type"
+msgstr ""
+
+#: tests/__init__.py:33
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
View
138 django/contrib/auth/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-03-23 02:36+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -25,48 +25,56 @@ msgstr ""
msgid "Important dates"
msgstr ""
-#: admin.py:125
+#: admin.py:126
msgid "Password changed successfully."
msgstr ""
-#: admin.py:135
+#: admin.py:136
#, python-format
msgid "Change password: %s"
msgstr ""
-#: forms.py:62
+#: forms.py:31 tests/forms.py:249 tests/forms.py:254
+msgid "No password set."
+msgstr ""
+
+#: forms.py:37 tests/forms.py:259 tests/forms.py:265
+msgid "Invalid password format or unknown hashing algorithm."
+msgstr ""
+
+#: forms.py:65
msgid "A user with that username already exists."
msgstr ""
-#: forms.py:63 forms.py:251 forms.py:308
+#: forms.py:66 forms.py:257 forms.py:317
msgid "The two password fields didn't match."
msgstr ""
-#: forms.py:65 forms.py:110 forms.py:139
+#: forms.py:68 forms.py:113
msgid "Username"
msgstr ""
-#: forms.py:67 forms.py:111
+#: forms.py:70 forms.py:114
msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
msgstr ""
-#: forms.py:70 forms.py:114
+#: forms.py:73 forms.py:117
msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
msgstr ""
-#: forms.py:72 forms.py:116 forms.py:140 forms.py:310
+#: forms.py:75 forms.py:119 forms.py:140 forms.py:319
msgid "Password"
msgstr ""
-#: forms.py:74
+#: forms.py:77
msgid "Password confirmation"
msgstr ""
-#: forms.py:76
+#: forms.py:79
msgid "Enter the same password as above, for verification."
msgstr ""
-#: forms.py:117
+#: forms.py:120
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 "
@@ -89,178 +97,178 @@ msgstr ""
msgid "This account is inactive."
msgstr ""
-#: forms.py:191
+#: forms.py:196
msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
+"That email address doesn't have an associated user account. Are you sure "
"you've registered?"
msgstr ""
-#: forms.py:193
+#: forms.py:198 tests/forms.py:347
msgid ""
-"The user account associated with this e-mail address cannot reset the "
+"The user account associated with this email address cannot reset the "
"password."
msgstr ""
-#: forms.py:196
-msgid "E-mail"
+#: forms.py:201
+msgid "Email"
msgstr ""
-#: forms.py:253
+#: forms.py:259
msgid "New password"
msgstr ""
-#: forms.py:255
+#: forms.py:261
msgid "New password confirmation"
msgstr ""
-#: forms.py:284
+#: forms.py:290
msgid "Your old password was entered incorrectly. Please enter it again."
msgstr ""
-#: forms.py:287
+#: forms.py:293
msgid "Old password"
msgstr ""
-#: forms.py:312
+#: forms.py:321
msgid "Password (again)"
msgstr ""
-#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355
-#: hashers.py:389
+#: hashers.py:241 hashers.py:292 hashers.py:321 hashers.py:349 hashers.py:378
+#: hashers.py:412
msgid "algorithm"
msgstr ""
-#: hashers.py:219
+#: hashers.py:242
msgid "iterations"
msgstr ""
-#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390
+#: hashers.py:243 hashers.py:294 hashers.py:322 hashers.py:350 hashers.py:413
msgid "salt"
msgstr ""
-#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391
+#: hashers.py:244 hashers.py:323 hashers.py:351 hashers.py:379 hashers.py:414
msgid "hash"
msgstr ""
-#: hashers.py:270
+#: hashers.py:293
msgid "work factor"
msgstr ""
-#: hashers.py:272
+#: hashers.py:295
msgid "checksum"
msgstr ""
-#: models.py:66 models.py:113
+#: models.py:72 models.py:121
msgid "name"
msgstr ""
-#: models.py:68
+#: models.py:74
msgid "codename"
msgstr ""
-#: models.py:72
+#: models.py:78
msgid "permission"
msgstr ""
-#: models.py:73 models.py:115
+#: models.py:79 models.py:123
msgid "permissions"
msgstr ""
-#: models.py:120
+#: models.py:128
msgid "group"
msgstr ""
-#: models.py:121 models.py:250
+#: models.py:129 models.py:317
msgid "groups"
msgstr ""
#: models.py:232
-msgid "username"
+msgid "password"
msgstr ""
#: models.py:233
+msgid "last login"
+msgstr ""
+
+#: models.py:298
+msgid "username"
+msgstr ""
+
+#: models.py:299
msgid ""
"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
msgstr ""
-#: models.py:235
+#: models.py:302
+msgid "Enter a valid username."
+msgstr ""
+
+#: models.py:304
msgid "first name"
msgstr ""
-#: models.py:236
+#: models.py:305
msgid "last name"
msgstr ""
-#: models.py:237
-msgid "e-mail address"
+#: models.py:306
+msgid "email address"
msgstr ""
-#: models.py:238
-msgid "password"
-msgstr ""
-
-#: models.py:239
+#: models.py:307
msgid "staff status"
msgstr ""
-#: models.py:240
+#: models.py:308
msgid "Designates whether the user can log into this admin site."
msgstr ""
-#: models.py:242
+#: models.py:310
msgid "active"
msgstr ""
-#: models.py:243
+#: models.py:311
msgid ""
"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
msgstr ""
-#: models.py:245
+#: models.py:313
msgid "superuser status"
msgstr ""
-#: models.py:246
+#: models.py:314
msgid ""
"Designates that this user has all permissions without explicitly assigning "
"them."
msgstr ""
-#: models.py:248
-msgid "last login"
-msgstr ""
-
-#: models.py:249
+#: models.py:316
msgid "date joined"
msgstr ""
-#: models.py:251
+#: models.py:318
msgid ""
"The groups this user belongs to. A user will get all permissions granted to "
"each of his/her group."
msgstr ""
-#: models.py:255
+#: models.py:322
msgid "user permissions"
msgstr ""
-#: models.py:260
+#: models.py:331
msgid "user"
msgstr ""
-#: models.py:261
+#: models.py:332
msgid "users"
msgstr ""
-#: views.py:93
+#: views.py:97
msgid "Logged out"
msgstr ""
-#: management/commands/createsuperuser.py:27
-msgid "Enter a valid e-mail address."
-msgstr ""
-
#: templates/registration/password_reset_subject.txt:2
#, python-format
msgid "Password reset on %(site_name)s"
View
66 django/contrib/comments/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-03-23 02:37+0100\n"
+"POT-Creation-Date: 2012-10-15 10:56+0200\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -13,57 +13,57 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: admin.py:12
+#: admin.py:25
msgid "Content"
msgstr ""
-#: admin.py:15
+#: admin.py:28
msgid "Metadata"
msgstr ""
-#: admin.py:42
+#: admin.py:55
msgid "flagged"