From 5495ea3ae0a64f61ae15f44970ea91ed7ce17a38 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sun, 8 Sep 2019 17:35:32 +0200 Subject: [PATCH] Updated translation catalogs --- django/conf/locale/en/LC_MESSAGES/django.po | 310 +++++++++--------- .../admin/locale/en/LC_MESSAGES/django.po | 191 ++++++----- .../admindocs/locale/en/LC_MESSAGES/django.po | 44 +-- .../auth/locale/en/LC_MESSAGES/django.po | 184 +++++------ .../locale/en/LC_MESSAGES/django.po | 20 +- .../flatpages/locale/en/LC_MESSAGES/django.po | 10 +- .../gis/locale/en/LC_MESSAGES/django.po | 42 +-- .../postgres/locale/en/LC_MESSAGES/django.po | 24 +- .../redirects/locale/en/LC_MESSAGES/django.po | 22 +- 9 files changed, 428 insertions(+), 419 deletions(-) diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 2c52175822..074432bc2e 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: 2019-01-16 20:42+0100\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -402,66 +402,66 @@ msgstr "" msgid "That page contains no results" msgstr "" -#: core/validators.py:31 +#: core/validators.py:32 msgid "Enter a valid value." msgstr "" -#: core/validators.py:102 forms/fields.py:658 +#: core/validators.py:103 forms/fields.py:658 msgid "Enter a valid URL." msgstr "" -#: core/validators.py:154 +#: core/validators.py:155 msgid "Enter a valid integer." msgstr "" -#: core/validators.py:165 +#: core/validators.py:166 msgid "Enter a valid email address." msgstr "" #. Translators: "letters" means latin letters: a-z and A-Z. -#: core/validators.py:239 +#: core/validators.py:240 msgid "" -"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens." msgstr "" -#: core/validators.py:246 +#: core/validators.py:247 msgid "" -"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or " +"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or " "hyphens." msgstr "" -#: core/validators.py:255 core/validators.py:275 +#: core/validators.py:256 core/validators.py:276 msgid "Enter a valid IPv4 address." msgstr "" -#: core/validators.py:260 core/validators.py:276 +#: core/validators.py:261 core/validators.py:277 msgid "Enter a valid IPv6 address." msgstr "" -#: core/validators.py:270 core/validators.py:274 +#: core/validators.py:271 core/validators.py:275 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: core/validators.py:304 +#: core/validators.py:305 msgid "Enter only digits separated by commas." msgstr "" -#: core/validators.py:310 +#: core/validators.py:311 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" -#: core/validators.py:342 +#: core/validators.py:343 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:351 +#: core/validators.py:352 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:361 +#: core/validators.py:362 #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -472,7 +472,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:376 +#: core/validators.py:377 #, python-format msgid "" "Ensure this value has at most %(limit_value)d character (it has " @@ -483,25 +483,25 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:395 forms/fields.py:290 forms/fields.py:325 +#: core/validators.py:396 forms/fields.py:290 forms/fields.py:325 msgid "Enter a number." msgstr "" -#: core/validators.py:397 +#: core/validators.py:398 #, 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:402 +#: core/validators.py:403 #, 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:407 +#: core/validators.py:408 #, python-format msgid "" "Ensure that there are no more than %(max)s digit before the decimal point." @@ -510,22 +510,22 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/validators.py:469 +#: core/validators.py:470 #, python-format msgid "" -"File extension '%(extension)s' is not allowed. Allowed extensions are: " -"'%(allowed_extensions)s'." +"File extension “%(extension)s” is not allowed. Allowed extensions are: " +"%(allowed_extensions)s." msgstr "" -#: core/validators.py:521 +#: core/validators.py:522 msgid "Null characters are not allowed." msgstr "" -#: db/models/base.py:1156 forms/models.py:756 +#: db/models/base.py:1172 forms/models.py:759 msgid "and" msgstr "" -#: db/models/base.py:1158 +#: db/models/base.py:1174 #, python-format msgid "%(model_name)s with this %(field_labels)s already exists." msgstr "" @@ -556,190 +556,190 @@ msgid "" "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." msgstr "" -#: db/models/fields/__init__.py:128 +#: db/models/fields/__init__.py:130 #, python-format msgid "Field of type: %(field_type)s" msgstr "" -#: db/models/fields/__init__.py:899 db/models/fields/__init__.py:1766 -msgid "Integer" -msgstr "" - -#: db/models/fields/__init__.py:903 db/models/fields/__init__.py:1764 +#: db/models/fields/__init__.py:904 #, python-format -msgid "'%(value)s' value must be an integer." +msgid "“%(value)s” value must be either True or False." msgstr "" -#: db/models/fields/__init__.py:978 db/models/fields/__init__.py:1832 -msgid "Big (8 byte) integer" -msgstr "" - -#: db/models/fields/__init__.py:990 +#: db/models/fields/__init__.py:905 #, python-format -msgid "'%(value)s' value must be either True or False." +msgid "“%(value)s” value must be either True, False, or None." msgstr "" -#: db/models/fields/__init__.py:991 -#, python-format -msgid "'%(value)s' value must be either True, False, or None." -msgstr "" - -#: db/models/fields/__init__.py:993 +#: db/models/fields/__init__.py:907 msgid "Boolean (Either True or False)" msgstr "" -#: db/models/fields/__init__.py:1034 +#: db/models/fields/__init__.py:948 #, python-format msgid "String (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1012 msgid "Comma-separated integers" msgstr "" -#: db/models/fields/__init__.py:1147 +#: db/models/fields/__init__.py:1061 #, python-format msgid "" -"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " +"“%(value)s” value has an invalid date format. It must be in YYYY-MM-DD " "format." msgstr "" -#: db/models/fields/__init__.py:1149 db/models/fields/__init__.py:1292 +#: db/models/fields/__init__.py:1063 db/models/fields/__init__.py:1206 #, python-format msgid "" -"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid " +"“%(value)s” value has the correct format (YYYY-MM-DD) but it is an invalid " "date." msgstr "" -#: db/models/fields/__init__.py:1152 +#: db/models/fields/__init__.py:1066 msgid "Date (without time)" msgstr "" -#: db/models/fields/__init__.py:1290 +#: db/models/fields/__init__.py:1204 #, python-format msgid "" -"'%(value)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:1294 +#: db/models/fields/__init__.py:1208 #, python-format msgid "" -"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"“%(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:1298 +#: db/models/fields/__init__.py:1212 msgid "Date (with time)" msgstr "" -#: db/models/fields/__init__.py:1446 +#: db/models/fields/__init__.py:1360 #, python-format -msgid "'%(value)s' value must be a decimal number." +msgid "“%(value)s” value must be a decimal number." msgstr "" -#: db/models/fields/__init__.py:1448 +#: db/models/fields/__init__.py:1362 msgid "Decimal number" msgstr "" -#: db/models/fields/__init__.py:1587 +#: db/models/fields/__init__.py:1501 #, python-format msgid "" -"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[." +"“%(value)s” value has an invalid format. It must be in [DD] [[HH:]MM:]ss[." "uuuuuu] format." msgstr "" -#: db/models/fields/__init__.py:1590 +#: db/models/fields/__init__.py:1504 msgid "Duration" msgstr "" -#: db/models/fields/__init__.py:1640 +#: db/models/fields/__init__.py:1554 msgid "Email address" msgstr "" -#: db/models/fields/__init__.py:1663 +#: db/models/fields/__init__.py:1577 msgid "File path" msgstr "" -#: db/models/fields/__init__.py:1729 +#: db/models/fields/__init__.py:1643 #, python-format -msgid "'%(value)s' value must be a float." +msgid "“%(value)s” value must be a float." msgstr "" -#: db/models/fields/__init__.py:1731 +#: db/models/fields/__init__.py:1645 msgid "Floating point number" msgstr "" -#: db/models/fields/__init__.py:1848 +#: db/models/fields/__init__.py:1683 +#, python-format +msgid "“%(value)s” value must be an integer." +msgstr "" + +#: db/models/fields/__init__.py:1685 +msgid "Integer" +msgstr "" + +#: db/models/fields/__init__.py:1768 +msgid "Big (8 byte) integer" +msgstr "" + +#: db/models/fields/__init__.py:1784 msgid "IPv4 address" msgstr "" -#: db/models/fields/__init__.py:1879 +#: db/models/fields/__init__.py:1815 msgid "IP address" msgstr "" -#: db/models/fields/__init__.py:1959 db/models/fields/__init__.py:1960 +#: db/models/fields/__init__.py:1895 db/models/fields/__init__.py:1896 #, python-format -msgid "'%(value)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:1962 +#: db/models/fields/__init__.py:1898 msgid "Boolean (Either True, False or None)" msgstr "" -#: db/models/fields/__init__.py:1997 +#: db/models/fields/__init__.py:1933 msgid "Positive integer" msgstr "" -#: db/models/fields/__init__.py:2010 +#: db/models/fields/__init__.py:1946 msgid "Positive small integer" msgstr "" -#: db/models/fields/__init__.py:2024 +#: db/models/fields/__init__.py:1960 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:2056 +#: db/models/fields/__init__.py:1992 msgid "Small integer" msgstr "" -#: db/models/fields/__init__.py:2063 +#: db/models/fields/__init__.py:1999 msgid "Text" msgstr "" -#: db/models/fields/__init__.py:2091 +#: db/models/fields/__init__.py:2027 #, python-format msgid "" -"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " +"“%(value)s” value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " "format." msgstr "" -#: db/models/fields/__init__.py:2093 +#: db/models/fields/__init__.py:2029 #, python-format msgid "" -"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " +"“%(value)s” value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " "invalid time." msgstr "" -#: db/models/fields/__init__.py:2096 +#: db/models/fields/__init__.py:2032 msgid "Time" msgstr "" -#: db/models/fields/__init__.py:2222 +#: db/models/fields/__init__.py:2158 msgid "URL" msgstr "" -#: db/models/fields/__init__.py:2244 +#: db/models/fields/__init__.py:2180 msgid "Raw binary data" msgstr "" -#: db/models/fields/__init__.py:2294 +#: db/models/fields/__init__.py:2245 #, python-format -msgid "'%(value)s' is not a valid UUID." +msgid "“%(value)s” is not a valid UUID." msgstr "" -#: db/models/fields/__init__.py:2296 +#: db/models/fields/__init__.py:2247 msgid "Universally unique identifier" msgstr "" @@ -760,27 +760,27 @@ msgstr "" msgid "Foreign Key (type determined by related field)" msgstr "" -#: db/models/fields/related.py:1007 +#: db/models/fields/related.py:1012 msgid "One-to-one relationship" msgstr "" -#: db/models/fields/related.py:1057 +#: db/models/fields/related.py:1066 #, python-format msgid "%(from)s-%(to)s relationship" msgstr "" -#: db/models/fields/related.py:1058 +#: db/models/fields/related.py:1067 #, python-format msgid "%(from)s-%(to)s relationships" msgstr "" -#: db/models/fields/related.py:1100 +#: db/models/fields/related.py:1109 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:146 +#: forms/boundfield.py:149 msgid ":?.!" msgstr "" @@ -843,12 +843,12 @@ msgid "" "corrupted image." msgstr "" -#: forms/fields.py:762 forms/fields.py:852 forms/models.py:1270 +#: forms/fields.py:762 forms/fields.py:852 forms/models.py:1273 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" -#: forms/fields.py:853 forms/fields.py:968 forms/models.py:1269 +#: forms/fields.py:853 forms/fields.py:968 forms/models.py:1272 msgid "Enter a list of values." msgstr "" @@ -861,106 +861,118 @@ msgid "Enter a valid UUID." msgstr "" #. Translators: This is the default suffix added to form field labels -#: forms/forms.py:86 +#: forms/forms.py:81 msgid ":" msgstr "" -#: forms/forms.py:212 +#: forms/forms.py:207 #, python-format msgid "(Hidden field %(name)s) %(error)s" msgstr "" -#: forms/formsets.py:91 +#: forms/formsets.py:93 msgid "ManagementForm data is missing or has been tampered with" msgstr "" -#: forms/formsets.py:338 +#: forms/formsets.py:345 #, python-format msgid "Please submit %d or fewer forms." msgid_plural "Please submit %d or fewer forms." msgstr[0] "" msgstr[1] "" -#: forms/formsets.py:345 +#: forms/formsets.py:352 #, python-format msgid "Please submit %d or more forms." msgid_plural "Please submit %d or more forms." msgstr[0] "" msgstr[1] "" -#: forms/formsets.py:371 forms/formsets.py:373 +#: forms/formsets.py:379 forms/formsets.py:386 msgid "Order" msgstr "" -#: forms/formsets.py:375 +#: forms/formsets.py:391 msgid "Delete" msgstr "" -#: forms/models.py:751 +#: forms/models.py:754 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "" -#: forms/models.py:755 +#: forms/models.py:758 #, python-format msgid "Please correct the duplicate data for %(field)s, which must be unique." msgstr "" -#: forms/models.py:761 +#: forms/models.py:764 #, 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:770 +#: forms/models.py:773 msgid "Please correct the duplicate values below." msgstr "" -#: forms/models.py:1091 +#: forms/models.py:1094 msgid "The inline value did not match the parent instance." msgstr "" -#: forms/models.py:1158 +#: forms/models.py:1161 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" -#: forms/models.py:1272 +#: forms/models.py:1275 #, python-format -msgid "\"%(pk)s\" is not a valid value." +msgid "“%(pk)s” is not a valid value." msgstr "" #: forms/utils.py:162 #, python-format msgid "" -"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " +"%(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:383 +#: forms/widgets.py:395 msgid "Clear" msgstr "" -#: forms/widgets.py:384 +#: forms/widgets.py:396 msgid "Currently" msgstr "" -#: forms/widgets.py:385 +#: forms/widgets.py:397 msgid "Change" msgstr "" -#: forms/widgets.py:699 +#: forms/widgets.py:711 msgid "Unknown" msgstr "" -#: forms/widgets.py:700 +#: forms/widgets.py:712 msgid "Yes" msgstr "" -#: forms/widgets.py:701 +#: forms/widgets.py:713 msgid "No" msgstr "" +#: forms/widgets.py:985 +msgid "Year" +msgstr "" + +#: forms/widgets.py:998 +msgid "Month" +msgstr "" + +#: forms/widgets.py:1011 +msgid "Day" +msgstr "" + #: template/defaultfilters.py:788 msgid "yes,no,maybe" msgstr "" @@ -1297,18 +1309,18 @@ msgstr "" msgid "This is not a valid IPv6 address." msgstr "" -#: utils/text.py:67 +#: utils/text.py:69 #, python-format msgctxt "String to return when truncating text" msgid "%(truncated_text)s…" msgstr "" -#: utils/text.py:233 +#: utils/text.py:235 msgid "or" msgstr "" #. Translators: This string is used as a separator between list elements -#: utils/text.py:252 utils/timesince.py:83 +#: utils/text.py:254 utils/timesince.py:83 msgid ", " msgstr "" @@ -1368,26 +1380,26 @@ msgstr "" #: 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 " +"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/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." +"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: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." +"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 @@ -1400,7 +1412,7 @@ msgstr "" #: 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." +"them, at least for this site, or for “same-origin” requests." msgstr "" #: views/csrf.py:142 @@ -1442,7 +1454,7 @@ msgstr "" #: views/generic/dates.py:623 #, python-format -msgid "Invalid date string '%(datestr)s' given format '%(format)s'" +msgid "Invalid date string “%(datestr)s” given format “%(format)s”" msgstr "" #: views/generic/detail.py:54 @@ -1451,7 +1463,7 @@ msgid "No %(verbose_name)s found matching the query" msgstr "" #: views/generic/list.py:67 -msgid "Page is not 'last', nor can it be converted to an int." +msgid "Page is not “last”, nor can it be converted to an int." msgstr "" #: views/generic/list.py:72 @@ -1461,7 +1473,7 @@ msgstr "" #: views/generic/list.py:154 #, python-format -msgid "Empty list and '%(class_name)s.allow_empty' is False." +msgid "Empty list and “%(class_name)s.allow_empty” is False." msgstr "" #: views/static.py:40 @@ -1470,7 +1482,7 @@ msgstr "" #: views/static.py:42 #, python-format -msgid "\"%(path)s\" does not exist" +msgid "“%(path)s” does not exist" msgstr "" #: views/static.py:80 @@ -1478,22 +1490,22 @@ msgstr "" msgid "Index of %(directory)s" msgstr "" -#: views/templates/default_urlconf.html:6 +#: views/templates/default_urlconf.html:7 msgid "Django: the Web framework for perfectionists with deadlines." msgstr "" -#: views/templates/default_urlconf.html:345 +#: views/templates/default_urlconf.html:346 #, python-format msgid "" "View release notes for Django %(version)s" msgstr "" -#: views/templates/default_urlconf.html:367 +#: views/templates/default_urlconf.html:368 msgid "The install worked successfully! Congratulations!" msgstr "" -#: views/templates/default_urlconf.html:368 +#: views/templates/default_urlconf.html:369 #, python-format msgid "" "You are seeing this page because \n" @@ -19,12 +19,12 @@ msgstr "" msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: contrib/admin/actions.py:50 contrib/admin/options.py:1862 +#: contrib/admin/actions.py:50 contrib/admin/options.py:1855 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: contrib/admin/actions.py:52 contrib/admin/options.py:1864 +#: contrib/admin/actions.py:52 contrib/admin/options.py:1857 msgid "Are you sure?" msgstr "" @@ -37,49 +37,49 @@ msgstr "" msgid "Administration" msgstr "" -#: contrib/admin/filters.py:108 contrib/admin/filters.py:207 -#: contrib/admin/filters.py:242 contrib/admin/filters.py:276 -#: contrib/admin/filters.py:395 +#: contrib/admin/filters.py:108 contrib/admin/filters.py:213 +#: contrib/admin/filters.py:248 contrib/admin/filters.py:282 +#: contrib/admin/filters.py:401 msgid "All" msgstr "" -#: contrib/admin/filters.py:243 +#: contrib/admin/filters.py:249 msgid "Yes" msgstr "" -#: contrib/admin/filters.py:244 +#: contrib/admin/filters.py:250 msgid "No" msgstr "" -#: contrib/admin/filters.py:254 +#: contrib/admin/filters.py:260 msgid "Unknown" msgstr "" -#: contrib/admin/filters.py:324 +#: contrib/admin/filters.py:330 msgid "Any date" msgstr "" -#: contrib/admin/filters.py:325 +#: contrib/admin/filters.py:331 msgid "Today" msgstr "" -#: contrib/admin/filters.py:329 +#: contrib/admin/filters.py:335 msgid "Past 7 days" msgstr "" -#: contrib/admin/filters.py:333 +#: contrib/admin/filters.py:339 msgid "This month" msgstr "" -#: contrib/admin/filters.py:337 +#: contrib/admin/filters.py:343 msgid "This year" msgstr "" -#: contrib/admin/filters.py:345 +#: contrib/admin/filters.py:351 msgid "No date" msgstr "" -#: contrib/admin/filters.py:346 +#: contrib/admin/filters.py:352 msgid "Has date" msgstr "" @@ -94,12 +94,12 @@ msgstr "" msgid "Action:" msgstr "" -#: contrib/admin/helpers.py:307 +#: contrib/admin/helpers.py:312 #, python-format msgid "Add another %(verbose_name)s" msgstr "" -#: contrib/admin/helpers.py:310 +#: contrib/admin/helpers.py:315 msgid "Remove" msgstr "" @@ -158,17 +158,17 @@ msgstr "" #: contrib/admin/models.py:76 #, python-format -msgid "Added \"%(object)s\"." +msgid "Added “%(object)s”." msgstr "" #: contrib/admin/models.py:78 #, python-format -msgid "Changed \"%(object)s\" - %(changes)s" +msgid "Changed “%(object)s” — %(changes)s" msgstr "" #: contrib/admin/models.py:83 #, python-format -msgid "Deleted \"%(object)s.\"" +msgid "Deleted “%(object)s.”" msgstr "" #: contrib/admin/models.py:85 @@ -177,20 +177,20 @@ msgstr "" #: contrib/admin/models.py:111 #, python-brace-format -msgid "Added {name} \"{object}\"." +msgid "Added {name} “{object}”." msgstr "" #: contrib/admin/models.py:113 msgid "Added." msgstr "" -#: contrib/admin/models.py:117 contrib/admin/options.py:2093 +#: contrib/admin/models.py:117 contrib/admin/options.py:2081 msgid "and" msgstr "" #: contrib/admin/models.py:121 #, python-brace-format -msgid "Changed {fields} for {name} \"{object}\"." +msgid "Changed {fields} for {name} “{object}”." msgstr "" #: contrib/admin/models.py:125 @@ -200,158 +200,155 @@ msgstr "" #: contrib/admin/models.py:129 #, python-brace-format -msgid "Deleted {name} \"{object}\"." +msgid "Deleted {name} “{object}”." msgstr "" #: contrib/admin/models.py:132 msgid "No fields changed." msgstr "" -#: contrib/admin/options.py:204 contrib/admin/options.py:236 +#: contrib/admin/options.py:202 contrib/admin/options.py:234 msgid "None" msgstr "" -#: contrib/admin/options.py:274 -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +#: contrib/admin/options.py:272 +msgid "Hold down “Control”, or “Command” on a Mac, to select more than one." msgstr "" -#: contrib/admin/options.py:1212 contrib/admin/options.py:1236 +#: contrib/admin/options.py:1205 contrib/admin/options.py:1229 #, python-brace-format -msgid "The {name} \"{obj}\" was added successfully." +msgid "The {name} “{obj}” was added successfully." msgstr "" -#: contrib/admin/options.py:1214 +#: contrib/admin/options.py:1207 msgid "You may edit it again below." msgstr "" -#: contrib/admin/options.py:1226 +#: contrib/admin/options.py:1219 #, python-brace-format msgid "" -"The {name} \"{obj}\" was added successfully. You may add another {name} " +"The {name} “{obj}” was added successfully. You may add another {name} below." +msgstr "" + +#: contrib/admin/options.py:1269 +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may edit it again below." +msgstr "" + +#: contrib/admin/options.py:1279 +#, python-brace-format +msgid "The {name} “{obj}” was added successfully. You may edit it again below." +msgstr "" + +#: contrib/admin/options.py:1292 +#, python-brace-format +msgid "" +"The {name} “{obj}” was changed successfully. You may add another {name} " "below." msgstr "" -#: contrib/admin/options.py:1276 +#: contrib/admin/options.py:1304 #, python-brace-format -msgid "" -"The {name} \"{obj}\" was changed successfully. You may edit it again below." +msgid "The {name} “{obj}” was changed successfully." msgstr "" -#: contrib/admin/options.py:1286 -#, python-brace-format -msgid "" -"The {name} \"{obj}\" was added successfully. You may edit it again below." -msgstr "" - -#: contrib/admin/options.py:1299 -#, python-brace-format -msgid "" -"The {name} \"{obj}\" was changed successfully. You may add another {name} " -"below." -msgstr "" - -#: contrib/admin/options.py:1311 -#, python-brace-format -msgid "The {name} \"{obj}\" was changed successfully." -msgstr "" - -#: contrib/admin/options.py:1388 contrib/admin/options.py:1704 +#: contrib/admin/options.py:1381 contrib/admin/options.py:1697 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: contrib/admin/options.py:1407 +#: contrib/admin/options.py:1400 msgid "No action selected." msgstr "" -#: contrib/admin/options.py:1432 +#: contrib/admin/options.py:1425 #, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgid "The %(name)s “%(obj)s” was deleted successfully." msgstr "" -#: contrib/admin/options.py:1511 +#: contrib/admin/options.py:1504 #, python-format -msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?" +msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?" msgstr "" -#: contrib/admin/options.py:1599 +#: contrib/admin/options.py:1592 #, python-format msgid "Add %s" msgstr "" -#: contrib/admin/options.py:1601 +#: contrib/admin/options.py:1594 #, python-format msgid "Change %s" msgstr "" -#: contrib/admin/options.py:1603 +#: contrib/admin/options.py:1596 #, python-format msgid "View %s" msgstr "" -#: contrib/admin/options.py:1682 +#: contrib/admin/options.py:1675 msgid "Database error" msgstr "" -#: contrib/admin/options.py:1751 +#: contrib/admin/options.py:1744 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: contrib/admin/options.py:1782 +#: contrib/admin/options.py:1775 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: contrib/admin/options.py:1790 +#: contrib/admin/options.py:1783 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: contrib/admin/options.py:1907 +#: contrib/admin/options.py:1900 #, python-format msgid "Change history: %s" msgstr "" #. Translators: Model verbose name and instance representation, #. suitable to be an item in a list. -#: contrib/admin/options.py:2086 +#: contrib/admin/options.py:2074 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: contrib/admin/options.py:2095 +#: contrib/admin/options.py:2083 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: contrib/admin/sites.py:41 contrib/admin/templates/admin/base_site.html:3 +#: contrib/admin/sites.py:42 contrib/admin/templates/admin/base_site.html:3 msgid "Django site admin" msgstr "" -#: contrib/admin/sites.py:44 contrib/admin/templates/admin/base_site.html:6 +#: contrib/admin/sites.py:45 contrib/admin/templates/admin/base_site.html:6 msgid "Django administration" msgstr "" -#: contrib/admin/sites.py:47 +#: contrib/admin/sites.py:48 msgid "Site administration" msgstr "" -#: contrib/admin/sites.py:384 contrib/admin/templates/admin/login.html:61 +#: contrib/admin/sites.py:392 contrib/admin/templates/admin/login.html:61 #: contrib/admin/templates/registration/password_reset_complete.html:18 #: contrib/admin/tests.py:123 msgid "Log in" msgstr "" -#: contrib/admin/sites.py:513 +#: contrib/admin/sites.py:521 #, python-format msgid "%(app)s administration" msgstr "" @@ -362,7 +359,7 @@ msgid "Page not found" msgstr "" #: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." +msgid "We’re sorry, but the requested page could not be found." msgstr "" #: contrib/admin/templates/admin/500.html:6 @@ -399,7 +396,7 @@ msgstr "" #: contrib/admin/templates/admin/500.html:15 msgid "" -"There's been an error. It's been reported to the site administrators via " +"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 "" @@ -426,7 +423,7 @@ msgstr "" #: 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 " +"First, enter a username and password. Then, you’ll be able to edit more user " "options." msgstr "" @@ -552,7 +549,7 @@ msgstr "" #: contrib/admin/templates/admin/delete_confirmation.html:47 #: contrib/admin/templates/admin/delete_selected_confirmation.html:50 -msgid "Yes, I'm sure" +msgid "Yes, I’m sure" msgstr "" #: contrib/admin/templates/admin/delete_confirmation.html:48 @@ -616,7 +613,7 @@ msgid "Add" msgstr "" #: contrib/admin/templates/admin/index.html:51 -msgid "You don't have permission to view or edit anything." +msgid "You don’t have permission to view or edit anything." msgstr "" #: contrib/admin/templates/admin/index.html:59 @@ -637,7 +634,7 @@ msgstr "" #: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" -"Something's wrong with your database installation. Make sure the appropriate " +"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 "" @@ -667,7 +664,7 @@ msgstr "" #: contrib/admin/templates/admin/object_history.html:38 msgid "" -"This object doesn't have a change history. It probably wasn't added via this " +"This object doesn’t have a change history. It probably wasn’t added via this " "admin site." msgstr "" @@ -755,7 +752,7 @@ msgstr "" #: contrib/admin/templates/registration/password_change_form.html:26 msgid "" -"Please enter your old password, for security's sake, and then enter your new " +"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 "" @@ -800,13 +797,13 @@ msgstr "" #: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" -"We've emailed you instructions for setting your password, if an account " +"We’ve emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." msgstr "" #: 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 " +"If you don’t receive an email, please make sure you’ve entered the address " "you registered with, and check your spam folder." msgstr "" @@ -822,7 +819,7 @@ msgid "Please go to the following page and choose a new password:" msgstr "" #: contrib/admin/templates/registration/password_reset_email.html:8 -msgid "Your username, in case you've forgotten:" +msgid "Your username, in case you’ve forgotten:" msgstr "" #: contrib/admin/templates/registration/password_reset_email.html:10 @@ -836,7 +833,7 @@ msgstr "" #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "" -"Forgotten your password? Enter your email address below, and we'll email " +"Forgotten your password? Enter your email address below, and we’ll email " "instructions for setting a new one." msgstr "" @@ -848,41 +845,41 @@ msgstr "" msgid "Reset my password" msgstr "" -#: contrib/admin/templatetags/admin_list.py:409 +#: contrib/admin/templatetags/admin_list.py:412 msgid "All dates" msgstr "" -#: contrib/admin/views/main.py:84 +#: contrib/admin/views/main.py:100 #, python-format msgid "Select %s" msgstr "" -#: contrib/admin/views/main.py:86 +#: contrib/admin/views/main.py:102 #, python-format msgid "Select %s to change" msgstr "" -#: contrib/admin/views/main.py:88 +#: contrib/admin/views/main.py:104 #, python-format msgid "Select %s to view" msgstr "" -#: contrib/admin/widgets.py:91 +#: contrib/admin/widgets.py:92 msgid "Date:" msgstr "" -#: contrib/admin/widgets.py:92 +#: contrib/admin/widgets.py:93 msgid "Time:" msgstr "" -#: contrib/admin/widgets.py:154 +#: contrib/admin/widgets.py:155 msgid "Lookup" msgstr "" -#: contrib/admin/widgets.py:338 +#: contrib/admin/widgets.py:345 msgid "Currently:" msgstr "" -#: contrib/admin/widgets.py:339 +#: contrib/admin/widgets.py:346 msgid "Change:" msgstr "" diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po index d4cd33bed6..ebbbd3abd9 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: 2017-01-19 16:49+0100\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -198,20 +198,20 @@ msgstr "" #: contrib/admindocs/templates/admin_doc/template_detail.html:16 #, python-format -msgid "Template: \"%(name)s\"" +msgid "Template: %(name)s" msgstr "" #. Translators: Search is not a verb here, it qualifies path (a search path) #: contrib/admindocs/templates/admin_doc/template_detail.html:19 #, python-format -msgid "Search path for template \"%(name)s\":" +msgid "Search path for template %(name)s:" msgstr "" -#: contrib/admindocs/templates/admin_doc/template_detail.html:21 +#: contrib/admindocs/templates/admin_doc/template_detail.html:22 msgid "(does not exist)" msgstr "" -#: contrib/admindocs/templates/admin_doc/template_detail.html:25 +#: contrib/admindocs/templates/admin_doc/template_detail.html:26 msgid "Back to Documentation" msgstr "" @@ -301,59 +301,59 @@ msgid "" "code>.\n" msgstr "" -#: contrib/admindocs/views.py:78 contrib/admindocs/views.py:80 -#: contrib/admindocs/views.py:82 +#: contrib/admindocs/views.py:71 contrib/admindocs/views.py:72 +#: contrib/admindocs/views.py:74 msgid "tag:" msgstr "" -#: contrib/admindocs/views.py:109 contrib/admindocs/views.py:111 -#: contrib/admindocs/views.py:113 +#: contrib/admindocs/views.py:102 contrib/admindocs/views.py:103 +#: contrib/admindocs/views.py:105 msgid "filter:" msgstr "" -#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160 -#: contrib/admindocs/views.py:162 +#: contrib/admindocs/views.py:161 contrib/admindocs/views.py:162 +#: contrib/admindocs/views.py:164 msgid "view:" msgstr "" -#: contrib/admindocs/views.py:190 +#: contrib/admindocs/views.py:191 #, python-format msgid "App %(app_label)r not found" msgstr "" -#: contrib/admindocs/views.py:194 +#: contrib/admindocs/views.py:195 #, python-format msgid "Model %(model_name)r not found in app %(app_label)r" msgstr "" -#: contrib/admindocs/views.py:200 contrib/admindocs/views.py:202 -#: contrib/admindocs/views.py:217 contrib/admindocs/views.py:240 -#: contrib/admindocs/views.py:245 contrib/admindocs/views.py:260 -#: contrib/admindocs/views.py:295 contrib/admindocs/views.py:300 +#: contrib/admindocs/views.py:200 contrib/admindocs/views.py:201 +#: contrib/admindocs/views.py:216 contrib/admindocs/views.py:239 +#: contrib/admindocs/views.py:244 contrib/admindocs/views.py:259 +#: contrib/admindocs/views.py:300 contrib/admindocs/views.py:305 msgid "model:" msgstr "" -#: contrib/admindocs/views.py:213 +#: contrib/admindocs/views.py:212 #, python-format msgid "the related `%(app_label)s.%(data_type)s` object" msgstr "" -#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:287 +#: contrib/admindocs/views.py:232 contrib/admindocs/views.py:292 #, python-format msgid "related `%(app_label)s.%(object_name)s` objects" msgstr "" -#: contrib/admindocs/views.py:240 contrib/admindocs/views.py:295 +#: contrib/admindocs/views.py:239 contrib/admindocs/views.py:300 #, python-format msgid "all %s" msgstr "" -#: contrib/admindocs/views.py:245 contrib/admindocs/views.py:300 +#: contrib/admindocs/views.py:244 contrib/admindocs/views.py:305 #, python-format msgid "number of %s" msgstr "" -#: contrib/admindocs/views.py:388 +#: contrib/admindocs/views.py:398 #, 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 e9488acd6c..1522b3335c 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: 2017-09-24 13:46+0200\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -14,45 +14,45 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: contrib/auth/admin.py:49 +#: contrib/auth/admin.py:46 msgid "Personal info" msgstr "" -#: contrib/auth/admin.py:50 +#: contrib/auth/admin.py:47 msgid "Permissions" msgstr "" -#: contrib/auth/admin.py:52 +#: contrib/auth/admin.py:50 msgid "Important dates" msgstr "" -#: contrib/auth/admin.py:136 +#: contrib/auth/admin.py:134 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: contrib/auth/admin.py:146 +#: contrib/auth/admin.py:144 msgid "Password changed successfully." msgstr "" -#: contrib/auth/admin.py:165 +#: contrib/auth/admin.py:164 #, python-format msgid "Change password: %s" msgstr "" -#: contrib/auth/apps.py:12 +#: contrib/auth/apps.py:15 msgid "Authentication and Authorization" msgstr "" -#: contrib/auth/base_user.py:50 +#: contrib/auth/base_user.py:48 msgid "password" msgstr "" -#: contrib/auth/base_user.py:51 +#: contrib/auth/base_user.py:49 msgid "last login" msgstr "" -#: contrib/auth/forms.py:30 +#: contrib/auth/forms.py:31 msgid "No password set." msgstr "" @@ -60,223 +60,223 @@ msgstr "" msgid "Invalid password format or unknown hashing algorithm." msgstr "" -#: contrib/auth/forms.py:69 contrib/auth/forms.py:268 -#: contrib/auth/forms.py:332 -msgid "The two password fields didn't match." +#: contrib/auth/forms.py:78 contrib/auth/forms.py:316 contrib/auth/forms.py:389 +msgid "The two password fields didn’t match." msgstr "" -#: contrib/auth/forms.py:71 contrib/auth/forms.py:102 -#: contrib/auth/forms.py:130 contrib/auth/forms.py:336 +#: contrib/auth/forms.py:81 contrib/auth/forms.py:134 contrib/auth/forms.py:170 +#: contrib/auth/forms.py:393 msgid "Password" msgstr "" -#: contrib/auth/forms.py:73 +#: contrib/auth/forms.py:87 msgid "Password confirmation" msgstr "" -#: contrib/auth/forms.py:75 contrib/auth/forms.py:343 +#: contrib/auth/forms.py:90 contrib/auth/forms.py:402 msgid "Enter the same password as before, for verification." msgstr "" -#: contrib/auth/forms.py:103 +#: contrib/auth/forms.py:136 msgid "" -"Raw passwords are not stored, so there is no way to see this user's " +"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 "" -#: contrib/auth/forms.py:133 +#: contrib/auth/forms.py:177 #, python-format msgid "" "Please enter a correct %(username)s and password. Note that both fields may " "be case-sensitive." msgstr "" -#: contrib/auth/forms.py:135 +#: contrib/auth/forms.py:180 msgid "This account is inactive." msgstr "" -#: contrib/auth/forms.py:198 +#: contrib/auth/forms.py:241 msgid "Email" msgstr "" -#: contrib/auth/forms.py:270 +#: contrib/auth/forms.py:319 msgid "New password" msgstr "" -#: contrib/auth/forms.py:273 +#: contrib/auth/forms.py:325 msgid "New password confirmation" msgstr "" -#: contrib/auth/forms.py:306 +#: contrib/auth/forms.py:361 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: contrib/auth/forms.py:309 +#: contrib/auth/forms.py:364 msgid "Old password" msgstr "" -#: contrib/auth/forms.py:341 +#: contrib/auth/forms.py:399 msgid "Password (again)" msgstr "" -#: contrib/auth/hashers.py:251 contrib/auth/hashers.py:334 -#: contrib/auth/hashers.py:386 contrib/auth/hashers.py:414 -#: contrib/auth/hashers.py:447 contrib/auth/hashers.py:480 -#: contrib/auth/hashers.py:514 +#: contrib/auth/hashers.py:259 contrib/auth/hashers.py:333 +#: contrib/auth/hashers.py:429 contrib/auth/hashers.py:489 +#: contrib/auth/hashers.py:520 contrib/auth/hashers.py:556 +#: contrib/auth/hashers.py:592 contrib/auth/hashers.py:630 msgid "algorithm" msgstr "" -#: contrib/auth/hashers.py:252 +#: contrib/auth/hashers.py:260 msgid "iterations" msgstr "" -#: contrib/auth/hashers.py:253 contrib/auth/hashers.py:336 -#: contrib/auth/hashers.py:387 contrib/auth/hashers.py:415 -#: contrib/auth/hashers.py:515 +#: contrib/auth/hashers.py:261 contrib/auth/hashers.py:339 +#: contrib/auth/hashers.py:431 contrib/auth/hashers.py:490 +#: contrib/auth/hashers.py:521 contrib/auth/hashers.py:631 msgid "salt" msgstr "" -#: contrib/auth/hashers.py:254 contrib/auth/hashers.py:388 -#: contrib/auth/hashers.py:416 contrib/auth/hashers.py:448 -#: contrib/auth/hashers.py:481 contrib/auth/hashers.py:516 +#: contrib/auth/hashers.py:262 contrib/auth/hashers.py:340 +#: contrib/auth/hashers.py:491 contrib/auth/hashers.py:522 +#: contrib/auth/hashers.py:557 contrib/auth/hashers.py:593 +#: contrib/auth/hashers.py:632 msgid "hash" msgstr "" -#: contrib/auth/hashers.py:347 +#: contrib/auth/hashers.py:334 msgid "variety" msgstr "" -#: contrib/auth/hashers.py:348 +#: contrib/auth/hashers.py:335 msgid "version" msgstr "" -#: contrib/auth/hashers.py:349 +#: contrib/auth/hashers.py:336 msgid "memory cost" msgstr "" -#: contrib/auth/hashers.py:350 +#: contrib/auth/hashers.py:337 msgid "time cost" msgstr "" -#: contrib/auth/hashers.py:351 +#: contrib/auth/hashers.py:338 msgid "parallelism" msgstr "" -#: contrib/auth/hashers.py:445 +#: contrib/auth/hashers.py:430 msgid "work factor" msgstr "" -#: contrib/auth/hashers.py:337 +#: contrib/auth/hashers.py:432 msgid "checksum" msgstr "" -#: contrib/auth/models.py:61 contrib/auth/models.py:116 +#: contrib/auth/models.py:56 contrib/auth/models.py:108 msgid "name" msgstr "" -#: contrib/auth/models.py:65 +#: contrib/auth/models.py:60 msgid "content type" msgstr "" -#: contrib/auth/models.py:67 +#: contrib/auth/models.py:62 msgid "codename" msgstr "" -#: contrib/auth/models.py:71 +#: contrib/auth/models.py:67 msgid "permission" msgstr "" -#: contrib/auth/models.py:72 contrib/auth/models.py:119 +#: contrib/auth/models.py:68 contrib/auth/models.py:111 msgid "permissions" msgstr "" -#: contrib/auth/models.py:126 +#: contrib/auth/models.py:118 msgid "group" msgstr "" -#: contrib/auth/models.py:127 contrib/auth/models.py:222 +#: contrib/auth/models.py:119 contrib/auth/models.py:242 msgid "groups" msgstr "" -#: contrib/auth/models.py:213 +#: contrib/auth/models.py:233 msgid "superuser status" msgstr "" -#: contrib/auth/models.py:216 +#: contrib/auth/models.py:236 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: contrib/auth/models.py:225 +#: contrib/auth/models.py:245 msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of their groups." msgstr "" -#: contrib/auth/models.py:233 +#: contrib/auth/models.py:253 msgid "user permissions" msgstr "" -#: contrib/auth/models.py:235 +#: contrib/auth/models.py:255 msgid "Specific permissions for this user." msgstr "" -#: contrib/auth/models.py:305 +#: contrib/auth/models.py:326 msgid "username" msgstr "" -#: contrib/auth/models.py:313 +#: contrib/auth/models.py:329 msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" -#: contrib/auth/models.py:316 +#: contrib/auth/models.py:332 msgid "A user with that username already exists." msgstr "" -#: contrib/auth/models.py:320 +#: contrib/auth/models.py:335 msgid "first name" msgstr "" -#: contrib/auth/models.py:321 +#: contrib/auth/models.py:336 msgid "last name" msgstr "" -#: contrib/auth/models.py:322 +#: contrib/auth/models.py:337 msgid "email address" msgstr "" -#: contrib/auth/models.py:324 +#: contrib/auth/models.py:339 msgid "staff status" msgstr "" -#: contrib/auth/models.py:326 +#: contrib/auth/models.py:341 msgid "Designates whether the user can log into this admin site." msgstr "" -#: contrib/auth/models.py:329 +#: contrib/auth/models.py:344 msgid "active" msgstr "" -#: contrib/auth/models.py:332 +#: contrib/auth/models.py:347 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: contrib/auth/models.py:336 +#: contrib/auth/models.py:351 msgid "date joined" msgstr "" -#: contrib/auth/models.py:344 +#: contrib/auth/models.py:360 msgid "user" msgstr "" -#: contrib/auth/models.py:345 +#: contrib/auth/models.py:361 msgid "users" msgstr "" -#: contrib/auth/password_validation.py:101 +#: contrib/auth/password_validation.py:102 #, python-format msgid "" "This password is too short. It must contain at least %(min_length)d " @@ -287,36 +287,36 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: contrib/auth/password_validation.py:111 +#: contrib/auth/password_validation.py:112 #, python-format msgid "Your password must contain at least %(min_length)d character." msgid_plural "Your password must contain at least %(min_length)d characters." msgstr[0] "" msgstr[1] "" -#: contrib/auth/password_validation.py:147 +#: contrib/auth/password_validation.py:151 #, python-format msgid "The password is too similar to the %(verbose_name)s." msgstr "" -#: contrib/auth/password_validation.py:153 -msgid "Your password can't be too similar to your other personal information." +#: contrib/auth/password_validation.py:157 +msgid "Your password can’t be too similar to your other personal information." msgstr "" -#: contrib/auth/password_validation.py:180 +#: contrib/auth/password_validation.py:183 msgid "This password is too common." msgstr "" -#: contrib/auth/password_validation.py:185 -msgid "Your password can't be a commonly used password." +#: contrib/auth/password_validation.py:188 +msgid "Your password can’t be a commonly used password." msgstr "" -#: contrib/auth/password_validation.py:195 +#: contrib/auth/password_validation.py:198 msgid "This password is entirely numeric." msgstr "" -#: contrib/auth/password_validation.py:200 -msgid "Your password can't be entirely numeric." +#: contrib/auth/password_validation.py:203 +msgid "Your password can’t be entirely numeric." msgstr "" #: contrib/auth/templates/registration/password_reset_subject.txt:2 @@ -324,46 +324,46 @@ msgstr "" msgid "Password reset on %(site_name)s" msgstr "" -#: contrib/auth/validators.py:13 +#: contrib/auth/validators.py:12 msgid "" "Enter a valid username. This value may contain only English letters, " "numbers, and @/./+/-/_ characters." msgstr "" -#: contrib/auth/validators.py:23 +#: contrib/auth/validators.py:22 msgid "" "Enter a valid username. This value may contain only letters, numbers, and " "@/./+/-/_ characters." msgstr "" -#: contrib/auth/views.py:133 +#: contrib/auth/views.py:160 msgid "Logged out" msgstr "" -#: contrib/auth/views.py:211 +#: contrib/auth/views.py:217 msgid "Password reset" msgstr "" -#: contrib/auth/views.py:224 +#: contrib/auth/views.py:244 msgid "Password reset sent" msgstr "" -#: contrib/auth/views.py:261 +#: contrib/auth/views.py:254 msgid "Enter new password" msgstr "" -#: contrib/auth/views.py:272 +#: contrib/auth/views.py:314 msgid "Password reset unsuccessful" msgstr "" -#: contrib/auth/views.py:290 +#: contrib/auth/views.py:322 msgid "Password reset complete" msgstr "" -#: contrib/auth/views.py:325 +#: contrib/auth/views.py:334 msgid "Password change" msgstr "" -#: contrib/auth/views.py:339 +#: contrib/auth/views.py:357 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 7c42dd4eff..cee0237141 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: 2015-01-17 11:07+0100\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,33 +13,33 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/contenttypes/apps.py:12 +#: contrib/contenttypes/apps.py:16 msgid "Content Types" msgstr "" -#: contrib/contenttypes/models.py:160 +#: contrib/contenttypes/models.py:135 msgid "python model class name" msgstr "" -#: contrib/contenttypes/models.py:164 +#: contrib/contenttypes/models.py:139 msgid "content type" msgstr "" -#: contrib/contenttypes/models.py:165 +#: contrib/contenttypes/models.py:140 msgid "content types" msgstr "" -#: contrib/contenttypes/views.py:19 +#: contrib/contenttypes/views.py:18 #, python-format msgid "Content type %(ct_id)s object has no associated model" msgstr "" -#: contrib/contenttypes/views.py:23 +#: contrib/contenttypes/views.py:24 #, python-format -msgid "Content type %(ct_id)s object %(obj_id)s doesn't exist" +msgid "Content type %(ct_id)s object %(obj_id)s doesn’t exist" msgstr "" -#: contrib/contenttypes/views.py:29 +#: contrib/contenttypes/views.py:32 #, python-format -msgid "%(ct_name)s objects don't have a get_absolute_url() method" +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 3467bd63e3..8fe158ead1 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: 2019-01-16 20:42+0100\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -27,7 +27,7 @@ msgstr "" #: contrib/flatpages/forms.py:12 msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"Example: “/about/contact/”. Make sure to have leading and trailing slashes." msgstr "" #: contrib/flatpages/forms.py:15 @@ -37,7 +37,7 @@ msgid "" msgstr "" #: contrib/flatpages/forms.py:29 -msgid "Example: '/about/contact'. Make sure to have a leading slash." +msgid "Example: “/about/contact”. Make sure to have a leading slash." msgstr "" #: contrib/flatpages/forms.py:42 @@ -71,8 +71,8 @@ msgstr "" #: contrib/flatpages/models.py:18 msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Example: “flatpages/contact_page.html”. If this isn’t provided, the system " +"will use “flatpages/default.html”." msgstr "" #: contrib/flatpages/models.py:23 diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po index 060b2a2ac4..aed3a2f9dd 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: 2017-01-19 16:49+0100\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -17,71 +17,71 @@ msgstr "" msgid "GIS" msgstr "" -#: contrib/gis/db/models/fields.py:78 +#: contrib/gis/db/models/fields.py:64 msgid "The base GIS field." msgstr "" -#: contrib/gis/db/models/fields.py:165 +#: contrib/gis/db/models/fields.py:201 msgid "" -"The base Geometry field -- maps to the OpenGIS Specification Geometry type." +"The base Geometry field — maps to the OpenGIS Specification Geometry type." msgstr "" -#: contrib/gis/db/models/fields.py:352 +#: contrib/gis/db/models/fields.py:285 msgid "Point" msgstr "" -#: contrib/gis/db/models/fields.py:358 +#: contrib/gis/db/models/fields.py:292 msgid "Line string" msgstr "" -#: contrib/gis/db/models/fields.py:364 +#: contrib/gis/db/models/fields.py:299 msgid "Polygon" msgstr "" -#: contrib/gis/db/models/fields.py:370 +#: contrib/gis/db/models/fields.py:306 msgid "Multi-point" msgstr "" -#: contrib/gis/db/models/fields.py:376 +#: contrib/gis/db/models/fields.py:313 msgid "Multi-line string" msgstr "" -#: contrib/gis/db/models/fields.py:382 +#: contrib/gis/db/models/fields.py:320 msgid "Multi polygon" msgstr "" -#: contrib/gis/db/models/fields.py:388 +#: contrib/gis/db/models/fields.py:327 msgid "Geometry collection" msgstr "" -#: contrib/gis/db/models/fields.py:394 +#: contrib/gis/db/models/fields.py:333 msgid "Extent Aggregate Field" msgstr "" -#: contrib/gis/db/models/fields.py:405 +#: contrib/gis/db/models/fields.py:348 msgid "Raster Field" msgstr "" -#: contrib/gis/forms/fields.py:20 +#: contrib/gis/forms/fields.py:19 msgid "No geometry value provided." msgstr "" -#: contrib/gis/forms/fields.py:21 +#: contrib/gis/forms/fields.py:20 msgid "Invalid geometry value." msgstr "" -#: contrib/gis/forms/fields.py:22 +#: contrib/gis/forms/fields.py:21 msgid "Invalid geometry type." msgstr "" -#: contrib/gis/forms/fields.py:23 +#: contrib/gis/forms/fields.py:22 msgid "" "An error occurred when transforming the geometry to the SRID of the geometry " "form field." msgstr "" #: contrib/gis/templates/gis/admin/openlayers.html:35 -#: contrib/gis/templates/gis/openlayers.html:18 +#: contrib/gis/templates/gis/openlayers.html:12 msgid "Delete all Features" msgstr "" @@ -93,11 +93,11 @@ msgstr "" msgid "Debugging window (serialized value)" msgstr "" -#: contrib/gis/views.py:10 +#: contrib/gis/views.py:8 msgid "No feeds are registered." msgstr "" -#: contrib/gis/views.py:16 +#: contrib/gis/views.py:14 #, python-format -msgid "Slug %r isn't registered." +msgid "Slug %r isn’t registered." msgstr "" diff --git a/django/contrib/postgres/locale/en/LC_MESSAGES/django.po b/django/contrib/postgres/locale/en/LC_MESSAGES/django.po index af9b2fdd82..27b82e051b 100644 --- a/django/contrib/postgres/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/postgres/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: 2018-05-17 11:49+0200\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" "PO-Revision-Date: 2015-01-18 20:56+0100\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -14,17 +14,17 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: contrib/postgres/apps.py:13 +#: contrib/postgres/apps.py:42 msgid "PostgreSQL extensions" msgstr "" -#: contrib/postgres/fields/array.py:22 contrib/postgres/forms/array.py:16 +#: contrib/postgres/fields/array.py:21 contrib/postgres/forms/array.py:16 #: contrib/postgres/forms/array.py:170 #, python-format msgid "Item %(nth)s in the array did not validate:" msgstr "" -#: contrib/postgres/fields/array.py:23 +#: contrib/postgres/fields/array.py:22 msgid "Nested arrays must have the same length." msgstr "" @@ -34,7 +34,7 @@ msgstr "" #: contrib/postgres/fields/hstore.py:18 #, python-format -msgid "The value of \"%(key)s\" is not a string or null." +msgid "The value of “%(key)s” is not a string or null." msgstr "" #: contrib/postgres/fields/jsonb.py:32 @@ -55,30 +55,30 @@ msgstr "" #: contrib/postgres/forms/jsonb.py:19 #, python-format -msgid "'%(value)s' value must be valid JSON." +msgid "“%(value)s” value must be valid JSON." msgstr "" -#: contrib/postgres/forms/ranges.py:16 +#: contrib/postgres/forms/ranges.py:19 msgid "Enter two valid values." msgstr "" -#: contrib/postgres/forms/ranges.py:17 +#: contrib/postgres/forms/ranges.py:20 msgid "The start of the range must not exceed the end of the range." msgstr "" -#: contrib/postgres/forms/ranges.py:64 +#: contrib/postgres/forms/ranges.py:67 msgid "Enter two whole numbers." msgstr "" -#: contrib/postgres/forms/ranges.py:70 +#: contrib/postgres/forms/ranges.py:73 msgid "Enter two numbers." msgstr "" -#: contrib/postgres/forms/ranges.py:76 +#: contrib/postgres/forms/ranges.py:90 msgid "Enter two valid date/times." msgstr "" -#: contrib/postgres/forms/ranges.py:82 +#: contrib/postgres/forms/ranges.py:96 msgid "Enter two valid dates." msgstr "" diff --git a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po index eb33e60d34..5da48fb866 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: 2015-10-09 17:42+0200\n" +"POT-Creation-Date: 2019-09-08 17:27+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -17,34 +17,34 @@ msgstr "" msgid "Redirects" msgstr "" -#: contrib/redirects/models.py:9 +#: contrib/redirects/models.py:7 msgid "site" msgstr "" -#: contrib/redirects/models.py:10 +#: contrib/redirects/models.py:9 msgid "redirect from" msgstr "" -#: contrib/redirects/models.py:11 +#: contrib/redirects/models.py:12 msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." +"This should be an absolute path, excluding the domain name. Example: “/" +"events/search/”." msgstr "" -#: contrib/redirects/models.py:12 +#: contrib/redirects/models.py:15 msgid "redirect to" msgstr "" -#: contrib/redirects/models.py:13 +#: contrib/redirects/models.py:18 msgid "" "This can be either an absolute path (as above) or a full URL starting with " -"'http://'." +"“http://”." msgstr "" -#: contrib/redirects/models.py:16 +#: contrib/redirects/models.py:22 msgid "redirect" msgstr "" -#: contrib/redirects/models.py:17 +#: contrib/redirects/models.py:23 msgid "redirects" msgstr ""