Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated English base translation files in preparation of the alpha re…

…lease so Transifex can pick them up.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17250 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 4c376852fe4f8d8ed13b34cdd52c398a9c3f5750 1 parent 0e9b104
@jezdez jezdez authored
View
478 django/conf/locale/en/LC_MESSAGES/django.po
@@ -4,707 +4,745 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 20:57+0100\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\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"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Arabic"
msgstr ""
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Azerbaijani"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "Bulgarian"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Bengali"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "Bosnian"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Catalan"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Czech"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
msgid "Welsh"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
msgid "Danish"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
msgid "German"
msgstr ""
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
msgid "Greek"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
msgid "English"
msgstr ""
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
msgid "British English"
msgstr ""
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
msgid "Spanish"
msgstr ""
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
msgid "Argentinian Spanish"
msgstr ""
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
msgid "Mexican Spanish"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
msgid "Nicaraguan Spanish"
msgstr ""
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
msgid "Estonian"
msgstr ""
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
msgid "Basque"
msgstr ""
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
msgid "Persian"
msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
msgid "Finnish"
msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
msgid "French"
msgstr ""
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
msgid "Frisian"
msgstr ""
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
msgid "Irish"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
msgid "Hebrew"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
msgid "Croatian"
msgstr ""
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
msgid "Hungarian"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
msgid "Italian"
msgstr ""
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
msgid "Japanese"
msgstr ""
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
msgid "Dutch"
msgstr ""
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr ""
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
msgid "Norwegian Bokmal"
msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
msgid "Slovenian"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
msgid "Tamil"
msgstr ""
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
msgid "Turkish"
msgstr ""
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
msgid "Ukrainian"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
msgid "Vietnamese"
msgstr ""
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
msgid "Traditional Chinese"
msgstr ""
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
msgid "Enter a valid value."
msgstr ""
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
msgid "Enter a valid URL."
msgstr ""
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:164 forms/fields.py:474
msgid "Enter a valid e-mail address."
msgstr ""
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:167 forms/fields.py:1022
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:170 core/validators.py:187 forms/fields.py:996
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:174 core/validators.py:188
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:183 core/validators.py:186
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:208 db/models/fields/__init__.py:636
msgid "Enter only digits separated by commas."
msgstr ""
-#: core/validators.py:153
+#: core/validators.py:214
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:232 forms/fields.py:209 forms/fields.py:262
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:237 forms/fields.py:210 forms/fields.py:263
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:182
+#: core/validators.py:243
#, python-format
msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: core/validators.py:188
+#: core/validators.py:249
#, python-format
msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
msgstr ""
-#: db/models/base.py:769
+#: db/models/base.py:765
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:784 db/models/base.py:792
-#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
+#: db/models/base.py:788 forms/models.py:570
+msgid "and"
msgstr ""
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
+#: db/models/base.py:789 db/models/fields/__init__.py:65
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
#, python-format
msgid "Value %r is not a valid choice."
msgstr ""
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
msgid "This field cannot be null."
msgstr ""
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
msgid "This field cannot be blank."
msgstr ""
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
#, python-format
msgid "Field of type: %(field_type)s"
msgstr ""
-#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
-#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:948
+#: db/models/fields/__init__.py:1103 db/models/fields/__init__.py:1114
+#: db/models/fields/__init__.py:1141
msgid "Integer"
msgstr ""
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:946
+#, python-format
+msgid "'%s' value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
+#: db/models/fields/__init__.py:551
+#, python-format
+msgid "'%s' value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:553
msgid "Boolean (Either True or False)"
msgstr ""
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:603 db/models/fields/__init__.py:1124
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:631
msgid "Comma-separated integers"
msgstr ""
-#: db/models/fields/__init__.py:584
-msgid "Date (without time)"
+#: db/models/fields/__init__.py:645
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:647 db/models/fields/__init__.py:732
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
msgstr ""
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
+#: db/models/fields/__init__.py:650
+msgid "Date (without time)"
msgstr ""
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:730
#, python-format
-msgid "Invalid date: %s"
+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:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:734
+#, 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:672
+#: db/models/fields/__init__.py:738
msgid "Date (with time)"
msgstr ""
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
+#: db/models/fields/__init__.py:818
+#, python-format
+msgid "'%s' value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:820
msgid "Decimal number"
msgstr ""
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:877
msgid "E-mail address"
msgstr ""
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:893 db/models/fields/files.py:214
+#: db/models/fields/files.py:321
msgid "File path"
msgstr ""
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:917
+#, python-format
+msgid "'%s' value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:919
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:980
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:994
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1010
msgid "IP address"
msgstr ""
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1052
+#, python-format
+msgid "'%s' value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1054
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1147
msgid "Text"
msgstr ""
-#: db/models/fields/__init__.py:1040
-msgid "Time"
+#: db/models/fields/__init__.py:1165
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
msgstr ""
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:1167
+#, 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:1120
-msgid "URL"
+#: db/models/fields/__init__.py:1170
+msgid "Time"
msgstr ""
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
+#: db/models/fields/__init__.py:1234
+msgid "URL"
msgstr ""
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:902
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:904
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1032
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1095
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1119
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-#: forms/fields.py:66
+#: forms/fields.py:50
msgid "This field is required."
msgstr ""
-#: forms/fields.py:221
+#: forms/fields.py:208
msgid "Enter a whole number."
msgstr ""
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
msgid "Enter a number."
msgstr ""
-#: forms/fields.py:277
+#: forms/fields.py:264
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr ""
-#: forms/fields.py:278
+#: forms/fields.py:265
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr ""
-#: forms/fields.py:279
+#: forms/fields.py:266
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:962
msgid "Enter a valid date."
msgstr ""
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:963
msgid "Enter a valid time."
msgstr ""
-#: forms/fields.py:396
+#: forms/fields.py:409
msgid "Enter a valid date/time."
msgstr ""
-#: forms/fields.py:460
+#: forms/fields.py:485
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
-#: forms/fields.py:461
+#: forms/fields.py:486
msgid "No file was submitted."
msgstr ""
-#: forms/fields.py:462
+#: forms/fields.py:487
msgid "The submitted file is empty."
msgstr ""
-#: forms/fields.py:463
+#: forms/fields.py:488
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-#: forms/fields.py:464
+#: forms/fields.py:489
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:518
+#: forms/fields.py:544
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:992
msgid "Enter a list of values."
msgstr ""
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
msgid "Order"
msgstr ""
-#: forms/formsets.py:309
+#: forms/formsets.py:321
msgid "Delete"
msgstr ""
-#: forms/models.py:556
+#: forms/models.py:564
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:560
+#: forms/models.py:568
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:566
+#: forms/models.py:574
#, 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:574
+#: forms/models.py:582
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:835
+#: forms/models.py:842
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:896
+#: forms/models.py:903
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:986
+#: forms/models.py:993
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:988
+#: forms/models.py:995
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, 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:326
msgid "Currently"
msgstr ""
-#: forms/widgets.py:300
+#: forms/widgets.py:327
msgid "Change"
msgstr ""
-#: forms/widgets.py:301
+#: forms/widgets.py:328
msgid "Clear"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:583
msgid "Unknown"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:584
msgid "Yes"
msgstr ""
-#: forms/widgets.py:548
+#: forms/widgets.py:585
msgid "No"
msgstr ""
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:785
msgid "yes,no,maybe"
msgstr ""
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:813 template/defaultfilters.py:818
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:820
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:822
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:824
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:826
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:827
#, python-format
msgid "%s PB"
msgstr ""
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
msgid "p.m."
msgstr ""
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
msgid "a.m."
msgstr ""
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
msgid "PM"
msgstr ""
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
msgid "AM"
msgstr ""
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
msgid "noon"
msgstr ""
@@ -980,85 +1018,71 @@ msgctxt "alt. month"
msgid "December"
msgstr ""
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
msgid ", "
msgstr ""
-#: utils/timesince.py:21
+#: utils/timesince.py:20
msgid "year"
msgid_plural "years"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:22
+#: utils/timesince.py:21
msgid "month"
msgid_plural "months"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:23
+#: utils/timesince.py:22
msgid "week"
msgid_plural "weeks"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:24
+#: utils/timesince.py:23
msgid "day"
msgid_plural "days"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:25
+#: utils/timesince.py:24
msgid "hour"
msgid_plural "hours"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:26
+#: utils/timesince.py:25
msgid "minute"
msgid_plural "minutes"
msgstr[0] ""
msgstr[1] ""
-#: utils/timesince.py:45
+#: utils/timesince.py:41
msgid "minutes"
msgstr ""
-#: utils/timesince.py:50
+#: utils/timesince.py:46
#, python-format
msgid "%(number)d %(type)s"
msgstr ""
-#: utils/timesince.py:56
+#: utils/timesince.py:52
#, python-format
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
-
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "P"
-
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
-
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
-
#: views/generic/create_update.py:121
#, python-format
msgid "The %(verbose_name)s was created successfully."
@@ -1090,19 +1114,19 @@ msgstr ""
msgid "No week specified"
msgstr ""
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
#, python-format
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
#, python-format
msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
msgstr ""
@@ -1112,16 +1136,16 @@ msgstr ""
msgid "No %(verbose_name)s found matching the query"
msgstr ""
-#: views/generic/list.py:47
+#: views/generic/list.py:45
msgid "Page is not 'last', nor can it be converted to an int."
msgstr ""
-#: views/generic/list.py:52
+#: views/generic/list.py:50
#, python-format
msgid "Invalid page (%(page_number)s)"
msgstr ""
-#: views/generic/list.py:119
+#: views/generic/list.py:117
#, python-format
msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
View
336 django/contrib/admin/locale/en/LC_MESSAGES/django.po
@@ -4,80 +4,74 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 21:03+0100\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\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"
-#: actions.py:49
+#: actions.py:48
#, python-format
msgid "Successfully deleted %(count)d %(items)s."
msgstr ""
-#: actions.py:61 options.py:1219
+#: actions.py:60 options.py:1295
#, python-format
msgid "Cannot delete %(name)s"
msgstr ""
-#: actions.py:63 options.py:1221
+#: actions.py:62 options.py:1297
msgid "Are you sure?"
msgstr ""
-#: actions.py:85
+#: actions.py:83
#, python-format
msgid "Delete selected %(verbose_name_plural)s"
msgstr ""
-#: filterspecs.py:54
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: filterspecs.py:104 filterspecs.py:139 filterspecs.py:168 filterspecs.py:258
+#: filters.py:99 filters.py:189 filters.py:229 filters.py:266 filters.py:371
msgid "All"
msgstr ""
-#: filterspecs.py:139
+#: filters.py:230
msgid "Yes"
msgstr ""
-#: filterspecs.py:139
+#: filters.py:231
msgid "No"
msgstr ""
-#: filterspecs.py:150
+#: filters.py:245
msgid "Unknown"
msgstr ""
-#: filterspecs.py:196
+#: filters.py:295
msgid "Any date"
msgstr ""
-#: filterspecs.py:197
+#: filters.py:296
msgid "Today"
msgstr ""
-#: filterspecs.py:200
+#: filters.py:301
msgid "Past 7 days"
msgstr ""
-#: filterspecs.py:203
+#: filters.py:305
msgid "This month"
msgstr ""
-#: filterspecs.py:205
+#: filters.py:309
msgid "This year"
msgstr ""
#: forms.py:9
msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter the correct username and password for a staff account. Note "
+"that both fields are case-sensitive."
msgstr ""
#: forms.py:18
@@ -113,157 +107,176 @@ msgstr ""
msgid "change message"
msgstr ""
-#: models.py:28
+#: models.py:30
msgid "log entry"
msgstr ""
-#: models.py:29
+#: models.py:31
msgid "log entries"
msgstr ""
-#: options.py:147 options.py:162
+#: models.py:40
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr ""
+
+#: models.py:42
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr ""
+
+#: models.py:44
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr ""
+
+#: models.py:46
+msgid "LogEntry Object"
+msgstr ""
+
+#: options.py:149 options.py:165
msgid "None"
msgstr ""
-#: options.py:627
+#: options.py:671
#, python-format
msgid "Changed %s."
msgstr ""
-#: options.py:627 options.py:637
+#: options.py:671 options.py:681
msgid "and"
msgstr ""
-#: options.py:632
+#: options.py:676
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr ""
-#: options.py:636
+#: options.py:680
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr ""
-#: options.py:641
+#: options.py:685
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr ""
-#: options.py:645
+#: options.py:689
msgid "No fields changed."
msgstr ""
-#: options.py:717
+#: options.py:772
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: options.py:721 options.py:761
+#: options.py:776 options.py:824
msgid "You may edit it again below."
msgstr ""
-#: options.py:731 options.py:771
+#: options.py:788 options.py:837
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: options.py:759
+#: options.py:822
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: options.py:767
+#: options.py:830
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: options.py:827 options.py:1085
+#: options.py:899 options.py:1159
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
-#: options.py:846
+#: options.py:918
msgid "No action selected."
msgstr ""
-#: options.py:927
+#: options.py:998
#, python-format
msgid "Add %s"
msgstr ""
-#: options.py:953 options.py:1194
+#: options.py:1023 options.py:1267
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr ""
-#: options.py:1018
+#: options.py:1089
#, python-format
msgid "Change %s"
msgstr ""
-#: options.py:1065
+#: options.py:1138
msgid "Database error"
msgstr ""
-#: options.py:1127
+#: options.py:1201
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
msgstr[0] ""
msgstr[1] ""
-#: options.py:1154
+#: options.py:1228
#, python-format
msgid "%(total_count)s selected"
msgid_plural "All %(total_count)s selected"
msgstr[0] ""
msgstr[1] ""
-#: options.py:1159
+#: options.py:1233
#, python-format
msgid "0 of %(cnt)s selected"
msgstr ""
-#: options.py:1210
+#: options.py:1283
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: options.py:1255
+#: options.py:1330
#, python-format
msgid "Change history: %s"
msgstr ""
-#: sites.py:319 templates/admin/login.html:42
-#: templates/registration/password_reset_complete.html:14
-#: views/decorators.py:26
+#: sites.py:311 tests.py:41 templates/admin/login.html:42
+#: templates/registration/password_reset_complete.html:20
+#: views/decorators.py:23
msgid "Log in"
msgstr ""
-#: sites.py:375
+#: sites.py:376
msgid "Site administration"
msgstr ""
-#: sites.py:419
+#: sites.py:428
#, python-format
msgid "%s administration"
msgstr ""
-#: widgets.py:75
+#: widgets.py:87
msgid "Date:"
msgstr ""
-#: widgets.py:75
+#: widgets.py:87
msgid "Time:"
msgstr ""
-#: widgets.py:140
+#: widgets.py:161
msgid "Lookup"
msgstr ""
-#: widgets.py:246
+#: widgets.py:267
msgid "Add Another"
msgstr ""
@@ -275,36 +288,36 @@ msgstr ""
msgid "We're sorry, but the requested page could not be found."
msgstr ""
-#: templates/admin/500.html:4 templates/admin/app_index.html:8
-#: templates/admin/base.html:55 templates/admin/change_form.html:19
-#: templates/admin/change_list.html:42
-#: templates/admin/delete_confirmation.html:6
-#: templates/admin/delete_selected_confirmation.html:6
-#: templates/admin/invalid_setup.html:4 templates/admin/object_history.html:6
-#: templates/admin/auth/user/change_password.html:12
-#: templates/registration/logged_out.html:4
-#: templates/registration/password_change_done.html:5
-#: templates/registration/password_change_form.html:6
-#: templates/registration/password_reset_complete.html:4
-#: templates/registration/password_reset_confirm.html:4
-#: templates/registration/password_reset_done.html:4
-#: templates/registration/password_reset_form.html:4
+#: 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
msgid "Home"
msgstr ""
-#: templates/admin/500.html:4
+#: templates/admin/500.html:8
msgid "Server error"
msgstr ""
-#: templates/admin/500.html:6
+#: templates/admin/500.html:12
msgid "Server error (500)"
msgstr ""
-#: templates/admin/500.html:9
+#: templates/admin/500.html:15
msgid "Server Error <em>(500)</em>"
msgstr ""
-#: templates/admin/500.html:10
+#: templates/admin/500.html:16
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."
@@ -331,7 +344,7 @@ msgstr ""
msgid "Clear selection"
msgstr ""
-#: templates/admin/app_index.html:10 templates/admin/index.html:19
+#: templates/admin/app_index.html:11 templates/admin/index.html:19
#, python-format
msgid "%(name)s"
msgstr ""
@@ -346,15 +359,15 @@ msgstr ""
msgid "Documentation"
msgstr ""
-#: templates/admin/base.html:41
-#: templates/admin/auth/user/change_password.html:16
-#: templates/admin/auth/user/change_password.html:49
+#: 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
msgid "Change password"
msgstr ""
-#: templates/admin/base.html:48
+#: templates/admin/base.html:36
#: templates/registration/password_change_done.html:4
#: templates/registration/password_change_form.html:5
msgid "Log out"
@@ -368,44 +381,57 @@ msgstr ""
msgid "Django administration"
msgstr ""
-#: templates/admin/change_form.html:22 templates/admin/index.html:29
+#: templates/admin/change_form.html:24 templates/admin/index.html:29
msgid "Add"
msgstr ""
-#: templates/admin/change_form.html:31 templates/admin/object_history.html:10
+#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
msgid "History"
msgstr ""
-#: templates/admin/change_form.html:32
+#: templates/admin/change_form.html:35
#: templates/admin/edit_inline/stacked.html:9
-#: templates/admin/edit_inline/tabular.html:28
+#: templates/admin/edit_inline/tabular.html:30
msgid "View on site"
msgstr ""
-#: templates/admin/change_form.html:43 templates/admin/change_list.html:73
+#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
#: templates/admin/login.html:17
-#: templates/admin/auth/user/change_password.html:25
-#: templates/registration/password_change_form.html:16
+#: templates/admin/auth/user/change_password.html:29
+#: templates/registration/password_change_form.html:21
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: templates/admin/change_list.html:64
+#: templates/admin/change_list.html:60
#, python-format
msgid "Add %(name)s"
msgstr ""
-#: templates/admin/change_list.html:84
+#: templates/admin/change_list.html:80
msgid "Filter"
msgstr ""
-#: templates/admin/delete_confirmation.html:10
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr ""
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr ""
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:12
#: templates/admin/submit_line.html:4
msgid "Delete"
msgstr ""
-#: templates/admin/delete_confirmation.html:17
+#: templates/admin/delete_confirmation.html:19
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -413,30 +439,30 @@ msgid ""
"following types of objects:"
msgstr ""
-#: templates/admin/delete_confirmation.html:25
+#: templates/admin/delete_confirmation.html:27
#, 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:33
+#: templates/admin/delete_confirmation.html:35
#, 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:38
-#: templates/admin/delete_selected_confirmation.html:43
+#: templates/admin/delete_confirmation.html:40
+#: templates/admin/delete_selected_confirmation.html:45
msgid "Yes, I'm sure"
msgstr ""
-#: templates/admin/delete_selected_confirmation.html:9
+#: templates/admin/delete_selected_confirmation.html:11
msgid "Delete multiple objects"
msgstr ""
-#: templates/admin/delete_selected_confirmation.html:16
+#: templates/admin/delete_selected_confirmation.html:18
#, python-format
msgid ""
"Deleting the selected %(objects_name)s would result in deleting related "
@@ -444,14 +470,14 @@ msgid ""
"types of objects:"
msgstr ""
-#: templates/admin/delete_selected_confirmation.html:24
+#: templates/admin/delete_selected_confirmation.html:26
#, python-format
msgid ""
"Deleting the selected %(objects_name)s would require deleting the following "
"protected related objects:"
msgstr ""
-#: templates/admin/delete_selected_confirmation.html:32
+#: templates/admin/delete_selected_confirmation.html:34
#, python-format
msgid ""
"Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -492,7 +518,7 @@ msgstr ""
msgid "Unknown content"
msgstr ""
-#: templates/admin/invalid_setup.html:7
+#: templates/admin/invalid_setup.html:13
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 "
@@ -507,19 +533,19 @@ msgstr ""
msgid "Password:"
msgstr ""
-#: templates/admin/object_history.html:22
+#: templates/admin/object_history.html:24
msgid "Date/time"
msgstr ""
-#: templates/admin/object_history.html:23
+#: templates/admin/object_history.html:25
msgid "User"
msgstr ""
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:26
msgid "Action"
msgstr ""
-#: templates/admin/object_history.html:38
+#: templates/admin/object_history.html:40
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
@@ -533,18 +559,18 @@ msgstr ""
msgid "Save"
msgstr ""
-#: templates/admin/search_form.html:8
+#: templates/admin/search_form.html:7
msgid "Search"
msgstr ""
-#: templates/admin/search_form.html:10
+#: templates/admin/search_form.html:9
#, python-format
msgid "%(counter)s result"
msgid_plural "%(counter)s results"
msgstr[0] ""
msgstr[1] ""
-#: templates/admin/search_form.html:10
+#: templates/admin/search_form.html:9
#, python-format
msgid "%(full_result_count)s total"
msgstr ""
@@ -571,138 +597,138 @@ msgstr ""
msgid "Enter a username and password."
msgstr ""
-#: templates/admin/auth/user/change_password.html:29
+#: templates/admin/auth/user/change_password.html:33
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
msgstr ""
-#: templates/admin/auth/user/change_password.html:36
+#: templates/admin/auth/user/change_password.html:40
msgid "Password"
msgstr ""
-#: templates/admin/auth/user/change_password.html:42
-#: templates/registration/password_change_form.html:38
+#: templates/admin/auth/user/change_password.html:46
+#: templates/registration/password_change_form.html:43
msgid "Password (again)"
msgstr ""
-#: templates/admin/auth/user/change_password.html:43
+#: templates/admin/auth/user/change_password.html:47
msgid "Enter the same password as above, for verification."
msgstr ""
#: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:113
+#: templates/admin/edit_inline/tabular.html:115
#, python-format
msgid "Add another %(verbose_name)s"
msgstr ""
#: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:116
+#: templates/admin/edit_inline/tabular.html:118
msgid "Remove"
msgstr ""
-#: templates/admin/edit_inline/tabular.html:15
+#: templates/admin/edit_inline/tabular.html:17
msgid "Delete?"
msgstr ""
-#: templates/registration/logged_out.html:8
+#: templates/registration/logged_out.html:9
msgid "Thanks for spending some quality time with the Web site today."
msgstr ""
-#: templates/registration/logged_out.html:10
+#: templates/registration/logged_out.html:11
msgid "Log in again"
msgstr ""
-#: templates/registration/password_change_done.html:5
-#: templates/registration/password_change_form.html:6
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_change_form.html:20
+#: 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
msgid "Password change"
msgstr ""
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:12
+#: templates/registration/password_change_done.html:16
msgid "Password change successful"
msgstr ""
-#: templates/registration/password_change_done.html:13
+#: templates/registration/password_change_done.html:18
msgid "Your password was changed."
msgstr ""
-#: templates/registration/password_change_form.html:22
+#: templates/registration/password_change_form.html:27
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:28
+#: templates/registration/password_change_form.html:33
msgid "Old password"
msgstr ""
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:38
msgid "New password"
msgstr ""
-#: templates/registration/password_change_form.html:44
-#: templates/registration/password_reset_confirm.html:21
+#: templates/registration/password_change_form.html:49
+#: templates/registration/password_reset_confirm.html:27
msgid "Change my password"
msgstr ""
-#: templates/registration/password_reset_complete.html:4
-#: templates/registration/password_reset_confirm.html:6
-#: templates/registration/password_reset_done.html:4
-#: templates/registration/password_reset_form.html:4
-#: templates/registration/password_reset_form.html:6
-#: templates/registration/password_reset_form.html:10
+#: 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
msgid "Password reset"
msgstr ""
-#: templates/registration/password_reset_complete.html:6
-#: templates/registration/password_reset_complete.html:10
+#: templates/registration/password_reset_complete.html:12
+#: templates/registration/password_reset_complete.html:16
msgid "Password reset complete"
msgstr ""
-#: templates/registration/password_reset_complete.html:12
+#: templates/registration/password_reset_complete.html:18
msgid "Your password has been set. You may go ahead and log in now."
msgstr ""
-#: templates/registration/password_reset_confirm.html:4
+#: templates/registration/password_reset_confirm.html:8
msgid "Password reset confirmation"
msgstr ""
-#: templates/registration/password_reset_confirm.html:12
+#: templates/registration/password_reset_confirm.html:18
msgid "Enter new password"
msgstr ""
-#: templates/registration/password_reset_confirm.html:14
+#: templates/registration/password_reset_confirm.html:20
msgid ""
"Please enter your new password twice so we can verify you typed it in "
"correctly."
msgstr ""
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:24
msgid "New password:"
msgstr ""
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:26
msgid "Confirm password:"
msgstr ""
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:32
msgid "Password reset unsuccessful"
msgstr ""
-#: templates/registration/password_reset_confirm.html:28
+#: templates/registration/password_reset_confirm.html:34
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:6
-#: templates/registration/password_reset_done.html:10
+#: templates/registration/password_reset_done.html:12
+#: templates/registration/password_reset_done.html:16
msgid "Password reset successful"
msgstr ""
-#: templates/registration/password_reset_done.html:12
+#: templates/registration/password_reset_done.html:18
msgid ""
"We've e-mailed you instructions for setting your password to the e-mail "
"address you submitted. You should be receiving it shortly."
@@ -732,34 +758,34 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: templates/registration/password_reset_form.html:12
+#: templates/registration/password_reset_form.html:18
msgid ""
"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
"instructions for setting a new one."
msgstr ""
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_form.html:22
msgid "E-mail address:"
msgstr ""
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_form.html:22
msgid "Reset my password"
msgstr ""
-#: templatetags/admin_list.py:290
+#: templatetags/admin_list.py:335
msgid "All dates"
msgstr ""
-#: views/main.py:27
+#: views/main.py:30
msgid "(None)"
msgstr ""
-#: views/main.py:66
+#: views/main.py:74
#, python-format
msgid "Select %s"
msgstr ""
-#: views/main.py:66
+#: views/main.py:76
#, python-format
msgid "Select %s to change"
msgstr ""
View
96 django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
@@ -4,140 +4,152 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:13-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\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"
-#: media/js/SelectFilter2.js:45
-#, perl-format
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
msgid "Available %s"
msgstr ""
-#: media/js/SelectFilter2.js:52
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may add some by selecting them below "
+"and then clicking the \"Add\" button."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into the filter box to narrow down the list of available %s."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:57
msgid "Filter"
msgstr ""
-#: media/js/SelectFilter2.js:59
-msgid "Choose all"
+#: static/admin/js/SelectFilter2.js:61
+msgid "Add all"
msgstr ""
-#: media/js/SelectFilter2.js:64
+#: static/admin/js/SelectFilter2.js:67
msgid "Add"
msgstr ""
-#: media/js/SelectFilter2.js:66
+#: static/admin/js/SelectFilter2.js:69
msgid "Remove"
msgstr ""
-#: media/js/SelectFilter2.js:71
-#, perl-format
-msgid "Chosen %s"
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Added %s"
msgstr ""
-#: media/js/SelectFilter2.js:72
-msgid "Select your choice(s) and click "
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of added %s. You may remove some by selecting them below "
+"and then clicking the \"Remove\" button."
msgstr ""
-#: media/js/SelectFilter2.js:77
-msgid "Clear all"
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
msgstr ""
-#: media/js/actions.js:18 media/js/actions.min.js:1
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
msgid "%(sel)s of %(cnt)s selected"
msgid_plural "%(sel)s of %(cnt)s selected"
msgstr[0] ""
msgstr[1] ""
-#: media/js/actions.js:109 media/js/actions.min.js:5
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
msgid ""
"You have unsaved changes on individual editable fields. If you run an "
"action, your unsaved changes will be lost."
msgstr ""
-#: media/js/actions.js:121 media/js/actions.min.js:6
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
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 "
"action."
msgstr ""
-#: media/js/actions.js:123 media/js/actions.min.js:6
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
msgid ""
"You have selected an action, and you haven't made any changes on individual "
"fields. You're probably looking for the Go button rather than the Save "
"button."
msgstr ""
-#: media/js/calendar.js:24 media/js/dateparse.js:32
+#: static/admin/js/calendar.js:26
msgid ""
"January February March April May June July August September October November "
"December"
msgstr ""
-#: media/js/calendar.js:25
+#: static/admin/js/calendar.js:27
msgid "S M T W T F S"
msgstr ""
-#: media/js/collapse.js:9 media/js/collapse.js.py:21
-#: media/js/collapse.min.js:1
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
msgid "Show"
msgstr ""
-#: media/js/collapse.js:16 media/js/collapse.min.js:1
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
msgid "Hide"
msgstr ""
-#: media/js/dateparse.js:33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr ""
-
-#: media/js/admin/DateTimeShortcuts.js:49
-#: media/js/admin/DateTimeShortcuts.js:84
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
msgid "Now"
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:53
+#: static/admin/js/admin/DateTimeShortcuts.js:53
msgid "Clock"
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:80
+#: static/admin/js/admin/DateTimeShortcuts.js:81
msgid "Choose a time"
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:85
+#: static/admin/js/admin/DateTimeShortcuts.js:86
msgid "Midnight"
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:86
+#: static/admin/js/admin/DateTimeShortcuts.js:87
msgid "6 a.m."
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:87
+#: static/admin/js/admin/DateTimeShortcuts.js:88
msgid "Noon"
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:91
-#: media/js/admin/DateTimeShortcuts.js:188
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
msgid "Cancel"
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:133
-#: media/js/admin/DateTimeShortcuts.js:182
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
msgid "Today"
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:137
+#: static/admin/js/admin/DateTimeShortcuts.js:148
msgid "Calendar"
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:180
+#: static/admin/js/admin/DateTimeShortcuts.js:195
msgid "Yesterday"
msgstr ""
-#: media/js/admin/DateTimeShortcuts.js:184
+#: static/admin/js/admin/DateTimeShortcuts.js:199
msgid "Tomorrow"
msgstr ""
View
93 django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
@@ -4,88 +4,105 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:13-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\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"
-#: views.py:63 views.py:65 views.py:67
+#: views.py:57 views.py:59 views.py:61
msgid "tag:"
msgstr ""
-#: views.py:98 views.py:100 views.py:102
+#: views.py:92 views.py:94 views.py:96
msgid "filter:"
msgstr ""
-#: views.py:162 views.py:164 views.py:166
+#: views.py:155 views.py:157 views.py:159
msgid "view:"
msgstr ""
-#: views.py:194
+#: views.py:187
#, python-format
msgid "App %r not found"
msgstr ""
-#: views.py:201
+#: views.py:194
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr ""
-#: views.py:213
+#: views.py:206
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr ""
-#: views.py:213 views.py:232 views.py:237 views.py:251 views.py:265
-#: views.py:270
+#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
+#: views.py:263
msgid "model:"
msgstr ""
-#: views.py:228 views.py:260
+#: views.py:221 views.py:253
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr ""
-#: views.py:232 views.py:265
+#: views.py:225 views.py:258
#, python-format
msgid "all %s"
msgstr ""
-#: views.py:237 views.py:270
+#: views.py:230 views.py:263
#, python-format
msgid "number of %s"
msgstr ""
-#: views.py:275
+#: views.py:268
#, python-format
msgid "Fields on %s objects"
msgstr ""
-#: views.py:365
+#: views.py:357
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:3
+#: 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
+#: templates/admin_doc/model_index.html:9
+#: templates/admin_doc/template_detail.html:7
+#: templates/admin_doc/template_filter_index.html:8
+#: 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:3
+#: 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:3
+#: templates/admin_doc/bookmarklets.html:9
msgid "Bookmarklets"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:4
+#: templates/admin_doc/bookmarklets.html:12
msgid "Documentation bookmarklets"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:8
+#: templates/admin_doc/bookmarklets.html:16
msgid ""
"\n"
"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -96,38 +113,60 @@ msgid ""
"your computer is \"internal\").</p>\n"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:18
+#: templates/admin_doc/bookmarklets.html:26
msgid "Documentation for this page"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:19
+#: templates/admin_doc/bookmarklets.html:27
msgid ""
"Jumps you from any page to the documentation for the view that generates "
"that page."
msgstr ""
-#: templates/admin_doc/bookmarklets.html:21
+#: templates/admin_doc/bookmarklets.html:29
msgid "Show object ID"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:22
+#: templates/admin_doc/bookmarklets.html:30
msgid ""
"Shows the content-type and unique ID for pages that represent a single "
"object."
msgstr ""
-#: templates/admin_doc/bookmarklets.html:24
+#: templates/admin_doc/bookmarklets.html:32
msgid "Edit this object (current window)"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:25
+#: templates/admin_doc/bookmarklets.html:33
msgid "Jumps to the admin page for pages that represent a single object."
msgstr ""
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:35
msgid "Edit this object (new window)"
msgstr ""
-#: templates/admin_doc/bookmarklets.html:28
+#: templates/admin_doc/bookmarklets.html:36
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
+msgid "Models"
+msgstr ""
+
+#: templates/admin_doc/template_detail.html:9
+msgid "Templates"
+msgstr ""
+
+#: templates/admin_doc/template_filter_index.html:10
+msgid "Filters"
+msgstr ""
+
+#: templates/admin_doc/template_tag_index.html:10
+msgid "Tags"
+msgstr ""
+
+#: templates/admin_doc/view_detail.html:9
+#: templates/admin_doc/view_index.html:10
+msgid "Views"
+msgstr ""
View
137 django/contrib/auth/locale/en/LC_MESSAGES/django.po
@@ -4,27 +4,28 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-25 20:39+0200\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\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"
-#: admin.py:29
+#: admin.py:38
msgid "Personal info"
msgstr ""
-#: admin.py:30
+#: admin.py:39
msgid "Permissions"
msgstr ""
-#: admin.py:31
+#: admin.py:40
msgid "Important dates"
msgstr ""