diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index f8069f07d2..57a56eabcd 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-11 18:44+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -74,314 +74,338 @@ msgid "English" msgstr "" #: conf/global_settings.py:66 -msgid "British English" +msgid "Australian English" msgstr "" #: conf/global_settings.py:67 -msgid "Esperanto" +msgid "British English" msgstr "" #: conf/global_settings.py:68 -msgid "Spanish" +msgid "Esperanto" msgstr "" #: conf/global_settings.py:69 -msgid "Argentinian Spanish" +msgid "Spanish" msgstr "" #: conf/global_settings.py:70 -msgid "Mexican Spanish" +msgid "Argentinian Spanish" msgstr "" #: conf/global_settings.py:71 -msgid "Nicaraguan Spanish" +msgid "Mexican Spanish" msgstr "" #: conf/global_settings.py:72 -msgid "Venezuelan Spanish" +msgid "Nicaraguan Spanish" msgstr "" #: conf/global_settings.py:73 -msgid "Estonian" +msgid "Venezuelan Spanish" msgstr "" #: conf/global_settings.py:74 -msgid "Basque" +msgid "Estonian" msgstr "" #: conf/global_settings.py:75 -msgid "Persian" +msgid "Basque" msgstr "" #: conf/global_settings.py:76 -msgid "Finnish" +msgid "Persian" msgstr "" #: conf/global_settings.py:77 -msgid "French" +msgid "Finnish" msgstr "" #: conf/global_settings.py:78 -msgid "Frisian" +msgid "French" msgstr "" #: conf/global_settings.py:79 -msgid "Irish" +msgid "Frisian" msgstr "" #: conf/global_settings.py:80 -msgid "Galician" +msgid "Irish" msgstr "" #: conf/global_settings.py:81 -msgid "Hebrew" +msgid "Galician" msgstr "" #: conf/global_settings.py:82 -msgid "Hindi" +msgid "Hebrew" msgstr "" #: conf/global_settings.py:83 -msgid "Croatian" +msgid "Hindi" msgstr "" #: conf/global_settings.py:84 -msgid "Hungarian" +msgid "Croatian" msgstr "" #: conf/global_settings.py:85 -msgid "Interlingua" +msgid "Hungarian" msgstr "" #: conf/global_settings.py:86 -msgid "Indonesian" +msgid "Interlingua" msgstr "" #: conf/global_settings.py:87 -msgid "Icelandic" +msgid "Indonesian" msgstr "" #: conf/global_settings.py:88 -msgid "Italian" +msgid "Icelandic" msgstr "" #: conf/global_settings.py:89 -msgid "Japanese" +msgid "Italian" msgstr "" #: conf/global_settings.py:90 -msgid "Georgian" +msgid "Japanese" msgstr "" #: conf/global_settings.py:91 -msgid "Kazakh" +msgid "Georgian" msgstr "" #: conf/global_settings.py:92 -msgid "Khmer" +msgid "Kazakh" msgstr "" #: conf/global_settings.py:93 -msgid "Kannada" +msgid "Khmer" msgstr "" #: conf/global_settings.py:94 -msgid "Korean" +msgid "Kannada" msgstr "" #: conf/global_settings.py:95 -msgid "Luxembourgish" +msgid "Korean" msgstr "" #: conf/global_settings.py:96 -msgid "Lithuanian" +msgid "Luxembourgish" msgstr "" #: conf/global_settings.py:97 -msgid "Latvian" +msgid "Lithuanian" msgstr "" #: conf/global_settings.py:98 -msgid "Macedonian" +msgid "Latvian" msgstr "" #: conf/global_settings.py:99 -msgid "Malayalam" +msgid "Macedonian" msgstr "" #: conf/global_settings.py:100 -msgid "Mongolian" +msgid "Malayalam" msgstr "" #: conf/global_settings.py:101 -msgid "Burmese" +msgid "Mongolian" msgstr "" #: conf/global_settings.py:102 -msgid "Norwegian Bokmal" +msgid "Burmese" msgstr "" #: conf/global_settings.py:103 -msgid "Nepali" +msgid "Norwegian Bokmal" msgstr "" #: conf/global_settings.py:104 -msgid "Dutch" +msgid "Nepali" msgstr "" #: conf/global_settings.py:105 -msgid "Norwegian Nynorsk" +msgid "Dutch" msgstr "" #: conf/global_settings.py:106 -msgid "Ossetic" +msgid "Norwegian Nynorsk" msgstr "" #: conf/global_settings.py:107 -msgid "Punjabi" +msgid "Ossetic" msgstr "" #: conf/global_settings.py:108 -msgid "Polish" +msgid "Punjabi" msgstr "" #: conf/global_settings.py:109 -msgid "Portuguese" +msgid "Polish" msgstr "" #: conf/global_settings.py:110 -msgid "Brazilian Portuguese" +msgid "Portuguese" msgstr "" #: conf/global_settings.py:111 -msgid "Romanian" +msgid "Brazilian Portuguese" msgstr "" #: conf/global_settings.py:112 -msgid "Russian" +msgid "Romanian" msgstr "" #: conf/global_settings.py:113 -msgid "Slovak" +msgid "Russian" msgstr "" #: conf/global_settings.py:114 -msgid "Slovenian" +msgid "Slovak" msgstr "" #: conf/global_settings.py:115 -msgid "Albanian" +msgid "Slovenian" msgstr "" #: conf/global_settings.py:116 -msgid "Serbian" +msgid "Albanian" msgstr "" #: conf/global_settings.py:117 -msgid "Serbian Latin" +msgid "Serbian" msgstr "" #: conf/global_settings.py:118 -msgid "Swedish" +msgid "Serbian Latin" msgstr "" #: conf/global_settings.py:119 -msgid "Swahili" +msgid "Swedish" msgstr "" #: conf/global_settings.py:120 -msgid "Tamil" +msgid "Swahili" msgstr "" #: conf/global_settings.py:121 -msgid "Telugu" +msgid "Tamil" msgstr "" #: conf/global_settings.py:122 -msgid "Thai" +msgid "Telugu" msgstr "" #: conf/global_settings.py:123 -msgid "Turkish" +msgid "Thai" msgstr "" #: conf/global_settings.py:124 -msgid "Tatar" +msgid "Turkish" msgstr "" #: conf/global_settings.py:125 -msgid "Udmurt" +msgid "Tatar" msgstr "" #: conf/global_settings.py:126 -msgid "Ukrainian" +msgid "Udmurt" msgstr "" #: conf/global_settings.py:127 -msgid "Urdu" +msgid "Ukrainian" msgstr "" #: conf/global_settings.py:128 -msgid "Vietnamese" +msgid "Urdu" msgstr "" #: conf/global_settings.py:129 +msgid "Vietnamese" +msgstr "" + +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "" +#: contrib/sitemaps/apps.py:8 +msgid "Site Maps" +msgstr "" + +#: contrib/staticfiles/apps.py:8 +msgid "Static Files" +msgstr "" + +#: contrib/syndication/apps.py:8 +msgid "Syndication" +msgstr "" + +#: contrib/webdesign/apps.py:8 +msgid "Web Design" +msgstr "" + #: core/validators.py:21 msgid "Enter a valid value." msgstr "" -#: core/validators.py:53 forms/fields.py:639 +#: core/validators.py:77 forms/fields.py:678 msgid "Enter a valid URL." msgstr "" -#: core/validators.py:83 +#: core/validators.py:115 +msgid "Enter a valid integer." +msgstr "" + +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "" -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "" -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "" -#: core/validators.py:149 core/validators.py:152 +#: core/validators.py:203 core/validators.py:206 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: core/validators.py:175 db/models/fields/__init__.py:706 +#: core/validators.py:229 db/models/fields/__init__.py:1070 msgid "Enter only digits separated by commas." msgstr "" -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" -#: core/validators.py:200 +#: core/validators.py:255 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:206 +#: core/validators.py:262 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:214 +#: core/validators.py:271 #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -392,7 +416,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:224 +#: core/validators.py:282 #, python-format msgid "" "Ensure this value has at most %(limit_value)d character (it has " @@ -403,243 +427,253 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: db/models/base.py:882 -#, python-format -msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." -msgstr "" - -#: db/models/base.py:905 forms/models.py:643 +#: db/models/base.py:978 forms/models.py:713 msgid "and" msgstr "" -#: db/models/base.py:906 db/models/fields/__init__.py:83 +#: db/models/base.py:980 +#, python-format +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "" + +#: db/models/fields/__init__.py:104 +#, python-format +msgid "Value %(value)r is not a valid choice." +msgstr "" + +#: db/models/fields/__init__.py:105 +msgid "This field cannot be null." +msgstr "" + +#: db/models/fields/__init__.py:106 +msgid "This field cannot be blank." +msgstr "" + +#: db/models/fields/__init__.py:107 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "" -#: db/models/fields/__init__.py:80 +#: db/models/fields/__init__.py:109 #, python-format -msgid "Value %r is not a valid choice." +msgid "" +"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." msgstr "" -#: db/models/fields/__init__.py:81 -msgid "This field cannot be null." -msgstr "" - -#: db/models/fields/__init__.py:82 -msgid "This field cannot be blank." -msgstr "" - -#: db/models/fields/__init__.py:89 +#: db/models/fields/__init__.py:116 #, python-format msgid "Field of type: %(field_type)s" msgstr "" -#: db/models/fields/__init__.py:570 db/models/fields/__init__.py:1036 +#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1696 msgid "Integer" msgstr "" -#: db/models/fields/__init__.py:574 db/models/fields/__init__.py:1034 +#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1694 #, python-format -msgid "'%s' value must be an integer." +msgid "'%(value)s' value must be an integer." msgstr "" -#: db/models/fields/__init__.py:622 +#: db/models/fields/__init__.py:926 #, python-format -msgid "'%s' value must be either True or False." +msgid "'%(value)s' value must be either True or False." msgstr "" -#: db/models/fields/__init__.py:624 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "" -#: db/models/fields/__init__.py:673 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:701 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "" -#: db/models/fields/__init__.py:715 -#, python-format -msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format." -msgstr "" - -#: db/models/fields/__init__.py:717 db/models/fields/__init__.py:805 +#: db/models/fields/__init__.py:1114 #, python-format msgid "" -"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date." +"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " +"format." msgstr "" -#: db/models/fields/__init__.py:720 +#: db/models/fields/__init__.py:1116 db/models/fields/__init__.py:1266 +#, python-format +msgid "" +"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid " +"date." +msgstr "" + +#: db/models/fields/__init__.py:1119 msgid "Date (without time)" msgstr "" -#: db/models/fields/__init__.py:803 +#: db/models/fields/__init__.py:1264 #, python-format msgid "" -"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." +"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" -#: db/models/fields/__init__.py:807 +#: db/models/fields/__init__.py:1268 #, python-format msgid "" -"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but " -"it is an invalid date/time." +"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]) but it is an invalid date/time." msgstr "" -#: db/models/fields/__init__.py:811 +#: db/models/fields/__init__.py:1272 msgid "Date (with time)" msgstr "" -#: db/models/fields/__init__.py:900 +#: db/models/fields/__init__.py:1420 #, python-format -msgid "'%s' value must be a decimal number." +msgid "'%(value)s' value must be a decimal number." msgstr "" -#: db/models/fields/__init__.py:902 +#: db/models/fields/__init__.py:1422 msgid "Decimal number" msgstr "" -#: db/models/fields/__init__.py:959 +#: db/models/fields/__init__.py:1567 msgid "Email address" msgstr "" -#: db/models/fields/__init__.py:978 +#: db/models/fields/__init__.py:1593 msgid "File path" msgstr "" -#: db/models/fields/__init__.py:1005 +#: db/models/fields/__init__.py:1660 #, python-format -msgid "'%s' value must be a float." +msgid "'%(value)s' value must be a float." msgstr "" -#: db/models/fields/__init__.py:1007 +#: db/models/fields/__init__.py:1662 msgid "Floating point number" msgstr "" -#: db/models/fields/__init__.py:1068 +#: db/models/fields/__init__.py:1746 msgid "Big (8 byte) integer" msgstr "" -#: db/models/fields/__init__.py:1082 +#: db/models/fields/__init__.py:1761 msgid "IPv4 address" msgstr "" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1791 msgid "IP address" msgstr "" -#: db/models/fields/__init__.py:1141 +#: db/models/fields/__init__.py:1870 #, python-format -msgid "'%s' value must be either None, True or False." +msgid "'%(value)s' value must be either None, True or False." msgstr "" -#: db/models/fields/__init__.py:1143 +#: db/models/fields/__init__.py:1872 msgid "Boolean (Either True, False or None)" msgstr "" -#: db/models/fields/__init__.py:1192 +#: db/models/fields/__init__.py:1932 msgid "Positive integer" msgstr "" -#: db/models/fields/__init__.py:1203 +#: db/models/fields/__init__.py:1944 msgid "Positive small integer" msgstr "" -#: db/models/fields/__init__.py:1214 +#: db/models/fields/__init__.py:1957 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:1232 +#: db/models/fields/__init__.py:1986 msgid "Small integer" msgstr "" -#: db/models/fields/__init__.py:1238 +#: db/models/fields/__init__.py:1993 msgid "Text" msgstr "" -#: db/models/fields/__init__.py:1256 +#: db/models/fields/__init__.py:2016 #, python-format msgid "" -"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format." +"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " +"format." msgstr "" -#: db/models/fields/__init__.py:1258 +#: db/models/fields/__init__.py:2018 #, python-format msgid "" -"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid " -"time." +"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " +"invalid time." msgstr "" -#: db/models/fields/__init__.py:1261 +#: db/models/fields/__init__.py:2021 msgid "Time" msgstr "" -#: db/models/fields/__init__.py:1323 +#: db/models/fields/__init__.py:2146 msgid "URL" msgstr "" -#: db/models/fields/__init__.py:1340 +#: db/models/fields/__init__.py:2169 msgid "Raw binary data" msgstr "" -#: db/models/fields/files.py:215 +#: db/models/fields/files.py:224 msgid "File" msgstr "" -#: db/models/fields/files.py:322 +#: db/models/fields/files.py:374 msgid "Image" msgstr "" -#: db/models/fields/related.py:1118 +#: db/models/fields/related.py:1594 #, python-format -msgid "Model %(model)s with pk %(pk)r does not exist." +msgid "%(model)s instance with pk %(pk)r does not exist." msgstr "" -#: db/models/fields/related.py:1120 +#: db/models/fields/related.py:1596 msgid "Foreign Key (type determined by related field)" msgstr "" -#: db/models/fields/related.py:1257 +#: db/models/fields/related.py:1787 msgid "One-to-one relationship" msgstr "" -#: db/models/fields/related.py:1324 +#: db/models/fields/related.py:1857 msgid "Many-to-many relationship" msgstr "" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "" -#: forms/fields.py:227 +#: forms/fields.py:239 msgid "Enter a whole number." msgstr "" -#: forms/fields.py:268 forms/fields.py:296 +#: forms/fields.py:282 forms/fields.py:319 msgid "Enter a number." msgstr "" -#: forms/fields.py:298 +#: forms/fields.py:321 #, python-format msgid "Ensure that there are no more than %(max)s digit in total." msgid_plural "Ensure that there are no more than %(max)s digits in total." msgstr[0] "" msgstr[1] "" -#: forms/fields.py:302 +#: forms/fields.py:325 #, python-format msgid "Ensure that there are no more than %(max)s decimal place." msgid_plural "Ensure that there are no more than %(max)s decimal places." msgstr[0] "" msgstr[1] "" -#: forms/fields.py:306 +#: forms/fields.py:329 #, python-format msgid "" "Ensure that there are no more than %(max)s digit before the decimal point." @@ -648,31 +682,31 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forms/fields.py:408 forms/fields.py:1064 +#: forms/fields.py:440 forms/fields.py:1139 msgid "Enter a valid date." msgstr "" -#: forms/fields.py:432 forms/fields.py:1065 +#: forms/fields.py:464 forms/fields.py:1140 msgid "Enter a valid time." msgstr "" -#: forms/fields.py:454 +#: forms/fields.py:486 msgid "Enter a valid date/time." msgstr "" -#: forms/fields.py:531 +#: forms/fields.py:567 msgid "No file was submitted. Check the encoding type on the form." msgstr "" -#: forms/fields.py:532 +#: forms/fields.py:568 msgid "No file was submitted." msgstr "" -#: forms/fields.py:533 +#: forms/fields.py:569 msgid "The submitted file is empty." msgstr "" -#: forms/fields.py:535 +#: forms/fields.py:571 #, python-format msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." msgid_plural "" @@ -680,183 +714,193 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forms/fields.py:538 +#: forms/fields.py:574 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" -#: forms/fields.py:599 +#: forms/fields.py:635 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: forms/fields.py:749 forms/fields.py:828 forms/models.py:1096 +#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1182 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" -#: forms/fields.py:829 forms/fields.py:933 forms/models.py:1095 +#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1181 msgid "Enter a list of values." msgstr "" +#: forms/fields.py:988 +msgid "Enter a complete value." +msgstr "" + #. Translators: This is the default suffix added to form field labels -#: forms/forms.py:90 +#: forms/forms.py:122 msgid ":" msgstr "" -#: forms/forms.py:159 +#: forms/forms.py:192 #, python-format msgid "(Hidden field %(name)s) %(error)s" msgstr "" #. Translators: If found as last label character, these punctuation #. characters will prevent the default label_suffix to be appended to the label -#: forms/forms.py:525 +#: forms/forms.py:625 msgid ":?.!" msgstr "" -#: forms/formsets.py:310 +#: forms/formsets.py:95 +msgid "ManagementForm data is missing or has been tampered with" +msgstr "" + +#: forms/formsets.py:332 #, python-format msgid "Please submit %d or fewer forms." msgid_plural "Please submit %d or fewer forms." msgstr[0] "" msgstr[1] "" -#: forms/formsets.py:337 forms/formsets.py:339 +#: forms/formsets.py:339 +#, python-format +msgid "Please submit %d or more forms." +msgid_plural "Please submit %d or more forms." +msgstr[0] "" +msgstr[1] "" + +#: forms/formsets.py:367 forms/formsets.py:369 msgid "Order" msgstr "" -#: forms/formsets.py:341 +#: forms/formsets.py:371 msgid "Delete" msgstr "" -#: forms/models.py:637 +#: forms/models.py:707 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "" -#: forms/models.py:641 +#: forms/models.py:711 #, python-format msgid "Please correct the duplicate data for %(field)s, which must be unique." msgstr "" -#: forms/models.py:647 +#: forms/models.py:717 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " "for the %(lookup)s in %(date_field)s." msgstr "" -#: forms/models.py:655 +#: forms/models.py:725 msgid "Please correct the duplicate values below." msgstr "" -#: forms/models.py:937 +#: forms/models.py:1018 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" -#: forms/models.py:1001 +#: forms/models.py:1084 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" -#: forms/models.py:1098 +#: forms/models.py:1184 #, python-format msgid "\"%(pk)s\" is not a valid value for a primary key." msgstr "" -#: forms/models.py:1109 -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "" - -#: forms/util.py:84 +#: forms/utils.py:145 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " "may be ambiguous or it may not exist." msgstr "" -#: forms/widgets.py:327 +#: forms/widgets.py:340 msgid "Currently" msgstr "" -#: forms/widgets.py:328 +#: forms/widgets.py:341 msgid "Change" msgstr "" -#: forms/widgets.py:329 +#: forms/widgets.py:342 msgid "Clear" msgstr "" -#: forms/widgets.py:547 +#: forms/widgets.py:536 msgid "Unknown" msgstr "" -#: forms/widgets.py:548 +#: forms/widgets.py:537 msgid "Yes" msgstr "" -#: forms/widgets.py:549 +#: forms/widgets.py:538 msgid "No" msgstr "" -#: template/defaultfilters.py:785 +#: template/defaultfilters.py:849 msgid "yes,no,maybe" msgstr "" -#: template/defaultfilters.py:813 template/defaultfilters.py:825 +#: template/defaultfilters.py:878 template/defaultfilters.py:890 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "" msgstr[1] "" -#: template/defaultfilters.py:827 +#: template/defaultfilters.py:892 #, python-format msgid "%s KB" msgstr "" -#: template/defaultfilters.py:829 +#: template/defaultfilters.py:894 #, python-format msgid "%s MB" msgstr "" -#: template/defaultfilters.py:831 +#: template/defaultfilters.py:896 #, python-format msgid "%s GB" msgstr "" -#: template/defaultfilters.py:833 +#: template/defaultfilters.py:898 #, python-format msgid "%s TB" msgstr "" -#: template/defaultfilters.py:835 +#: template/defaultfilters.py:900 #, python-format msgid "%s PB" msgstr "" -#: utils/dateformat.py:47 +#: utils/dateformat.py:59 msgid "p.m." msgstr "" -#: utils/dateformat.py:48 +#: utils/dateformat.py:60 msgid "a.m." msgstr "" -#: utils/dateformat.py:53 +#: utils/dateformat.py:65 msgid "PM" msgstr "" -#: utils/dateformat.py:54 +#: utils/dateformat.py:66 msgid "AM" msgstr "" -#: utils/dateformat.py:103 +#: utils/dateformat.py:149 msgid "midnight" msgstr "" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "" @@ -1132,120 +1176,164 @@ msgctxt "alt. month" msgid "December" msgstr "" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" +#: utils/ipv6.py:10 +msgid "This is not a valid IPv6 address." msgstr "" -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "" - -#: utils/text.py:70 +#: utils/text.py:79 #, python-format msgctxt "String to return when truncating text" msgid "%(truncated_text)s..." msgstr "" -#: utils/text.py:225 +#: utils/text.py:248 msgid "or" msgstr "" #. Translators: This string is used as a separator between list elements -#: utils/text.py:242 utils/timesince.py:55 +#: utils/text.py:267 utils/timesince.py:57 msgid ", " msgstr "" -#: utils/timesince.py:23 +#: utils/timesince.py:25 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:24 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:25 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:26 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:27 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:28 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:44 +#: utils/timesince.py:46 msgid "0 minutes" msgstr "" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." +#: views/csrf.py:105 +msgid "Forbidden" msgstr "" -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." msgstr "" -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" +#: views/csrf.py:110 +msgid "" +"You are seeing this message because this HTTPS site requires a 'Referer " +"header' to be sent by your Web browser, but none was sent. This header is " +"required for security reasons, to ensure that your browser is not being " +"hijacked by third parties." msgstr "" -#: views/generic/dates.py:42 +#: views/csrf.py:115 +msgid "" +"If you have configured your browser to disable 'Referer' headers, please re-" +"enable them, at least for this site, or for HTTPS connections, or for 'same-" +"origin' requests." +msgstr "" + +#: views/csrf.py:120 +msgid "" +"You are seeing this message because this site requires a CSRF cookie when " +"submitting forms. This cookie is required for security reasons, to ensure " +"that your browser is not being hijacked by third parties." +msgstr "" + +#: views/csrf.py:125 +msgid "" +"If you have configured your browser to disable cookies, please re-enable " +"them, at least for this site, or for 'same-origin' requests." +msgstr "" + +#: views/csrf.py:129 +msgid "More information is available with DEBUG=True." +msgstr "" + +#: views/debug.py:517 +msgid "Welcome to Django" +msgstr "" + +#: views/debug.py:518 +msgid "It worked!" +msgstr "" + +#: views/debug.py:519 +msgid "Congratulations on your first Django-powered page." +msgstr "" + +#: views/debug.py:520 +msgid "" +"Of course, you haven't actually done any work yet. Next, start your first " +"app by running python manage.py startapp [app_label]." +msgstr "" + +#: views/debug.py:522 +msgid "" +"You're seeing this message because you have DEBUG = True in " +"your Django settings file and you haven't configured any URLs. Get to work!" +msgstr "" + +#: views/generic/dates.py:43 msgid "No year specified" msgstr "" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "" -#: views/generic/dates.py:368 views/generic/dates.py:396 +#: views/generic/dates.py:369 views/generic/dates.py:397 #, python-format msgid "No %(verbose_name_plural)s available" msgstr "" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." "allow_future is False." msgstr "" -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "" @@ -1255,16 +1343,30 @@ msgstr "" msgid "No %(verbose_name)s found matching the query" msgstr "" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "" -#: views/generic/list.py:150 +#: views/generic/list.py:158 #, python-format msgid "Empty list and '%(class_name)s.allow_empty' is False." msgstr "" + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "" + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "" diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po index 8994d24cbb..7303a2529e 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,459 +13,465 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1615 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1617 msgid "Are you sure?" msgstr "" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:225 contrib/admin/options.py:254 msgid "None" msgstr "" -#: options.py:763 +#: contrib/admin/options.py:287 +msgid "" +"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" + +#: contrib/admin/options.py:955 #, python-format msgid "Changed %s." msgstr "" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:955 contrib/admin/options.py:965 +#: contrib/admin/options.py:1807 msgid "and" msgstr "" -#: options.py:768 +#: contrib/admin/options.py:960 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:772 +#: contrib/admin/options.py:964 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:777 +#: contrib/admin/options.py:969 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:781 +#: contrib/admin/options.py:973 msgid "No fields changed." msgstr "" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1097 contrib/admin/options.py:1137 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:902 +#: contrib/admin/options.py:1108 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1115 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:920 +#: contrib/admin/options.py:1130 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1147 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1156 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1239 contrib/admin/options.py:1480 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1258 msgid "No action selected." msgstr "" -#: options.py:1117 +#: contrib/admin/options.py:1270 #, python-format -msgid "Add %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1347 contrib/admin/options.py:1592 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1397 +#, python-format +msgid "Add %s" +msgstr "" + +#: contrib/admin/options.py:1397 #, python-format msgid "Change %s" msgstr "" -#: options.py:1257 +#: contrib/admin/options.py:1459 msgid "Database error" msgstr "" -#: options.py:1320 +#: contrib/admin/options.py:1522 #, 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:1347 +#: contrib/admin/options.py:1549 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1352 +#: contrib/admin/options.py:1555 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "" - -#: options.py:1459 +#: contrib/admin/options.py:1654 #, python-format msgid "Change history: %s" msgstr "" #. Translators: Model verbose name and instance representation, suitable to be an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1801 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1808 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" msgstr "" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "" -#: sites.py:440 +#: contrib/admin/sites.py:347 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "" + +#: contrib/admin/sites.py:474 #, python-format -msgid "%s administration" +msgid "%(app)s administration" msgstr "" -#: widgets.py:90 -msgid "Date:" -msgstr "" - -#: widgets.py:91 -msgid "Time:" -msgstr "" - -#: widgets.py:165 -msgid "Lookup" -msgstr "" - -#: widgets.py:260 -msgid "Add Another" -msgstr "" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" - -#: widgets.py:303 -msgid "Change:" -msgstr "" - -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "" -#: 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 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "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 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 -#, python-format -msgid "%(name)s" +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." msgstr "" -#: templates/admin/base.html:28 -msgid "Welcome," +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." msgstr "" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Documentation" -msgstr "" - -#: 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 +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:49 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Change password" msgstr "" -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Log out" -msgstr "" - -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 -msgid "Add" -msgstr "" - -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 -msgid "History" -msgstr "" - -#: 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: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 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 msgid "Please correct the error below." msgstr "" -#: 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 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 msgid "Please correct the errors below." msgstr "" -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:43 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "" + +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "" + +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -473,30 +479,30 @@ msgid "" "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/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:34 +#: contrib/admin/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:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -504,328 +510,285 @@ msgid "" "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/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:33 +#: contrib/admin/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 " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/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:37 -msgid "Password:" -msgstr "" - -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "" -#: templates/admin/search_form.html:9 +#: contrib/admin/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:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "" - -#: 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:45 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "" - -#: 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:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "" -#: 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 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "" -#: 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:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/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:32 -msgid "Old password" -msgstr "" - -#: templates/registration/password_change_form.html:37 -msgid "New password" -msgstr "" - -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "" -#: 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 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "" -#: 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:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 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:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "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:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "" -#: views/main.py:35 +#: contrib/admin/views/main.py:32 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:76 #, python-format msgid "Select %s" msgstr "" -#: views/main.py:86 +#: contrib/admin/views/main.py:78 #, python-format msgid "Select %s to change" msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po index c913eee09b..01195bdbc3 100644 --- a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po +++ b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,153 +13,173 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/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] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 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 "" -#: static/admin/js/calendar.js:8 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 +msgid "Now" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 +msgid "Clock" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 +msgid "Choose a time" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 +msgid "Midnight" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 +msgid "6 a.m." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 +msgid "Noon" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 +msgid "Cancel" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 +msgid "Today" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 +msgid "Calendar" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 +msgid "Yesterday" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 +msgid "Tomorrow" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 msgid "" "January February March April May June July August September October November " "December" msgstr "" -#: static/admin/js/calendar.js:9 +#: contrib/admin/static/admin/js/calendar.js:9 msgid "S M T W T F S" msgstr "" -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 msgid "Show" msgstr "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 msgid "Hide" msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 -msgid "Now" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:56 -msgid "Clock" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:84 -msgid "Choose a time" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:89 -msgid "Midnight" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:90 -msgid "6 a.m." -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:91 -msgid "Noon" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 -msgid "Cancel" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 -msgid "Today" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:152 -msgid "Calendar" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:199 -msgid "Yesterday" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:203 -msgid "Tomorrow" -msgstr "" diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po index 5a4dcd0872..dfb765f2ca 100644 --- a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po +++ b/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: 2013-06-02 00:30-0400\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,99 +13,49 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: views.py:59 views.py:61 views.py:63 -msgid "tag:" +#: contrib/admindocs/apps.py:8 +msgid "Administrative Documentation" msgstr "" -#: views.py:94 views.py:96 views.py:98 -msgid "filter:" -msgstr "" - -#: views.py:157 views.py:159 views.py:161 -msgid "view:" -msgstr "" - -#: views.py:189 -#, python-format -msgid "App %r not found" -msgstr "" - -#: views.py:196 -#, python-format -msgid "Model %(model_name)r not found in app %(app_label)r" -msgstr "" - -#: views.py:208 -#, python-format -msgid "the related `%(app_label)s.%(data_type)s` object" -msgstr "" - -#: views.py:208 views.py:227 views.py:232 views.py:246 views.py:260 -#: views.py:265 -msgid "model:" -msgstr "" - -#: views.py:223 views.py:255 -#, python-format -msgid "related `%(app_label)s.%(object_name)s` objects" -msgstr "" - -#: views.py:227 views.py:260 -#, python-format -msgid "all %s" -msgstr "" - -#: views.py:232 views.py:265 -#, python-format -msgid "number of %s" -msgstr "" - -#. Translators: %s is an object type name -#: views.py:271 -#, python-format -msgid "Attributes on %s objects" -msgstr "" - -#: views.py:363 -#, 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 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:6 +#: contrib/admindocs/templates/admin_doc/index.html:6 +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:6 +#: contrib/admindocs/templates/admin_doc/model_detail.html:14 +#: contrib/admindocs/templates/admin_doc/model_index.html:8 +#: contrib/admindocs/templates/admin_doc/template_detail.html:6 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:7 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:7 +#: contrib/admindocs/templates/admin_doc/view_detail.html:6 +#: contrib/admindocs/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/index.html.py:10 templates/admin_doc/index.html:14 -#: templates/admin_doc/missing_docutils.html:7 -#: templates/admin_doc/missing_docutils.html:14 -#: 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 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:7 +#: contrib/admindocs/templates/admin_doc/index.html:7 +#: contrib/admindocs/templates/admin_doc/index.html:10 +#: contrib/admindocs/templates/admin_doc/index.html:14 +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:7 +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:14 +#: contrib/admindocs/templates/admin_doc/model_detail.html:15 +#: contrib/admindocs/templates/admin_doc/model_index.html:9 +#: contrib/admindocs/templates/admin_doc/template_detail.html:7 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:8 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:8 +#: contrib/admindocs/templates/admin_doc/view_detail.html:7 +#: contrib/admindocs/templates/admin_doc/view_index.html:8 msgid "Documentation" msgstr "" -#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:29 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:8 +#: contrib/admindocs/templates/admin_doc/index.html:29 msgid "Bookmarklets" msgstr "" -#: templates/admin_doc/bookmarklets.html:11 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:11 msgid "Documentation bookmarklets" msgstr "" -#: templates/admin_doc/bookmarklets.html:15 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:15 msgid "" "\n" "

