From 1f3dfd783d5d5925853319650e6295f3a35e73e5 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sun, 24 Sep 2017 13:52:40 +0200 Subject: [PATCH] Updated translation catalogs Forward port of 600104172a9d3cd7c496855110711785feab555a from stable/2.0.x. --- django/conf/locale/en/LC_MESSAGES/django.po | 590 ++++++++++-------- .../auth/locale/en/LC_MESSAGES/django.po | 5 +- 2 files changed, 318 insertions(+), 277 deletions(-) diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 63ac1bea97b..6dca69eac06 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: 2017-01-19 16:49+0100\n" +"POT-Creation-Date: 2017-09-24 13:46+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -14,355 +14,355 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: conf/global_settings.py:51 +#: conf/global_settings.py:57 msgid "Afrikaans" msgstr "" -#: conf/global_settings.py:52 +#: conf/global_settings.py:58 msgid "Arabic" msgstr "" -#: conf/global_settings.py:53 +#: conf/global_settings.py:59 msgid "Asturian" msgstr "" -#: conf/global_settings.py:54 +#: conf/global_settings.py:60 msgid "Azerbaijani" msgstr "" -#: conf/global_settings.py:55 +#: conf/global_settings.py:61 msgid "Bulgarian" msgstr "" -#: conf/global_settings.py:56 +#: conf/global_settings.py:62 msgid "Belarusian" msgstr "" -#: conf/global_settings.py:57 +#: conf/global_settings.py:63 msgid "Bengali" msgstr "" -#: conf/global_settings.py:58 +#: conf/global_settings.py:64 msgid "Breton" msgstr "" -#: conf/global_settings.py:59 +#: conf/global_settings.py:65 msgid "Bosnian" msgstr "" -#: conf/global_settings.py:60 +#: conf/global_settings.py:66 msgid "Catalan" msgstr "" -#: conf/global_settings.py:61 +#: conf/global_settings.py:67 msgid "Czech" msgstr "" -#: conf/global_settings.py:62 +#: conf/global_settings.py:68 msgid "Welsh" msgstr "" -#: conf/global_settings.py:63 +#: conf/global_settings.py:69 msgid "Danish" msgstr "" -#: conf/global_settings.py:64 +#: conf/global_settings.py:70 msgid "German" msgstr "" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Lower Sorbian" msgstr "" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Greek" msgstr "" -#: conf/global_settings.py:66 +#: conf/global_settings.py:73 msgid "English" msgstr "" -#: conf/global_settings.py:67 +#: conf/global_settings.py:74 msgid "Australian English" msgstr "" -#: conf/global_settings.py:68 +#: conf/global_settings.py:75 msgid "British English" msgstr "" -#: conf/global_settings.py:69 +#: conf/global_settings.py:76 msgid "Esperanto" msgstr "" -#: conf/global_settings.py:70 +#: conf/global_settings.py:77 msgid "Spanish" msgstr "" -#: conf/global_settings.py:71 +#: conf/global_settings.py:78 msgid "Argentinian Spanish" msgstr "" -#: conf/global_settings.py:72 +#: conf/global_settings.py:79 msgid "Colombian Spanish" msgstr "" -#: conf/global_settings.py:72 +#: conf/global_settings.py:80 msgid "Mexican Spanish" msgstr "" -#: conf/global_settings.py:73 +#: conf/global_settings.py:81 msgid "Nicaraguan Spanish" msgstr "" -#: conf/global_settings.py:74 +#: conf/global_settings.py:82 msgid "Venezuelan Spanish" msgstr "" -#: conf/global_settings.py:75 +#: conf/global_settings.py:83 msgid "Estonian" msgstr "" -#: conf/global_settings.py:76 +#: conf/global_settings.py:84 msgid "Basque" msgstr "" -#: conf/global_settings.py:77 +#: conf/global_settings.py:85 msgid "Persian" msgstr "" -#: conf/global_settings.py:78 +#: conf/global_settings.py:86 msgid "Finnish" msgstr "" -#: conf/global_settings.py:79 +#: conf/global_settings.py:87 msgid "French" msgstr "" -#: conf/global_settings.py:80 +#: conf/global_settings.py:88 msgid "Frisian" msgstr "" -#: conf/global_settings.py:81 +#: conf/global_settings.py:89 msgid "Irish" msgstr "" -#: conf/global_settings.py:83 +#: conf/global_settings.py:90 msgid "Scottish Gaelic" msgstr "" -#: conf/global_settings.py:82 +#: conf/global_settings.py:91 msgid "Galician" msgstr "" -#: conf/global_settings.py:83 +#: conf/global_settings.py:92 msgid "Hebrew" msgstr "" -#: conf/global_settings.py:84 +#: conf/global_settings.py:93 msgid "Hindi" msgstr "" -#: conf/global_settings.py:85 +#: conf/global_settings.py:94 msgid "Croatian" msgstr "" -#: conf/global_settings.py:94 +#: conf/global_settings.py:95 msgid "Upper Sorbian" msgstr "" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Hungarian" msgstr "" -#: conf/global_settings.py:87 +#: conf/global_settings.py:97 msgid "Interlingua" msgstr "" -#: conf/global_settings.py:88 +#: conf/global_settings.py:98 msgid "Indonesian" msgstr "" -#: conf/global_settings.py:89 +#: conf/global_settings.py:99 msgid "Ido" msgstr "" -#: conf/global_settings.py:90 +#: conf/global_settings.py:100 msgid "Icelandic" msgstr "" -#: conf/global_settings.py:91 +#: conf/global_settings.py:101 msgid "Italian" msgstr "" -#: conf/global_settings.py:92 +#: conf/global_settings.py:102 msgid "Japanese" msgstr "" -#: conf/global_settings.py:93 +#: conf/global_settings.py:103 msgid "Georgian" msgstr "" -#: conf/global_settings.py:94 +#: conf/global_settings.py:104 msgid "Kazakh" msgstr "" -#: conf/global_settings.py:95 +#: conf/global_settings.py:105 msgid "Khmer" msgstr "" -#: conf/global_settings.py:96 +#: conf/global_settings.py:106 msgid "Kannada" msgstr "" -#: conf/global_settings.py:97 +#: conf/global_settings.py:107 msgid "Korean" msgstr "" -#: conf/global_settings.py:98 +#: conf/global_settings.py:108 msgid "Luxembourgish" msgstr "" -#: conf/global_settings.py:99 +#: conf/global_settings.py:109 msgid "Lithuanian" msgstr "" -#: conf/global_settings.py:100 +#: conf/global_settings.py:110 msgid "Latvian" msgstr "" -#: conf/global_settings.py:101 +#: conf/global_settings.py:111 msgid "Macedonian" msgstr "" -#: conf/global_settings.py:102 +#: conf/global_settings.py:112 msgid "Malayalam" msgstr "" -#: conf/global_settings.py:103 +#: conf/global_settings.py:113 msgid "Mongolian" msgstr "" -#: conf/global_settings.py:104 +#: conf/global_settings.py:114 msgid "Marathi" msgstr "" -#: conf/global_settings.py:105 +#: conf/global_settings.py:115 msgid "Burmese" msgstr "" -#: conf/global_settings.py:113 +#: conf/global_settings.py:116 msgid "Norwegian Bokmål" msgstr "" -#: conf/global_settings.py:107 +#: conf/global_settings.py:117 msgid "Nepali" msgstr "" -#: conf/global_settings.py:108 +#: conf/global_settings.py:118 msgid "Dutch" msgstr "" -#: conf/global_settings.py:109 +#: conf/global_settings.py:119 msgid "Norwegian Nynorsk" msgstr "" -#: conf/global_settings.py:110 +#: conf/global_settings.py:120 msgid "Ossetic" msgstr "" -#: conf/global_settings.py:111 +#: conf/global_settings.py:121 msgid "Punjabi" msgstr "" -#: conf/global_settings.py:112 +#: conf/global_settings.py:122 msgid "Polish" msgstr "" -#: conf/global_settings.py:113 +#: conf/global_settings.py:123 msgid "Portuguese" msgstr "" -#: conf/global_settings.py:114 +#: conf/global_settings.py:124 msgid "Brazilian Portuguese" msgstr "" -#: conf/global_settings.py:115 +#: conf/global_settings.py:125 msgid "Romanian" msgstr "" -#: conf/global_settings.py:116 +#: conf/global_settings.py:126 msgid "Russian" msgstr "" -#: conf/global_settings.py:117 +#: conf/global_settings.py:127 msgid "Slovak" msgstr "" -#: conf/global_settings.py:118 +#: conf/global_settings.py:128 msgid "Slovenian" msgstr "" -#: conf/global_settings.py:119 +#: conf/global_settings.py:129 msgid "Albanian" msgstr "" -#: conf/global_settings.py:120 +#: conf/global_settings.py:130 msgid "Serbian" msgstr "" -#: conf/global_settings.py:121 +#: conf/global_settings.py:131 msgid "Serbian Latin" msgstr "" -#: conf/global_settings.py:122 +#: conf/global_settings.py:132 msgid "Swedish" msgstr "" -#: conf/global_settings.py:123 +#: conf/global_settings.py:133 msgid "Swahili" msgstr "" -#: conf/global_settings.py:124 +#: conf/global_settings.py:134 msgid "Tamil" msgstr "" -#: conf/global_settings.py:125 +#: conf/global_settings.py:135 msgid "Telugu" msgstr "" -#: conf/global_settings.py:126 +#: conf/global_settings.py:136 msgid "Thai" msgstr "" -#: conf/global_settings.py:127 +#: conf/global_settings.py:137 msgid "Turkish" msgstr "" -#: conf/global_settings.py:128 +#: conf/global_settings.py:138 msgid "Tatar" msgstr "" -#: conf/global_settings.py:129 +#: conf/global_settings.py:139 msgid "Udmurt" msgstr "" -#: conf/global_settings.py:130 +#: conf/global_settings.py:140 msgid "Ukrainian" msgstr "" -#: conf/global_settings.py:131 +#: conf/global_settings.py:141 msgid "Urdu" msgstr "" -#: conf/global_settings.py:132 +#: conf/global_settings.py:142 msgid "Vietnamese" msgstr "" -#: conf/global_settings.py:133 +#: conf/global_settings.py:143 msgid "Simplified Chinese" msgstr "" -#: conf/global_settings.py:134 +#: conf/global_settings.py:144 msgid "Traditional Chinese" msgstr "" @@ -374,7 +374,7 @@ msgstr "" msgid "Site Maps" msgstr "" -#: contrib/staticfiles/apps.py:7 +#: contrib/staticfiles/apps.py:9 msgid "Static Files" msgstr "" @@ -382,77 +382,78 @@ msgstr "" msgid "Syndication" msgstr "" -#: core/paginator.py:43 +#: core/paginator.py:40 msgid "That page number is not an integer" msgstr "" -#: core/paginator.py:45 +#: core/paginator.py:42 msgid "That page number is less than 1" msgstr "" -#: core/paginator.py:50 +#: core/paginator.py:47 msgid "That page contains no results" msgstr "" -#: core/validators.py:34 +#: core/validators.py:31 msgid "Enter a valid value." msgstr "" -#: core/validators.py:98 forms/fields.py:677 +#: core/validators.py:102 forms/fields.py:649 msgid "Enter a valid URL." msgstr "" -#: core/validators.py:141 +#: core/validators.py:154 msgid "Enter a valid integer." msgstr "" -#: core/validators.py:152 +#: core/validators.py:165 msgid "Enter a valid email address." msgstr "" -#: core/validators.py:225 +#. Translators: "letters" means latin letters: a-z and A-Z. +#: core/validators.py:239 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -#: core/validators.py:232 +#: core/validators.py:246 msgid "" "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" -#: core/validators.py:237 core/validators.py:256 +#: core/validators.py:255 core/validators.py:275 msgid "Enter a valid IPv4 address." msgstr "" -#: core/validators.py:242 core/validators.py:257 +#: core/validators.py:260 core/validators.py:276 msgid "Enter a valid IPv6 address." msgstr "" -#: core/validators.py:252 core/validators.py:255 +#: core/validators.py:270 core/validators.py:274 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: core/validators.py:284 db/models/fields/__init__.py:1147 +#: core/validators.py:304 msgid "Enter only digits separated by commas." msgstr "" -#: core/validators.py:292 +#: core/validators.py:310 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" -#: core/validators.py:318 +#: core/validators.py:341 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:325 +#: core/validators.py:350 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:334 +#: core/validators.py:360 #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -463,7 +464,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:345 +#: core/validators.py:375 #, python-format msgid "" "Ensure this value has at most %(limit_value)d character (it has " @@ -474,21 +475,21 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:359 +#: core/validators.py:395 #, 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] "" -#: core/validators.py:364 +#: core/validators.py:400 #, 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] "" -#: core/validators.py:369 +#: core/validators.py:405 #, python-format msgid "" "Ensure that there are no more than %(max)s digit before the decimal point." @@ -497,308 +498,312 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:464 +#: core/validators.py:459 #, python-format msgid "" "File extension '%(extension)s' is not allowed. Allowed extensions are: " "'%(allowed_extensions)s'." msgstr "" -#: db/models/base.py:1205 forms/models.py:732 +#: core/validators.py:512 +msgid "Null characters are not allowed." +msgstr "" + +#: db/models/base.py:1119 forms/models.py:753 msgid "and" msgstr "" -#: db/models/base.py:1097 +#: db/models/base.py:1121 #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." msgstr "" -#: db/models/fields/__init__.py:110 +#: db/models/fields/__init__.py:105 #, python-format msgid "Value %(value)r is not a valid choice." msgstr "" -#: db/models/fields/__init__.py:111 +#: db/models/fields/__init__.py:106 msgid "This field cannot be null." msgstr "" -#: db/models/fields/__init__.py:112 +#: db/models/fields/__init__.py:107 msgid "This field cannot be blank." msgstr "" -#: db/models/fields/__init__.py:113 +#: db/models/fields/__init__.py:108 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "" #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. #. Eg: "Title must be unique for pub_date year" -#: db/models/fields/__init__.py:117 +#: db/models/fields/__init__.py:112 #, python-format msgid "" "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." msgstr "" -#: db/models/fields/__init__.py:134 +#: db/models/fields/__init__.py:129 #, python-format msgid "Field of type: %(field_type)s" msgstr "" -#: db/models/fields/__init__.py:930 db/models/fields/__init__.py:1834 +#: db/models/fields/__init__.py:882 db/models/fields/__init__.py:1782 msgid "Integer" msgstr "" -#: db/models/fields/__init__.py:934 db/models/fields/__init__.py:1832 +#: db/models/fields/__init__.py:886 db/models/fields/__init__.py:1780 #, python-format msgid "'%(value)s' value must be an integer." msgstr "" -#: db/models/fields/__init__.py:960 db/models/fields/__init__.py:1849 +#: db/models/fields/__init__.py:959 db/models/fields/__init__.py:1851 msgid "Big (8 byte) integer" msgstr "" -#: db/models/fields/__init__.py:972 +#: db/models/fields/__init__.py:971 #, python-format msgid "'%(value)s' value must be either True or False." msgstr "" -#: db/models/fields/__init__.py:1011 +#: db/models/fields/__init__.py:973 msgid "Boolean (Either True or False)" msgstr "" -#: db/models/fields/__init__.py:1086 +#: db/models/fields/__init__.py:1039 #, python-format msgid "String (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:1142 +#: db/models/fields/__init__.py:1102 msgid "Comma-separated integers" msgstr "" -#: db/models/fields/__init__.py:1191 +#: db/models/fields/__init__.py:1150 #, python-format msgid "" "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" -#: db/models/fields/__init__.py:1193 db/models/fields/__init__.py:1336 +#: db/models/fields/__init__.py:1152 db/models/fields/__init__.py:1294 #, 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:1196 +#: db/models/fields/__init__.py:1155 msgid "Date (without time)" msgstr "" -#: db/models/fields/__init__.py:1334 +#: db/models/fields/__init__.py:1292 #, python-format msgid "" "'%(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:1338 +#: db/models/fields/__init__.py:1296 #, python-format msgid "" "'%(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:1342 +#: db/models/fields/__init__.py:1300 msgid "Date (with time)" msgstr "" -#: db/models/fields/__init__.py:1494 +#: db/models/fields/__init__.py:1447 #, python-format msgid "'%(value)s' value must be a decimal number." msgstr "" -#: db/models/fields/__init__.py:1496 +#: db/models/fields/__init__.py:1449 msgid "Decimal number" msgstr "" -#: db/models/fields/__init__.py:1653 +#: db/models/fields/__init__.py:1601 #, python-format msgid "" "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[." "uuuuuu] format." msgstr "" -#: db/models/fields/__init__.py:1656 +#: db/models/fields/__init__.py:1604 msgid "Duration" msgstr "" -#: db/models/fields/__init__.py:1707 +#: db/models/fields/__init__.py:1656 msgid "Email address" msgstr "" -#: db/models/fields/__init__.py:1731 +#: db/models/fields/__init__.py:1680 msgid "File path" msgstr "" -#: db/models/fields/__init__.py:1798 +#: db/models/fields/__init__.py:1746 #, python-format msgid "'%(value)s' value must be a float." msgstr "" -#: db/models/fields/__init__.py:1800 +#: db/models/fields/__init__.py:1748 msgid "Floating point number" msgstr "" -#: db/models/fields/__init__.py:1864 +#: db/models/fields/__init__.py:1866 msgid "IPv4 address" msgstr "" -#: db/models/fields/__init__.py:1947 +#: db/models/fields/__init__.py:1897 msgid "IP address" msgstr "" -#: db/models/fields/__init__.py:2031 +#: db/models/fields/__init__.py:1978 #, python-format msgid "'%(value)s' value must be either None, True or False." msgstr "" -#: db/models/fields/__init__.py:2033 +#: db/models/fields/__init__.py:1980 msgid "Boolean (Either True, False or None)" msgstr "" -#: db/models/fields/__init__.py:2093 +#: db/models/fields/__init__.py:2043 msgid "Positive integer" msgstr "" -#: db/models/fields/__init__.py:2105 +#: db/models/fields/__init__.py:2055 msgid "Positive small integer" msgstr "" -#: db/models/fields/__init__.py:2118 +#: db/models/fields/__init__.py:2068 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:2152 +#: db/models/fields/__init__.py:2098 msgid "Small integer" msgstr "" -#: db/models/fields/__init__.py:2159 +#: db/models/fields/__init__.py:2105 msgid "Text" msgstr "" -#: db/models/fields/__init__.py:2185 +#: db/models/fields/__init__.py:2133 #, python-format msgid "" "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" -#: db/models/fields/__init__.py:2187 +#: db/models/fields/__init__.py:2135 #, python-format msgid "" "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" -#: db/models/fields/__init__.py:2190 +#: db/models/fields/__init__.py:2138 msgid "Time" msgstr "" -#: db/models/fields/__init__.py:2318 +#: db/models/fields/__init__.py:2263 msgid "URL" msgstr "" -#: db/models/fields/__init__.py:2341 +#: db/models/fields/__init__.py:2286 msgid "Raw binary data" msgstr "" -#: db/models/fields/__init__.py:2385 +#: db/models/fields/__init__.py:2333 #, python-format msgid "'%(value)s' is not a valid UUID." msgstr "" -#: db/models/fields/files.py:237 +#: db/models/fields/files.py:221 msgid "File" msgstr "" -#: db/models/fields/files.py:392 +#: db/models/fields/files.py:359 msgid "Image" msgstr "" -#: db/models/fields/related.py:723 +#: db/models/fields/related.py:780 #, python-format msgid "%(model)s instance with %(field)s %(value)r does not exist." msgstr "" -#: db/models/fields/related.py:725 +#: db/models/fields/related.py:782 msgid "Foreign Key (type determined by related field)" msgstr "" -#: db/models/fields/related.py:983 +#: db/models/fields/related.py:1001 msgid "One-to-one relationship" msgstr "" -#: db/models/fields/related.py:1049 +#: db/models/fields/related.py:1051 #, python-format msgid "%(from)s-%(to)s relationship" msgstr "" -#: db/models/fields/related.py:1050 +#: db/models/fields/related.py:1052 #, python-format msgid "%(from)s-%(to)s relationships" msgstr "" -#: db/models/fields/related.py:1092 +#: db/models/fields/related.py:1094 msgid "Many-to-many relationship" msgstr "" #. Translators: If found as last label character, these punctuation #. characters will prevent the default label_suffix to be appended to the label -#: forms/boundfield.py:167 +#: forms/boundfield.py:171 msgid ":?.!" msgstr "" -#: forms/fields.py:65 +#: forms/fields.py:53 msgid "This field is required." msgstr "" -#: forms/fields.py:254 +#: forms/fields.py:245 msgid "Enter a whole number." msgstr "" -#: forms/fields.py:299 forms/fields.py:336 +#: forms/fields.py:290 forms/fields.py:325 msgid "Enter a number." msgstr "" -#: forms/fields.py:414 forms/fields.py:1158 +#: forms/fields.py:396 forms/fields.py:1114 msgid "Enter a valid date." msgstr "" -#: forms/fields.py:438 forms/fields.py:1159 +#: forms/fields.py:420 forms/fields.py:1115 msgid "Enter a valid time." msgstr "" -#: forms/fields.py:460 +#: forms/fields.py:442 msgid "Enter a valid date/time." msgstr "" -#: forms/fields.py:489 +#: forms/fields.py:471 msgid "Enter a valid duration." msgstr "" -#: forms/fields.py:556 +#: forms/fields.py:525 msgid "No file was submitted. Check the encoding type on the form." msgstr "" -#: forms/fields.py:557 +#: forms/fields.py:526 msgid "No file was submitted." msgstr "" -#: forms/fields.py:558 +#: forms/fields.py:527 msgid "The submitted file is empty." msgstr "" -#: forms/fields.py:560 +#: forms/fields.py:529 #, python-format msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." msgid_plural "" @@ -806,191 +811,191 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: forms/fields.py:563 +#: forms/fields.py:532 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" -#: forms/fields.py:625 +#: forms/fields.py:597 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -#: forms/fields.py:792 forms/fields.py:886 forms/models.py:1230 +#: forms/fields.py:753 forms/fields.py:843 forms/models.py:1267 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" -#: forms/fields.py:887 forms/fields.py:1002 forms/models.py:1229 +#: forms/fields.py:844 forms/fields.py:959 forms/models.py:1266 msgid "Enter a list of values." msgstr "" -#: forms/fields.py:1003 +#: forms/fields.py:960 msgid "Enter a complete value." msgstr "" -#: forms/fields.py:1217 +#: forms/fields.py:1173 msgid "Enter a valid UUID." msgstr "" #. Translators: This is the default suffix added to form field labels -#: forms/forms.py:84 +#: forms/forms.py:86 msgid ":" msgstr "" -#: forms/forms.py:191 +#: forms/forms.py:207 #, python-format msgid "(Hidden field %(name)s) %(error)s" msgstr "" -#: forms/formsets.py:97 +#: forms/formsets.py:91 msgid "ManagementForm data is missing or has been tampered with" msgstr "" -#: forms/formsets.py:345 +#: forms/formsets.py:338 #, python-format msgid "Please submit %d or fewer forms." msgid_plural "Please submit %d or fewer forms." msgstr[0] "" msgstr[1] "" -#: forms/formsets.py:352 +#: forms/formsets.py:345 #, python-format msgid "Please submit %d or more forms." msgid_plural "Please submit %d or more forms." msgstr[0] "" msgstr[1] "" -#: forms/formsets.py:380 forms/formsets.py:382 +#: forms/formsets.py:371 forms/formsets.py:373 msgid "Order" msgstr "" -#: forms/formsets.py:384 +#: forms/formsets.py:375 msgid "Delete" msgstr "" -#: forms/models.py:721 +#: forms/models.py:748 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "" -#: forms/models.py:725 +#: forms/models.py:752 #, python-format msgid "Please correct the duplicate data for %(field)s, which must be unique." msgstr "" -#: forms/models.py:731 +#: forms/models.py:758 #, 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:739 +#: forms/models.py:767 msgid "Please correct the duplicate values below." msgstr "" -#: forms/models.py:1063 -msgid "The inline foreign key did not match the parent instance primary key." +#: forms/models.py:1094 +msgid "The inline value did not match the parent instance." msgstr "" -#: forms/models.py:1123 +#: forms/models.py:1155 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" -#: forms/models.py:1232 +#: forms/models.py:1269 #, python-format -msgid "\"%(pk)s\" is not a valid value for a primary key." +msgid "\"%(pk)s\" is not a valid value." msgstr "" -#: forms/utils.py:172 +#: forms/utils.py:162 #, 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:378 +#: forms/widgets.py:391 msgid "Clear" msgstr "" -#: forms/widgets.py:379 +#: forms/widgets.py:392 msgid "Currently" msgstr "" -#: forms/widgets.py:380 +#: forms/widgets.py:393 msgid "Change" msgstr "" -#: forms/widgets.py:570 +#: forms/widgets.py:706 msgid "Unknown" msgstr "" -#: forms/widgets.py:571 +#: forms/widgets.py:707 msgid "Yes" msgstr "" -#: forms/widgets.py:572 +#: forms/widgets.py:708 msgid "No" msgstr "" -#: template/defaultfilters.py:867 +#: template/defaultfilters.py:782 msgid "yes,no,maybe" msgstr "" -#: template/defaultfilters.py:896 template/defaultfilters.py:908 +#: template/defaultfilters.py:811 template/defaultfilters.py:828 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "" msgstr[1] "" -#: template/defaultfilters.py:910 +#: template/defaultfilters.py:830 #, python-format msgid "%s KB" msgstr "" -#: template/defaultfilters.py:912 +#: template/defaultfilters.py:832 #, python-format msgid "%s MB" msgstr "" -#: template/defaultfilters.py:914 +#: template/defaultfilters.py:834 #, python-format msgid "%s GB" msgstr "" -#: template/defaultfilters.py:916 +#: template/defaultfilters.py:836 #, python-format msgid "%s TB" msgstr "" -#: template/defaultfilters.py:918 +#: template/defaultfilters.py:838 #, python-format msgid "%s PB" msgstr "" -#: utils/dateformat.py:61 +#: utils/dateformat.py:62 msgid "p.m." msgstr "" -#: utils/dateformat.py:62 +#: utils/dateformat.py:63 msgid "a.m." msgstr "" -#: utils/dateformat.py:67 +#: utils/dateformat.py:68 msgid "PM" msgstr "" -#: utils/dateformat.py:68 +#: utils/dateformat.py:69 msgid "AM" msgstr "" -#: utils/dateformat.py:151 +#: utils/dateformat.py:150 msgid "midnight" msgstr "" -#: utils/dateformat.py:153 +#: utils/dateformat.py:152 msgid "noon" msgstr "" @@ -1266,80 +1271,80 @@ msgctxt "alt. month" msgid "December" msgstr "" -#: utils/ipv6.py:10 +#: utils/ipv6.py:8 msgid "This is not a valid IPv6 address." msgstr "" -#: utils/text.py:77 +#: utils/text.py:70 #, python-format msgctxt "String to return when truncating text" msgid "%(truncated_text)s..." msgstr "" -#: utils/text.py:246 +#: utils/text.py:237 msgid "or" msgstr "" #. Translators: This string is used as a separator between list elements -#: utils/text.py:265 utils/timesince.py:63 +#: utils/text.py:256 utils/timesince.py:69 msgid ", " msgstr "" -#: utils/timesince.py:11 +#: utils/timesince.py:9 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:12 +#: utils/timesince.py:10 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:13 +#: utils/timesince.py:11 #, python-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:14 +#: utils/timesince.py:12 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:15 +#: utils/timesince.py:13 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:16 +#: utils/timesince.py:14 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: utils/timesince.py:52 +#: utils/timesince.py:58 msgid "0 minutes" msgstr "" -#: views/csrf.py:107 +#: views/csrf.py:110 msgid "Forbidden" msgstr "" -#: views/csrf.py:108 +#: views/csrf.py:111 msgid "CSRF verification failed. Request aborted." msgstr "" -#: views/csrf.py:112 +#: views/csrf.py:115 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 " @@ -1347,116 +1352,153 @@ msgid "" "hijacked by third parties." msgstr "" -#: views/csrf.py:117 +#: views/csrf.py:120 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:122 +#: views/csrf.py:124 +msgid "" +"If you are using the tag or " +"including the 'Referrer-Policy: no-referrer' header, please remove them. The " +"CSRF protection requires the 'Referer' header to do strict referer checking. " +"If you're concerned about privacy, use alternatives like for links to third-party sites." +msgstr "" + +#: views/csrf.py:132 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:127 +#: views/csrf.py:137 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:132 +#: views/csrf.py:142 msgid "More information is available with DEBUG=True." msgstr "" -#: views/debug.py:508 -msgid "Welcome to Django" -msgstr "" - -#: views/debug.py:509 -msgid "It worked!" -msgstr "" - -#: views/debug.py:510 -msgid "Congratulations on your first Django-powered page." -msgstr "" - -#: views/debug.py:511 -msgid "" -"Next, start your first app by running python manage.py startapp " -"[app_label]." -msgstr "" - -#: views/debug.py:513 -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:48 +#: views/generic/dates.py:41 msgid "No year specified" msgstr "" -#: views/generic/dates.py:104 +#: views/generic/dates.py:61 views/generic/dates.py:111 +#: views/generic/dates.py:208 +msgid "Date out of range" +msgstr "" + +#: views/generic/dates.py:90 msgid "No month specified" msgstr "" -#: views/generic/dates.py:163 +#: views/generic/dates.py:142 msgid "No day specified" msgstr "" -#: views/generic/dates.py:219 +#: views/generic/dates.py:188 msgid "No week specified" msgstr "" -#: views/generic/dates.py:378 views/generic/dates.py:406 +#: views/generic/dates.py:338 views/generic/dates.py:367 #, python-format msgid "No %(verbose_name_plural)s available" msgstr "" -#: views/generic/dates.py:660 +#: views/generic/dates.py:585 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." "allow_future is False." msgstr "" -#: views/generic/dates.py:694 +#: views/generic/dates.py:619 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "" -#: views/generic/detail.py:55 +#: views/generic/detail.py:53 #, python-format msgid "No %(verbose_name)s found matching the query" msgstr "" -#: views/generic/list.py:76 +#: views/generic/list.py:67 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" -#: views/generic/list.py:81 +#: views/generic/list.py:72 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "" -#: views/generic/list.py:172 +#: views/generic/list.py:154 #, python-format msgid "Empty list and '%(class_name)s.allow_empty' is False." msgstr "" -#: views/static.py:58 +#: views/static.py:41 msgid "Directory indexes are not allowed here." msgstr "" -#: views/static.py:60 +#: views/static.py:43 #, python-format msgid "\"%(path)s\" does not exist" msgstr "" -#: views/static.py:100 +#: views/static.py:83 #, python-format msgid "Index of %(directory)s" msgstr "" + +#: views/templates/default_urlconf.html:6 +msgid "Django: the Web framework for perfectionists with deadlines." +msgstr "" + +#: views/templates/default_urlconf.html:370 +#, python-format +msgid "" +"View release notes for Django %(version)s" +msgstr "" + +#: views/templates/default_urlconf.html:392 +msgid "The install worked successfully! Congratulations!" +msgstr "" + +#: views/templates/default_urlconf.html:393 +#, python-format +msgid "" +"You are seeing this page because DEBUG=True is in your settings file and have not configured any URLs." +msgstr "" + +#: views/templates/default_urlconf.html:407 +msgid "Django Documentation" +msgstr "" + +#: views/templates/default_urlconf.html:408 +msgid "Topics, references, & how-to's" +msgstr "" + +#: views/templates/default_urlconf.html:417 +msgid "Tutorial: A Polling App" +msgstr "" + +#: views/templates/default_urlconf.html:418 +msgid "Get started with Django" +msgstr "" + +#: views/templates/default_urlconf.html:427 +msgid "Django Community" +msgstr "" + +#: views/templates/default_urlconf.html:428 +msgid "Connect, get help, or contribute" +msgstr "" diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po index cf037cdf596..e9488acd6c0 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: 2016-05-17 23:12+0200\n" +"POT-Creation-Date: 2017-09-24 13:46+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -81,8 +81,7 @@ msgstr "" #: contrib/auth/forms.py:103 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." +"password, but you can change the password using this form." msgstr "" #: contrib/auth/forms.py:133