To install bookmarklets, drag the link to your bookmarks\n" @@ -116,245 +66,320 @@ msgid "" "your computer is \"internal\").

\n" msgstr "" -#: templates/admin_doc/bookmarklets.html:25 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:25 msgid "Documentation for this page" msgstr "" -#: templates/admin_doc/bookmarklets.html:26 +#: contrib/admindocs/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:28 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:28 msgid "Show object ID" msgstr "" -#: templates/admin_doc/bookmarklets.html:29 +#: contrib/admindocs/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:31 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:31 msgid "Edit this object (current window)" msgstr "" -#: templates/admin_doc/bookmarklets.html:32 +#: contrib/admindocs/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:34 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:34 msgid "Edit this object (new window)" msgstr "" -#: templates/admin_doc/bookmarklets.html:35 +#: contrib/admindocs/templates/admin_doc/bookmarklets.html:35 msgid "As above, but opens the admin page in a new window." msgstr "" -#: templates/admin_doc/index.html:17 -#: templates/admin_doc/template_tag_index.html:9 +#: contrib/admindocs/templates/admin_doc/index.html:17 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:9 msgid "Tags" msgstr "" -#: templates/admin_doc/index.html:18 +#: contrib/admindocs/templates/admin_doc/index.html:18 msgid "List of all the template tags and their functions." msgstr "" -#: templates/admin_doc/index.html:20 -#: templates/admin_doc/template_filter_index.html:9 +#: contrib/admindocs/templates/admin_doc/index.html:20 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:9 msgid "Filters" msgstr "" -#: templates/admin_doc/index.html:21 +#: contrib/admindocs/templates/admin_doc/index.html:21 msgid "" "Filters are actions which can be applied to variables in a template to alter " "the output." msgstr "" -#: templates/admin_doc/index.html:23 templates/admin_doc/model_detail.html:16 -#: templates/admin_doc/model_index.html:10 -#: templates/admin_doc/model_index.html:14 +#: contrib/admindocs/templates/admin_doc/index.html:23 +#: contrib/admindocs/templates/admin_doc/model_detail.html:16 +#: contrib/admindocs/templates/admin_doc/model_index.html:10 +#: contrib/admindocs/templates/admin_doc/model_index.html:14 msgid "Models" msgstr "" -#: templates/admin_doc/index.html:24 +#: contrib/admindocs/templates/admin_doc/index.html:24 msgid "" "Models are descriptions of all the objects in the system and their " "associated fields. Each model has a list of fields which can be accessed as " "template variables" msgstr "" -#: templates/admin_doc/index.html:26 templates/admin_doc/view_detail.html:8 -#: templates/admin_doc/view_index.html:9 -#: templates/admin_doc/view_index.html:12 +#: contrib/admindocs/templates/admin_doc/index.html:26 +#: contrib/admindocs/templates/admin_doc/view_detail.html:8 +#: contrib/admindocs/templates/admin_doc/view_index.html:9 +#: contrib/admindocs/templates/admin_doc/view_index.html:12 msgid "Views" msgstr "" -#: templates/admin_doc/index.html:27 +#: contrib/admindocs/templates/admin_doc/index.html:27 msgid "" "Each page on the public site is generated by a view. The view defines which " "template is used to generate the page and which objects are available to " "that template." msgstr "" -#: templates/admin_doc/index.html:30 +#: contrib/admindocs/templates/admin_doc/index.html:30 msgid "Tools for your browser to quickly access admin functionality." msgstr "" -#: templates/admin_doc/missing_docutils.html:10 +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:10 msgid "Please install docutils" msgstr "" -#: templates/admin_doc/missing_docutils.html:17 +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:17 #, python-format msgid "" "The admin documentation system requires Python's docutils library." msgstr "" -#: templates/admin_doc/missing_docutils.html:19 +#: contrib/admindocs/templates/admin_doc/missing_docutils.html:19 #, python-format msgid "" "Please ask your administrators to install docutils." msgstr "" -#: templates/admin_doc/model_detail.html:21 +#: contrib/admindocs/templates/admin_doc/model_detail.html:21 #, python-format msgid "Model: %(name)s" msgstr "" -#: templates/admin_doc/model_detail.html:35 +#: contrib/admindocs/templates/admin_doc/model_detail.html:35 msgid "Field" msgstr "" -#: templates/admin_doc/model_detail.html:36 +#: contrib/admindocs/templates/admin_doc/model_detail.html:36 msgid "Type" msgstr "" -#: templates/admin_doc/model_detail.html:37 +#: contrib/admindocs/templates/admin_doc/model_detail.html:37 msgid "Description" msgstr "" -#: templates/admin_doc/model_detail.html:52 -msgid "Back to Models Documentation" +#: contrib/admindocs/templates/admin_doc/model_detail.html:52 +msgid "Back to Model Documentation" msgstr "" -#: templates/admin_doc/model_index.html:18 +#: contrib/admindocs/templates/admin_doc/model_index.html:18 msgid "Model documentation" msgstr "" -#: templates/admin_doc/model_index.html:43 +#: contrib/admindocs/templates/admin_doc/model_index.html:43 msgid "Model groups" msgstr "" -#: templates/admin_doc/template_detail.html:8 +#: contrib/admindocs/templates/admin_doc/template_detail.html:8 msgid "Templates" msgstr "" -#: templates/admin_doc/template_detail.html:13 +#: contrib/admindocs/templates/admin_doc/template_detail.html:13 #, python-format msgid "Template: %(name)s" msgstr "" -#: templates/admin_doc/template_detail.html:16 +#: contrib/admindocs/templates/admin_doc/template_detail.html:16 #, python-format msgid "Template: \"%(name)s\"" msgstr "" -#: templates/admin_doc/template_detail.html:20 +#: contrib/admindocs/templates/admin_doc/template_detail.html:18 #, python-format -msgid "Search path for template \"%(name)s\" on %(grouper)s:" +msgid "Search path for template \"%(name)s\":" msgstr "" -#: templates/admin_doc/template_detail.html:23 +#: contrib/admindocs/templates/admin_doc/template_detail.html:21 msgid "(does not exist)" msgstr "" -#: templates/admin_doc/template_detail.html:28 +#: contrib/admindocs/templates/admin_doc/template_detail.html:25 msgid "Back to Documentation" msgstr "" -#: templates/admin_doc/template_filter_index.html:12 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:12 msgid "Template filters" msgstr "" -#: templates/admin_doc/template_filter_index.html:16 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:16 msgid "Template filter documentation" msgstr "" -#: templates/admin_doc/template_filter_index.html:22 -#: templates/admin_doc/template_filter_index.html:43 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:22 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:43 msgid "Built-in filters" msgstr "" -#: templates/admin_doc/template_filter_index.html:23 +#: contrib/admindocs/templates/admin_doc/template_filter_index.html:23 #, python-format msgid "" "To use these filters, put %(code)s in your template before " "using the filter." msgstr "" -#: templates/admin_doc/template_tag_index.html:12 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:12 msgid "Template tags" msgstr "" -#: templates/admin_doc/template_tag_index.html:16 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:16 msgid "Template tag documentation" msgstr "" -#: templates/admin_doc/template_tag_index.html:22 -#: templates/admin_doc/template_tag_index.html:43 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:22 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:43 msgid "Built-in tags" msgstr "" -#: templates/admin_doc/template_tag_index.html:23 +#: contrib/admindocs/templates/admin_doc/template_tag_index.html:23 #, python-format msgid "" "To use these tags, put %(code)s in your template before using " "the tag." msgstr "" -#: templates/admin_doc/view_detail.html:12 +#: contrib/admindocs/templates/admin_doc/view_detail.html:12 #, python-format msgid "View: %(name)s" msgstr "" -#: templates/admin_doc/view_detail.html:23 +#: contrib/admindocs/templates/admin_doc/view_detail.html:23 msgid "Context:" msgstr "" -#: templates/admin_doc/view_detail.html:28 +#: contrib/admindocs/templates/admin_doc/view_detail.html:28 msgid "Templates:" msgstr "" -#: templates/admin_doc/view_detail.html:32 +#: contrib/admindocs/templates/admin_doc/view_detail.html:32 msgid "Back to Views Documentation" msgstr "" -#: templates/admin_doc/view_index.html:16 +#: contrib/admindocs/templates/admin_doc/view_index.html:16 msgid "View documentation" msgstr "" -#: templates/admin_doc/view_index.html:22 -msgid "Jump to site" +#: contrib/admindocs/templates/admin_doc/view_index.html:22 +msgid "Jump to namespace" msgstr "" -#: templates/admin_doc/view_index.html:35 +#: contrib/admindocs/templates/admin_doc/view_index.html:27 +msgid "Empty namespace" +msgstr "" + +#: contrib/admindocs/templates/admin_doc/view_index.html:40 #, python-format -msgid "Views by URL on %(name)s" +msgid "Views by namespace %(name)s" msgstr "" -#: templates/admin_doc/view_index.html:40 +#: contrib/admindocs/templates/admin_doc/view_index.html:42 +msgid "Views by empty namespace" +msgstr "" + +#: contrib/admindocs/templates/admin_doc/view_index.html:49 #, python-format -msgid "View function: %(name)s" +msgid "" +"\n" +" View function: %(full_name)s. Name: %(url_name)s.\n" msgstr "" -#: tests/test_fields.py:29 +#: contrib/admindocs/tests/test_fields.py:32 msgid "Boolean (Either True or False)" msgstr "" -#: tests/test_fields.py:39 +#: contrib/admindocs/tests/test_fields.py:42 #, python-format msgid "Field of type: %(field_type)s" msgstr "" + +#: contrib/admindocs/views.py:69 contrib/admindocs/views.py:71 +#: contrib/admindocs/views.py:73 +msgid "tag:" +msgstr "" + +#: contrib/admindocs/views.py:102 contrib/admindocs/views.py:104 +#: contrib/admindocs/views.py:106 +msgid "filter:" +msgstr "" + +#: contrib/admindocs/views.py:153 contrib/admindocs/views.py:155 +#: contrib/admindocs/views.py:157 +msgid "view:" +msgstr "" + +#: contrib/admindocs/views.py:184 +#, python-format +msgid "App %(app_label)r not found" +msgstr "" + +#: contrib/admindocs/views.py:188 +#, python-format +msgid "Model %(model_name)r not found in app %(app_label)r" +msgstr "" + +#: contrib/admindocs/views.py:201 +#, python-format +msgid "the related `%(app_label)s.%(data_type)s` object" +msgstr "" + +#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:225 +#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244 +#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263 +msgid "model:" +msgstr "" + +#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253 +#, python-format +msgid "related `%(app_label)s.%(object_name)s` objects" +msgstr "" + +#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258 +#, python-format +msgid "all %s" +msgstr "" + +#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263 +#, python-format +msgid "number of %s" +msgstr "" + +#. Translators: %s is an object type name +#: contrib/admindocs/views.py:268 +#, python-format +msgid "Attributes on %s objects" +msgstr "" + +#: contrib/admindocs/views.py:362 +#, python-format +msgid "%s does not appear to be a urlpattern object" +msgstr "" diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po index 36faba74bf..863eb82230 100644 --- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po +++ b/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: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,252 +13,300 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:41 +#: contrib/auth/admin.py:45 msgid "Personal info" msgstr "" -#: admin.py:42 +#: contrib/auth/admin.py:46 msgid "Permissions" msgstr "" -#: admin.py:44 +#: contrib/auth/admin.py:48 msgid "Important dates" msgstr "" -#: admin.py:132 +#: contrib/auth/admin.py:133 msgid "Password changed successfully." msgstr "" -#: admin.py:142 +#: contrib/auth/admin.py:144 #, python-format msgid "Change password: %s" msgstr "" -#: forms.py:33 tests/test_forms.py:261 tests/test_forms.py:266 -#: tests/test_forms.py:407 +#: contrib/auth/apps.py:10 +msgid "Authentication and Authorization" +msgstr "" + +#: contrib/auth/forms.py:37 contrib/auth/tests/test_forms.py:316 +#: contrib/auth/tests/test_forms.py:321 contrib/auth/tests/test_forms.py:504 msgid "No password set." msgstr "" -#: forms.py:39 tests/test_forms.py:271 tests/test_forms.py:277 +#: contrib/auth/forms.py:43 contrib/auth/tests/test_forms.py:326 +#: contrib/auth/tests/test_forms.py:332 msgid "Invalid password format or unknown hashing algorithm." msgstr "" -#: forms.py:72 +#: contrib/auth/forms.py:76 msgid "A user with that username already exists." msgstr "" -#: forms.py:73 forms.py:254 forms.py:314 +#: contrib/auth/forms.py:77 contrib/auth/forms.py:285 +#: contrib/auth/forms.py:349 msgid "The two password fields didn't match." msgstr "" -#: forms.py:75 forms.py:120 +#: contrib/auth/forms.py:79 contrib/auth/forms.py:129 msgid "Username" msgstr "" -#: forms.py:77 forms.py:121 +#: contrib/auth/forms.py:81 contrib/auth/forms.py:130 +#: contrib/auth/models.py:383 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" -#: forms.py:80 forms.py:124 +#: contrib/auth/forms.py:84 contrib/auth/forms.py:133 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" -#: forms.py:82 forms.py:126 forms.py:153 forms.py:316 +#: contrib/auth/forms.py:86 contrib/auth/forms.py:135 +#: contrib/auth/forms.py:163 contrib/auth/forms.py:352 msgid "Password" msgstr "" -#: forms.py:84 +#: contrib/auth/forms.py:88 msgid "Password confirmation" msgstr "" -#: forms.py:86 +#: contrib/auth/forms.py:90 msgid "Enter the same password as above, for verification." msgstr "" -#: forms.py:127 +#: contrib/auth/forms.py:136 msgid "" "Raw passwords are not stored, so there is no way to see this user's " "password, but you can change the password using this " "form." msgstr "" -#: forms.py:156 +#: contrib/auth/forms.py:166 #, python-format msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." msgstr "" -#: forms.py:158 +#: contrib/auth/forms.py:168 msgid "This account is inactive." msgstr "" -#: forms.py:206 +#: contrib/auth/forms.py:231 msgid "Email" msgstr "" -#: forms.py:256 +#: contrib/auth/forms.py:287 msgid "New password" msgstr "" -#: forms.py:258 +#: contrib/auth/forms.py:289 msgid "New password confirmation" msgstr "" -#: forms.py:287 +#: contrib/auth/forms.py:320 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:290 +#: contrib/auth/forms.py:323 msgid "Old password" msgstr "" -#: forms.py:318 +#: contrib/auth/forms.py:354 msgid "Password (again)" msgstr "" -#: hashers.py:243 hashers.py:317 hashers.py:365 hashers.py:393 hashers.py:426 -#: hashers.py:459 hashers.py:493 +#: contrib/auth/hashers.py:252 contrib/auth/hashers.py:335 +#: contrib/auth/hashers.py:383 contrib/auth/hashers.py:411 +#: contrib/auth/hashers.py:444 contrib/auth/hashers.py:477 +#: contrib/auth/hashers.py:511 msgid "algorithm" msgstr "" -#: hashers.py:244 +#: contrib/auth/hashers.py:253 msgid "iterations" msgstr "" -#: hashers.py:245 hashers.py:319 hashers.py:366 hashers.py:394 hashers.py:494 +#: contrib/auth/hashers.py:254 contrib/auth/hashers.py:337 +#: contrib/auth/hashers.py:384 contrib/auth/hashers.py:412 +#: contrib/auth/hashers.py:512 msgid "salt" msgstr "" -#: hashers.py:246 hashers.py:367 hashers.py:395 hashers.py:427 hashers.py:460 -#: hashers.py:495 +#: contrib/auth/hashers.py:255 contrib/auth/hashers.py:385 +#: contrib/auth/hashers.py:413 contrib/auth/hashers.py:445 +#: contrib/auth/hashers.py:478 contrib/auth/hashers.py:513 msgid "hash" msgstr "" -#: hashers.py:318 +#: contrib/auth/hashers.py:336 msgid "work factor" msgstr "" -#: hashers.py:320 +#: contrib/auth/hashers.py:338 msgid "checksum" msgstr "" -#: models.py:72 models.py:121 +#: contrib/auth/models.py:64 contrib/auth/models.py:113 msgid "name" msgstr "" -#: models.py:74 +#: contrib/auth/models.py:66 msgid "codename" msgstr "" -#: models.py:78 +#: contrib/auth/models.py:70 msgid "permission" msgstr "" -#: models.py:79 models.py:123 +#: contrib/auth/models.py:71 contrib/auth/models.py:115 msgid "permissions" msgstr "" -#: models.py:128 +#: contrib/auth/models.py:120 msgid "group" msgstr "" -#: models.py:129 models.py:294 +#: contrib/auth/models.py:121 contrib/auth/models.py:308 msgid "groups" msgstr "" -#: models.py:200 +#: contrib/auth/models.py:193 msgid "password" msgstr "" -#: models.py:201 +#: contrib/auth/models.py:194 msgid "last login" msgstr "" -#: models.py:291 +#: contrib/auth/models.py:305 msgid "superuser status" msgstr "" -#: models.py:292 +#: contrib/auth/models.py:306 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:295 +#: contrib/auth/models.py:309 msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of his/her group." msgstr "" -#: models.py:299 +#: contrib/auth/models.py:314 msgid "user permissions" msgstr "" -#: models.py:366 +#: contrib/auth/models.py:315 +msgid "Specific permissions for this user." +msgstr "" + +#: contrib/auth/models.py:382 msgid "username" msgstr "" -#: models.py:367 -msgid "" -"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" -msgstr "" - -#: models.py:370 +#: contrib/auth/models.py:386 msgid "Enter a valid username." msgstr "" -#: models.py:372 +#: contrib/auth/models.py:388 msgid "first name" msgstr "" -#: models.py:373 +#: contrib/auth/models.py:389 msgid "last name" msgstr "" -#: models.py:374 +#: contrib/auth/models.py:390 msgid "email address" msgstr "" -#: models.py:375 +#: contrib/auth/models.py:391 msgid "staff status" msgstr "" -#: models.py:376 +#: contrib/auth/models.py:392 msgid "Designates whether the user can log into this admin site." msgstr "" -#: models.py:378 +#: contrib/auth/models.py:394 msgid "active" msgstr "" -#: models.py:379 +#: contrib/auth/models.py:395 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:381 +#: contrib/auth/models.py:397 msgid "date joined" msgstr "" -#: models.py:389 +#: contrib/auth/models.py:405 msgid "user" msgstr "" -#: models.py:390 +#: contrib/auth/models.py:406 msgid "users" msgstr "" -#: views.py:89 -msgid "Logged out" -msgstr "" - -#: templates/registration/password_reset_subject.txt:2 +#: contrib/auth/templates/registration/password_reset_subject.txt:2 #, python-format msgid "Password reset on %(site_name)s" msgstr "" -#: tests/test_forms.py:325 +#: contrib/auth/tests/test_forms.py:153 +msgid "This user is disallowed." +msgstr "" + +#: contrib/auth/tests/test_forms.py:154 +msgid "Sorry, nobody's allowed in." +msgstr "" + +#: contrib/auth/tests/test_forms.py:387 msgid "Enter a valid email address." msgstr "" + +#: contrib/auth/views.py:92 +msgid "Logged out" +msgstr "" + +#: contrib/auth/views.py:169 +msgid "Password reset" +msgstr "" + +#: contrib/auth/views.py:181 +msgid "Password reset successful" +msgstr "" + +#: contrib/auth/views.py:216 +msgid "Enter new password" +msgstr "" + +#: contrib/auth/views.py:227 +msgid "Password reset unsuccessful" +msgstr "" + +#: contrib/auth/views.py:244 +msgid "Password reset complete" +msgstr "" + +#: contrib/auth/views.py:278 +msgid "Password change" +msgstr "" + +#: contrib/auth/views.py:291 +msgid "Password change successful" +msgstr "" diff --git a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po index 0ca678d9cc..e337553ac8 100644 --- a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,29 +13,33 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: models.py:130 +#: contrib/contenttypes/apps.py:9 +msgid "Content Types" +msgstr "" + +#: contrib/contenttypes/models.py:134 msgid "python model class name" msgstr "" -#: models.py:134 +#: contrib/contenttypes/models.py:138 msgid "content type" msgstr "" -#: models.py:135 +#: contrib/contenttypes/models.py:139 msgid "content types" msgstr "" -#: views.py:17 +#: contrib/contenttypes/views.py:19 #, python-format msgid "Content type %(ct_id)s object has no associated model" msgstr "" -#: views.py:21 +#: contrib/contenttypes/views.py:23 #, python-format msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" msgstr "" -#: views.py:27 +#: contrib/contenttypes/views.py:29 #, python-format msgid "%(ct_name)s objects don't have a get_absolute_url() method" msgstr "" diff --git a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po index 53b82e5793..e2d832b5d5 100644 --- a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,76 +13,80 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:10 +#: contrib/flatpages/admin.py:11 msgid "Advanced options" msgstr "" -#: forms.py:7 models.py:11 +#: contrib/flatpages/apps.py:8 +msgid "Flat Pages" +msgstr "" + +#: contrib/flatpages/forms.py:8 contrib/flatpages/models.py:12 msgid "URL" msgstr "" -#: forms.py:8 +#: contrib/flatpages/forms.py:9 msgid "" "Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "" -#: forms.py:10 +#: contrib/flatpages/forms.py:11 msgid "" "This value must contain only letters, numbers, dots, underscores, dashes, " "slashes or tildes." msgstr "" -#: forms.py:19 +#: contrib/flatpages/forms.py:22 msgid "URL is missing a leading slash." msgstr "" -#: forms.py:23 +#: contrib/flatpages/forms.py:29 msgid "URL is missing a trailing slash." msgstr "" -#: forms.py:38 +#: contrib/flatpages/forms.py:46 #, python-format msgid "Flatpage with url %(url)s already exists for site %(site)s" msgstr "" -#: models.py:12 +#: contrib/flatpages/models.py:13 msgid "title" msgstr "" -#: models.py:13 +#: contrib/flatpages/models.py:14 msgid "content" msgstr "" -#: models.py:14 +#: contrib/flatpages/models.py:15 msgid "enable comments" msgstr "" -#: models.py:15 +#: contrib/flatpages/models.py:16 msgid "template name" msgstr "" -#: models.py:16 +#: contrib/flatpages/models.py:17 msgid "" "Example: 'flatpages/contact_page.html'. If this isn't provided, the system " "will use 'flatpages/default.html'." msgstr "" -#: models.py:17 +#: contrib/flatpages/models.py:18 msgid "registration required" msgstr "" -#: models.py:18 +#: contrib/flatpages/models.py:19 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" -#: models.py:24 +#: contrib/flatpages/models.py:25 msgid "flat page" msgstr "" -#: models.py:25 +#: contrib/flatpages/models.py:26 msgid "flat pages" msgstr "" -#: tests/test_forms.py:98 +#: contrib/flatpages/tests/test_forms.py:98 msgid "This field is required." msgstr "" diff --git a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po b/django/contrib/formtools/locale/en/LC_MESSAGES/django.po index 048b9fea45..d928a897f4 100644 --- a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/formtools/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,14 +13,22 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: templates/formtools/wizard/wizard_form.html:15 +#: contrib/formtools/apps.py:8 +msgid "Form Tools" +msgstr "" + +#: contrib/formtools/templates/formtools/wizard/wizard_form.html:15 msgid "first step" msgstr "" -#: templates/formtools/wizard/wizard_form.html:16 +#: contrib/formtools/templates/formtools/wizard/wizard_form.html:16 msgid "prev step" msgstr "" -#: templates/formtools/wizard/wizard_form.html:18 +#: contrib/formtools/templates/formtools/wizard/wizard_form.html:18 msgid "submit" msgstr "" + +#: contrib/formtools/wizard/views.py:276 +msgid "ManagementForm data is missing or has been tampered." +msgstr "" diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po index 6c8d7ec92a..be68c9f53f 100644 --- a/django/contrib/gis/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/gis/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,76 +13,65 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: views.py:9 -msgid "No feeds are registered." +#: contrib/gis/apps.py:8 +msgid "GIS" msgstr "" -#: views.py:19 -#, python-format -msgid "Slug %r isn't registered." -msgstr "" - -#: db/models/fields.py:51 +#: contrib/gis/db/models/fields.py:56 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type." msgstr "" -#: db/models/fields.py:270 +#: contrib/gis/db/models/fields.py:298 msgid "Point" msgstr "" -#: db/models/fields.py:274 +#: contrib/gis/db/models/fields.py:304 msgid "Line string" msgstr "" -#: db/models/fields.py:278 +#: contrib/gis/db/models/fields.py:310 msgid "Polygon" msgstr "" -#: db/models/fields.py:282 +#: contrib/gis/db/models/fields.py:316 msgid "Multi-point" msgstr "" -#: db/models/fields.py:286 +#: contrib/gis/db/models/fields.py:322 msgid "Multi-line string" msgstr "" -#: db/models/fields.py:290 +#: contrib/gis/db/models/fields.py:328 msgid "Multi polygon" msgstr "" -#: db/models/fields.py:294 +#: contrib/gis/db/models/fields.py:334 msgid "Geometry collection" msgstr "" -#: forms/fields.py:23 +#: contrib/gis/forms/fields.py:22 msgid "No geometry value provided." msgstr "" -#: forms/fields.py:24 +#: contrib/gis/forms/fields.py:23 msgid "Invalid geometry value." msgstr "" -#: forms/fields.py:25 +#: contrib/gis/forms/fields.py:24 msgid "Invalid geometry type." msgstr "" -#: forms/fields.py:26 +#: contrib/gis/forms/fields.py:25 msgid "" "An error occurred when transforming the geometry to the SRID of the geometry " "form field." msgstr "" -#: sitemaps/views.py:46 -#, python-format -msgid "No sitemap available for section: %r" +#: contrib/gis/views.py:10 +msgid "No feeds are registered." msgstr "" -#: sitemaps/views.py:60 +#: contrib/gis/views.py:16 #, python-format -msgid "Page %s empty" -msgstr "" - -#: sitemaps/views.py:62 -#, python-format -msgid "No page '%s'" +msgid "Slug %r isn't registered." msgstr "" diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po index 2c3cd0c08d..0f0bdddb89 100644 --- a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-18 23:10+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,284 +13,295 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tests.py:135 templatetags/humanize.py:168 -msgid "today" +#: contrib/humanize/apps.py:8 +msgid "Humanize" msgstr "" -#: tests.py:135 templatetags/humanize.py:172 -msgid "yesterday" -msgstr "" - -#: tests.py:135 templatetags/humanize.py:170 -msgid "tomorrow" -msgstr "" - -#: templatetags/humanize.py:26 +#: contrib/humanize/templatetags/humanize.py:30 msgid "th" msgstr "" -#: templatetags/humanize.py:26 +#: contrib/humanize/templatetags/humanize.py:30 msgid "st" msgstr "" -#: templatetags/humanize.py:26 +#: contrib/humanize/templatetags/humanize.py:30 msgid "nd" msgstr "" -#: templatetags/humanize.py:26 +#: contrib/humanize/templatetags/humanize.py:30 msgid "rd" msgstr "" -#: templatetags/humanize.py:55 +#: contrib/humanize/templatetags/humanize.py:61 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:56 +#: contrib/humanize/templatetags/humanize.py:62 #, python-format msgid "%(value)s million" msgid_plural "%(value)s million" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:59 +#: contrib/humanize/templatetags/humanize.py:65 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:60 +#: contrib/humanize/templatetags/humanize.py:66 #, python-format msgid "%(value)s billion" msgid_plural "%(value)s billion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:63 +#: contrib/humanize/templatetags/humanize.py:69 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:64 +#: contrib/humanize/templatetags/humanize.py:70 #, python-format msgid "%(value)s trillion" msgid_plural "%(value)s trillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:67 +#: contrib/humanize/templatetags/humanize.py:73 #, python-format msgid "%(value).1f quadrillion" msgid_plural "%(value).1f quadrillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:68 +#: contrib/humanize/templatetags/humanize.py:74 #, python-format msgid "%(value)s quadrillion" msgid_plural "%(value)s quadrillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:71 +#: contrib/humanize/templatetags/humanize.py:77 #, python-format msgid "%(value).1f quintillion" msgid_plural "%(value).1f quintillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:72 +#: contrib/humanize/templatetags/humanize.py:78 #, python-format msgid "%(value)s quintillion" msgid_plural "%(value)s quintillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:75 +#: contrib/humanize/templatetags/humanize.py:81 #, python-format msgid "%(value).1f sextillion" msgid_plural "%(value).1f sextillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:76 +#: contrib/humanize/templatetags/humanize.py:82 #, python-format msgid "%(value)s sextillion" msgid_plural "%(value)s sextillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:79 +#: contrib/humanize/templatetags/humanize.py:85 #, python-format msgid "%(value).1f septillion" msgid_plural "%(value).1f septillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:80 +#: contrib/humanize/templatetags/humanize.py:86 #, python-format msgid "%(value)s septillion" msgid_plural "%(value)s septillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:83 +#: contrib/humanize/templatetags/humanize.py:89 #, python-format msgid "%(value).1f octillion" msgid_plural "%(value).1f octillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:84 +#: contrib/humanize/templatetags/humanize.py:90 #, python-format msgid "%(value)s octillion" msgid_plural "%(value)s octillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:87 +#: contrib/humanize/templatetags/humanize.py:93 #, python-format msgid "%(value).1f nonillion" msgid_plural "%(value).1f nonillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:88 +#: contrib/humanize/templatetags/humanize.py:94 #, python-format msgid "%(value)s nonillion" msgid_plural "%(value)s nonillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:91 +#: contrib/humanize/templatetags/humanize.py:97 #, python-format msgid "%(value).1f decillion" msgid_plural "%(value).1f decillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:92 +#: contrib/humanize/templatetags/humanize.py:98 #, python-format msgid "%(value)s decillion" msgid_plural "%(value)s decillion" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:95 +#: contrib/humanize/templatetags/humanize.py:101 #, python-format msgid "%(value).1f googol" msgid_plural "%(value).1f googol" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:96 +#: contrib/humanize/templatetags/humanize.py:102 #, python-format msgid "%(value)s googol" msgid_plural "%(value)s googol" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:145 +#: contrib/humanize/templatetags/humanize.py:153 msgid "one" msgstr "" -#: templatetags/humanize.py:145 +#: contrib/humanize/templatetags/humanize.py:153 msgid "two" msgstr "" -#: templatetags/humanize.py:145 +#: contrib/humanize/templatetags/humanize.py:153 msgid "three" msgstr "" -#: templatetags/humanize.py:145 +#: contrib/humanize/templatetags/humanize.py:153 msgid "four" msgstr "" -#: templatetags/humanize.py:145 +#: contrib/humanize/templatetags/humanize.py:153 msgid "five" msgstr "" -#: templatetags/humanize.py:145 +#: contrib/humanize/templatetags/humanize.py:153 msgid "six" msgstr "" -#: templatetags/humanize.py:145 +#: contrib/humanize/templatetags/humanize.py:153 msgid "seven" msgstr "" -#: templatetags/humanize.py:145 +#: contrib/humanize/templatetags/humanize.py:153 msgid "eight" msgstr "" -#: templatetags/humanize.py:145 +#: contrib/humanize/templatetags/humanize.py:153 msgid "nine" msgstr "" -#: templatetags/humanize.py:191 +#: contrib/humanize/templatetags/humanize.py:177 contrib/humanize/tests.py:145 +msgid "today" +msgstr "" + +#: contrib/humanize/templatetags/humanize.py:179 contrib/humanize/tests.py:145 +msgid "tomorrow" +msgstr "" + +#: contrib/humanize/templatetags/humanize.py:181 contrib/humanize/tests.py:145 +msgid "yesterday" +msgstr "" + +#: contrib/humanize/templatetags/humanize.py:201 #, python-format msgctxt "naturaltime" msgid "%(delta)s ago" msgstr "" -#: templatetags/humanize.py:194 templatetags/humanize.py:219 +#: contrib/humanize/templatetags/humanize.py:204 +#: contrib/humanize/templatetags/humanize.py:232 msgid "now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:198 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: contrib/humanize/templatetags/humanize.py:209 #, python-format msgid "a second ago" -msgid_plural "%(count)s\\u00a0seconds ago" +msgid_plural "%(count)s seconds ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:204 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: contrib/humanize/templatetags/humanize.py:216 #, python-format msgid "a minute ago" -msgid_plural "%(count)s\\u00a0minutes ago" +msgid_plural "%(count)s minutes ago" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:210 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: contrib/humanize/templatetags/humanize.py:223 #, python-format msgid "an hour ago" -msgid_plural "%(count)s\\u00a0hours ago" +msgid_plural "%(count)s hours ago" msgstr[0] "" msgstr[1] "" -#: templatetags/humanize.py:216 +#: contrib/humanize/templatetags/humanize.py:229 #, python-format msgctxt "naturaltime" msgid "%(delta)s from now" msgstr "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:223 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: contrib/humanize/templatetags/humanize.py:237 #, python-format msgid "a second from now" -msgid_plural "%(count)s\\u00a0seconds from now" +msgid_plural "%(count)s seconds from now" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:229 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: contrib/humanize/templatetags/humanize.py:244 #, python-format msgid "a minute from now" -msgid_plural "%(count)s\\u00a0minutes from now" +msgid_plural "%(count)s minutes from now" msgstr[0] "" msgstr[1] "" -#. Translators: \\u00a0 is non-breaking space -#: templatetags/humanize.py:235 +#. Translators: please keep a non-breaking space (U+00A0) +#. between count and time unit. +#: contrib/humanize/templatetags/humanize.py:251 #, python-format msgid "an hour from now" -msgid_plural "%(count)s\\u00a0hours from now" +msgid_plural "%(count)s hours from now" msgstr[0] "" msgstr[1] "" diff --git a/django/contrib/messages/locale/en/LC_MESSAGES/django.po b/django/contrib/messages/locale/en/LC_MESSAGES/django.po index 7a041aa1a2..998a504a37 100644 --- a/django/contrib/messages/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/messages/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,6 +13,10 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tests/base.py:100 +#: contrib/messages/apps.py:8 +msgid "Messages" +msgstr "" + +#: contrib/messages/tests/base.py:105 msgid "lazy message" msgstr "" diff --git a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po index 10eb14e213..045e4cbec6 100644 --- a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,30 +13,34 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: models.py:9 +#: contrib/redirects/apps.py:8 +msgid "Redirects" +msgstr "" + +#: contrib/redirects/models.py:10 msgid "redirect from" msgstr "" -#: models.py:10 +#: contrib/redirects/models.py:11 msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -#: models.py:11 +#: contrib/redirects/models.py:12 msgid "redirect to" msgstr "" -#: models.py:12 +#: contrib/redirects/models.py:13 msgid "" "This can be either an absolute path (as above) or a full URL starting with " "'http://'." msgstr "" -#: models.py:15 +#: contrib/redirects/models.py:16 msgid "redirect" msgstr "" -#: models.py:16 +#: contrib/redirects/models.py:17 msgid "redirects" msgstr "" diff --git a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po b/django/contrib/sessions/locale/en/LC_MESSAGES/django.po index 247efec01b..c4e7cb0ba7 100644 --- a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/sessions/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,22 +13,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: models.py:38 +#: contrib/sessions/apps.py:8 +msgid "Sessions" +msgstr "" + +#: contrib/sessions/models.py:38 msgid "session key" msgstr "" -#: models.py:40 +#: contrib/sessions/models.py:40 msgid "session data" msgstr "" -#: models.py:41 +#: contrib/sessions/models.py:41 msgid "expire date" msgstr "" -#: models.py:46 +#: contrib/sessions/models.py:46 msgid "session" msgstr "" -#: models.py:47 +#: contrib/sessions/models.py:47 msgid "sessions" msgstr "" diff --git a/django/contrib/sites/locale/en/LC_MESSAGES/django.po b/django/contrib/sites/locale/en/LC_MESSAGES/django.po index c84cad01c8..86595beea4 100644 --- a/django/contrib/sites/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/sites/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:17+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,22 +13,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: models.py:25 +#: contrib/sites/apps.py:8 +msgid "Sites" +msgstr "" + +#: contrib/sites/models.py:30 msgid "The domain name cannot contain any spaces or tabs." msgstr "" -#: models.py:58 +#: contrib/sites/models.py:67 msgid "domain name" msgstr "" -#: models.py:60 +#: contrib/sites/models.py:69 msgid "display name" msgstr "" -#: models.py:65 +#: contrib/sites/models.py:74 msgid "site" msgstr "" -#: models.py:66 +#: contrib/sites/models.py:75 msgid "sites" msgstr ""