summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2021-01-15 09:43:17 +0100
committerGitHub <noreply@github.com>2021-01-15 09:43:17 +0100
commit3dc3a952b28af444cb3bc83d4638a0e5fc2eeae1 (patch)
tree1e8368ec93c00b679bcd1c87240df2598e6c449b
parent75182a800a621b7a5b2c0a1f39a56e753b9a58ca (diff)
[3.2.x] Updated source translation catalogs.
-rw-r--r--django/conf/locale/en/LC_MESSAGES/django.po396
-rw-r--r--django/contrib/admin/locale/en/LC_MESSAGES/django.po182
-rw-r--r--django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po113
-rw-r--r--django/contrib/admindocs/locale/en/LC_MESSAGES/django.po36
-rw-r--r--django/contrib/humanize/locale/en/LC_MESSAGES/django.po189
-rw-r--r--django/contrib/redirects/locale/en/LC_MESSAGES/django.po14
6 files changed, 456 insertions, 474 deletions
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 4e784e0329..e3d7690c86 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: 2020-05-19 20:23+0200\n"
+"POT-Creation-Date: 2021-01-15 09:00+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -194,207 +194,207 @@ msgstr ""
msgid "Igbo"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Ido"
msgstr ""
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Italian"
msgstr ""
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Japanese"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Kabyle"
msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Kazakh"
msgstr ""
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:106
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:106
+#: conf/global_settings.py:107
msgid "Kyrgyz"
msgstr ""
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Luxembourgish"
msgstr ""
-#: conf/global_settings.py:107
+#: conf/global_settings.py:109
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:108
+#: conf/global_settings.py:110
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:109
+#: conf/global_settings.py:111
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:110
+#: conf/global_settings.py:112
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:111
+#: conf/global_settings.py:113
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:112
+#: conf/global_settings.py:114
msgid "Marathi"
msgstr ""
-#: conf/global_settings.py:113
+#: conf/global_settings.py:115
msgid "Burmese"
msgstr ""
-#: conf/global_settings.py:114
+#: conf/global_settings.py:116
msgid "Norwegian Bokmål"
msgstr ""
-#: conf/global_settings.py:115
+#: conf/global_settings.py:117
msgid "Nepali"
msgstr ""
-#: conf/global_settings.py:116
+#: conf/global_settings.py:118
msgid "Dutch"
msgstr ""
-#: conf/global_settings.py:117
+#: conf/global_settings.py:119
msgid "Norwegian Nynorsk"
msgstr ""
-#: conf/global_settings.py:118
+#: conf/global_settings.py:120
msgid "Ossetic"
msgstr ""
-#: conf/global_settings.py:119
+#: conf/global_settings.py:121
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:120
+#: conf/global_settings.py:122
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:121
+#: conf/global_settings.py:123
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:122
+#: conf/global_settings.py:124
msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:123
+#: conf/global_settings.py:125
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:124
+#: conf/global_settings.py:126
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:125
+#: conf/global_settings.py:127
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:126
+#: conf/global_settings.py:128
msgid "Slovenian"
msgstr ""
-#: conf/global_settings.py:127
+#: conf/global_settings.py:129
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:128
+#: conf/global_settings.py:130
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:129
+#: conf/global_settings.py:131
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:130
+#: conf/global_settings.py:132
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:131
+#: conf/global_settings.py:133
msgid "Swahili"
msgstr ""
-#: conf/global_settings.py:132
+#: conf/global_settings.py:134
msgid "Tamil"
msgstr ""
-#: conf/global_settings.py:133
+#: conf/global_settings.py:135
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:133
+#: conf/global_settings.py:136
msgid "Tajik"
msgstr ""
-#: conf/global_settings.py:134
+#: conf/global_settings.py:137
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:135
+#: conf/global_settings.py:138
msgid "Turkmen"
msgstr ""
-#: conf/global_settings.py:135
+#: conf/global_settings.py:139
msgid "Turkish"
msgstr ""
-#: conf/global_settings.py:136
+#: conf/global_settings.py:140
msgid "Tatar"
msgstr ""
-#: conf/global_settings.py:137
+#: conf/global_settings.py:141
msgid "Udmurt"
msgstr ""
-#: conf/global_settings.py:138
+#: conf/global_settings.py:142
msgid "Ukrainian"
msgstr ""
-#: conf/global_settings.py:139
+#: conf/global_settings.py:143
msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:140
+#: conf/global_settings.py:144
msgid "Uzbek"
msgstr ""
-#: conf/global_settings.py:141
+#: conf/global_settings.py:145
msgid "Vietnamese"
msgstr ""
-#: conf/global_settings.py:142
+#: conf/global_settings.py:146
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:143
+#: conf/global_settings.py:147
msgid "Traditional Chinese"
msgstr ""
@@ -402,7 +402,7 @@ msgstr ""
msgid "Messages"
msgstr ""
-#: contrib/sitemaps/apps.py:7
+#: contrib/sitemaps/apps.py:8
msgid "Site Maps"
msgstr ""
@@ -414,78 +414,84 @@ msgstr ""
msgid "Syndication"
msgstr ""
-#: core/paginator.py:48
+#. Translators: String used to replace omitted page numbers in elided page
+#. range generated by paginators, e.g. [1, 2, '…', 5, 6, 7, '…', 9, 10].
+#: core/paginator.py:30
+msgid "…"
+msgstr ""
+
+#: core/paginator.py:51
msgid "That page number is not an integer"
msgstr ""
-#: core/paginator.py:50
+#: core/paginator.py:53
msgid "That page number is less than 1"
msgstr ""
-#: core/paginator.py:55
+#: core/paginator.py:58
msgid "That page contains no results"
msgstr ""
-#: core/validators.py:20
+#: core/validators.py:22
msgid "Enter a valid value."
msgstr ""
-#: core/validators.py:91 forms/fields.py:671
+#: core/validators.py:93 forms/fields.py:664
msgid "Enter a valid URL."
msgstr ""
-#: core/validators.py:145
+#: core/validators.py:147
msgid "Enter a valid integer."
msgstr ""
-#: core/validators.py:156
+#: core/validators.py:158
msgid "Enter a valid email address."
msgstr ""
#. Translators: "letters" means latin letters: a-z and A-Z.
-#: core/validators.py:230
+#: core/validators.py:259
msgid ""
"Enter a valid “slug” consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:237
+#: core/validators.py:266
msgid ""
"Enter a valid “slug” consisting of Unicode letters, numbers, underscores, or "
"hyphens."
msgstr ""
-#: core/validators.py:246 core/validators.py:266
+#: core/validators.py:275 core/validators.py:295
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:251 core/validators.py:267
+#: core/validators.py:280 core/validators.py:296
msgid "Enter a valid IPv6 address."
msgstr ""
-#: core/validators.py:261 core/validators.py:265
+#: core/validators.py:290 core/validators.py:294
msgid "Enter a valid IPv4 or IPv6 address."
msgstr ""
-#: core/validators.py:295
+#: core/validators.py:324
msgid "Enter only digits separated by commas."
msgstr ""
-#: core/validators.py:301
+#: core/validators.py:330
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:334
+#: core/validators.py:363
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:343
+#: core/validators.py:372
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:353
+#: core/validators.py:382
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d character (it has "
@@ -496,7 +502,7 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:368
+#: core/validators.py:397
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d character (it has "
@@ -507,25 +513,25 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:387 forms/fields.py:292 forms/fields.py:327
+#: core/validators.py:416 forms/fields.py:292 forms/fields.py:327
msgid "Enter a number."
msgstr ""
-#: core/validators.py:389
+#: core/validators.py:418
#, 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:394
+#: core/validators.py:423
#, 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:399
+#: core/validators.py:428
#, python-format
msgid ""
"Ensure that there are no more than %(max)s digit before the decimal point."
@@ -534,22 +540,22 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: core/validators.py:461
+#: core/validators.py:490
#, python-format
msgid ""
"File extension “%(extension)s” is not allowed. Allowed extensions are: "
"%(allowed_extensions)s."
msgstr ""
-#: core/validators.py:513
+#: core/validators.py:543
msgid "Null characters are not allowed."
msgstr ""
-#: db/models/base.py:1187 forms/models.py:760
+#: db/models/base.py:1197 forms/models.py:768
msgid "and"
msgstr ""
-#: db/models/base.py:1189
+#: db/models/base.py:1199
#, python-format
msgid "%(model_name)s with this %(field_labels)s already exists."
msgstr ""
@@ -585,197 +591,197 @@ msgstr ""
msgid "Field of type: %(field_type)s"
msgstr ""
-#: db/models/fields/__init__.py:939
+#: db/models/fields/__init__.py:958
#, python-format
msgid "“%(value)s” value must be either True or False."
msgstr ""
-#: db/models/fields/__init__.py:940
+#: db/models/fields/__init__.py:959
#, python-format
msgid "“%(value)s” value must be either True, False, or None."
msgstr ""
-#: db/models/fields/__init__.py:942
+#: db/models/fields/__init__.py:961
msgid "Boolean (Either True or False)"
msgstr ""
-#: db/models/fields/__init__.py:983
+#: db/models/fields/__init__.py:1002
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:1047
+#: db/models/fields/__init__.py:1096
msgid "Comma-separated integers"
msgstr ""
-#: db/models/fields/__init__.py:1096
+#: db/models/fields/__init__.py:1145
#, 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:1098 db/models/fields/__init__.py:1241
+#: db/models/fields/__init__.py:1147 db/models/fields/__init__.py:1290
#, 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:1101
+#: db/models/fields/__init__.py:1150
msgid "Date (without time)"
msgstr ""
-#: db/models/fields/__init__.py:1239
+#: db/models/fields/__init__.py:1288
#, 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:1243
+#: db/models/fields/__init__.py:1292
#, 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:1247
+#: db/models/fields/__init__.py:1296
msgid "Date (with time)"
msgstr ""
-#: db/models/fields/__init__.py:1395
+#: db/models/fields/__init__.py:1444
#, python-format
msgid "“%(value)s” value must be a decimal number."
msgstr ""
-#: db/models/fields/__init__.py:1397
+#: db/models/fields/__init__.py:1446
msgid "Decimal number"
msgstr ""
-#: db/models/fields/__init__.py:1536
+#: db/models/fields/__init__.py:1585
#, 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:1539
+#: db/models/fields/__init__.py:1588
msgid "Duration"
msgstr ""
-#: db/models/fields/__init__.py:1589
+#: db/models/fields/__init__.py:1638
msgid "Email address"
msgstr ""
-#: db/models/fields/__init__.py:1612
+#: db/models/fields/__init__.py:1661
msgid "File path"
msgstr ""
-#: db/models/fields/__init__.py:1678
+#: db/models/fields/__init__.py:1727
#, python-format
msgid "“%(value)s” value must be a float."
msgstr ""
-#: db/models/fields/__init__.py:1680
+#: db/models/fields/__init__.py:1729
msgid "Floating point number"
msgstr ""
-#: db/models/fields/__init__.py:1718
+#: db/models/fields/__init__.py:1767
#, python-format
msgid "“%(value)s” value must be an integer."
msgstr ""
-#: db/models/fields/__init__.py:1720
+#: db/models/fields/__init__.py:1769
msgid "Integer"
msgstr ""
-#: db/models/fields/__init__.py:1803
+#: db/models/fields/__init__.py:1852
msgid "Big (8 byte) integer"
msgstr ""
-#: db/models/fields/__init__.py:1819
+#: db/models/fields/__init__.py:1867
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1875
msgid "IPv4 address"
msgstr ""
-#: db/models/fields/__init__.py:1850
+#: db/models/fields/__init__.py:1906
msgid "IP address"
msgstr ""
-#: db/models/fields/__init__.py:1930 db/models/fields/__init__.py:1931
+#: db/models/fields/__init__.py:1986 db/models/fields/__init__.py:1987
#, python-format
msgid "“%(value)s” value must be either None, True or False."
msgstr ""
-#: db/models/fields/__init__.py:1933
+#: db/models/fields/__init__.py:1989
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: db/models/fields/__init__.py:1976
+#: db/models/fields/__init__.py:2043
msgid "Positive big integer"
msgstr ""
-#: db/models/fields/__init__.py:1989
+#: db/models/fields/__init__.py:2056
msgid "Positive integer"
msgstr ""
-#: db/models/fields/__init__.py:2002
+#: db/models/fields/__init__.py:2069
msgid "Positive small integer"
msgstr ""
-#: db/models/fields/__init__.py:2016
+#: db/models/fields/__init__.py:2083
#, python-format
msgid "Slug (up to %(max_length)s)"
msgstr ""
-#: db/models/fields/__init__.py:2048
-msgid "Small integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:2055
+#: db/models/fields/__init__.py:2115
msgid "Text"
msgstr ""
-#: db/models/fields/__init__.py:2083
+#: db/models/fields/__init__.py:2181
#, 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:2085
+#: db/models/fields/__init__.py:2183
#, 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:2088
+#: db/models/fields/__init__.py:2186
msgid "Time"
msgstr ""
-#: db/models/fields/__init__.py:2214
+#: db/models/fields/__init__.py:2312
msgid "URL"
msgstr ""
-#: db/models/fields/__init__.py:2236
+#: db/models/fields/__init__.py:2334
msgid "Raw binary data"
msgstr ""
-#: db/models/fields/__init__.py:2301
+#: db/models/fields/__init__.py:2399
#, python-format
msgid "“%(value)s” is not a valid UUID."
msgstr ""
-#: db/models/fields/__init__.py:2303
+#: db/models/fields/__init__.py:2401
msgid "Universally unique identifier"
msgstr ""
-#: db/models/fields/files.py:231
+#: db/models/fields/files.py:225
msgid "File"
msgstr ""
-#: db/models/fields/files.py:377
+#: db/models/fields/files.py:373
msgid "Image"
msgstr ""
@@ -787,30 +793,30 @@ msgstr ""
msgid "Value must be valid JSON."
msgstr ""
-#: db/models/fields/related.py:786
+#: db/models/fields/related.py:790
#, python-format
msgid "%(model)s instance with %(field)s %(value)r does not exist."
msgstr ""
-#: db/models/fields/related.py:788
+#: db/models/fields/related.py:792
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:1041
+#: db/models/fields/related.py:1045
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:1095
+#: db/models/fields/related.py:1099
#, python-format
msgid "%(from)s-%(to)s relationship"
msgstr ""
-#: db/models/fields/related.py:1096
+#: db/models/fields/related.py:1100
#, python-format
msgid "%(from)s-%(to)s relationships"
msgstr ""
-#: db/models/fields/related.py:1138
+#: db/models/fields/related.py:1142
msgid "Many-to-many relationship"
msgstr ""
@@ -828,40 +834,40 @@ msgstr ""
msgid "Enter a whole number."
msgstr ""
-#: forms/fields.py:398 forms/fields.py:1139
+#: forms/fields.py:391 forms/fields.py:1132
msgid "Enter a valid date."
msgstr ""
-#: forms/fields.py:422 forms/fields.py:1140
+#: forms/fields.py:415 forms/fields.py:1133
msgid "Enter a valid time."
msgstr ""
-#: forms/fields.py:450
+#: forms/fields.py:443
msgid "Enter a valid date/time."
msgstr ""
-#: forms/fields.py:484
+#: forms/fields.py:477
msgid "Enter a valid duration."
msgstr ""
-#: forms/fields.py:485
+#: forms/fields.py:478
#, python-brace-format
msgid "The number of days must be between {min_days} and {max_days}."
msgstr ""
-#: forms/fields.py:545
+#: forms/fields.py:538
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
-#: forms/fields.py:546
+#: forms/fields.py:539
msgid "No file was submitted."
msgstr ""
-#: forms/fields.py:547
+#: forms/fields.py:540
msgid "The submitted file is empty."
msgstr ""
-#: forms/fields.py:549
+#: forms/fields.py:542
#, python-format
msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
msgid_plural ""
@@ -869,103 +875,106 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: forms/fields.py:552
+#: forms/fields.py:545
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
-#: forms/fields.py:613
+#: forms/fields.py:606
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-#: forms/fields.py:775 forms/fields.py:865 forms/models.py:1296
+#: forms/fields.py:768 forms/fields.py:858 forms/models.py:1309
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-#: forms/fields.py:866 forms/fields.py:981 forms/models.py:1295
+#: forms/fields.py:859 forms/fields.py:974 forms/models.py:1308
msgid "Enter a list of values."
msgstr ""
-#: forms/fields.py:982
+#: forms/fields.py:975
msgid "Enter a complete value."
msgstr ""
-#: forms/fields.py:1198
+#: forms/fields.py:1191
msgid "Enter a valid UUID."
msgstr ""
-#: forms/fields.py:1228
+#: forms/fields.py:1221
msgid "Enter a valid JSON."
msgstr ""
#. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:78
+#: forms/forms.py:76
msgid ":"
msgstr ""
-#: forms/forms.py:205
+#: forms/forms.py:203
#, python-format
msgid "(Hidden field %(name)s) %(error)s"
msgstr ""
-#: forms/formsets.py:93
-msgid "ManagementForm data is missing or has been tampered with"
+#: forms/formsets.py:61
+#, python-format
+msgid ""
+"ManagementForm data is missing or has been tampered with. Missing fields: "
+"%(field_names)s. You may need to file a bug report if the issue persists."
msgstr ""
-#: forms/formsets.py:345
+#: forms/formsets.py:370
#, python-format
-msgid "Please submit %d or fewer forms."
-msgid_plural "Please submit %d or fewer forms."
+msgid "Please submit at most %d form."
+msgid_plural "Please submit at most %d forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:352
+#: forms/formsets.py:377
#, python-format
-msgid "Please submit %d or more forms."
-msgid_plural "Please submit %d or more forms."
+msgid "Please submit at least %d form."
+msgid_plural "Please submit at least %d forms."
msgstr[0] ""
msgstr[1] ""
-#: forms/formsets.py:379 forms/formsets.py:386
+#: forms/formsets.py:405 forms/formsets.py:412
msgid "Order"
msgstr ""
-#: forms/formsets.py:391
+#: forms/formsets.py:417
msgid "Delete"
msgstr ""
-#: forms/models.py:755
+#: forms/models.py:763
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:759
+#: forms/models.py:767
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:765
+#: forms/models.py:773
#, 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:774
+#: forms/models.py:782
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:1096
+#: forms/models.py:1109
msgid "The inline value did not match the parent instance."
msgstr ""
-#: forms/models.py:1180
+#: forms/models.py:1193
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:1298
+#: forms/models.py:1311
#, python-format
msgid "“%(pk)s” is not a valid value."
msgstr ""
@@ -977,63 +986,63 @@ msgid ""
"may be ambiguous or it may not exist."
msgstr ""
-#: forms/widgets.py:398
+#: forms/widgets.py:403
msgid "Clear"
msgstr ""
-#: forms/widgets.py:399
+#: forms/widgets.py:404
msgid "Currently"
msgstr ""
-#: forms/widgets.py:400
+#: forms/widgets.py:405
msgid "Change"
msgstr ""
-#: forms/widgets.py:709
+#: forms/widgets.py:714
msgid "Unknown"
msgstr ""
-#: forms/widgets.py:710
+#: forms/widgets.py:715
msgid "Yes"
msgstr ""
-#: forms/widgets.py:711
+#: forms/widgets.py:716
msgid "No"
msgstr ""
#. Translators: Please do not add spaces around commas.
-#: template/defaultfilters.py:790
+#: template/defaultfilters.py:805
msgid "yes,no,maybe"
msgstr ""
-#: template/defaultfilters.py:819 template/defaultfilters.py:836
+#: template/defaultfilters.py:834 template/defaultfilters.py:851
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:838
+#: template/defaultfilters.py:853
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:840
+#: template/defaultfilters.py:855
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:842
+#: template/defaultfilters.py:857
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:844
+#: template/defaultfilters.py:859
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:846
+#: template/defaultfilters.py:861
#, python-format
msgid "%s PB"
msgstr ""
@@ -1054,11 +1063,11 @@ msgstr ""
msgid "AM"
msgstr ""
-#: utils/dateformat.py:149
+#: utils/dateformat.py:145
msgid "midnight"
msgstr ""
-#: utils/dateformat.py:151
+#: utils/dateformat.py:147
msgid "noon"
msgstr ""
@@ -1349,7 +1358,7 @@ msgid "or"
msgstr ""
#. Translators: This string is used as a separator between list elements
-#: utils/text.py:255 utils/timesince.py:83
+#: utils/text.py:255 utils/timesince.py:94
msgid ", "
msgstr ""
@@ -1470,14 +1479,14 @@ msgstr ""
msgid "No %(verbose_name_plural)s available"
msgstr ""
-#: views/generic/dates.py:589
+#: views/generic/dates.py:594
#, python-format
msgid ""
"Future %(verbose_name_plural)s not available because %(class_name)s."
"allow_future is False."
msgstr ""
-#: views/generic/dates.py:623
+#: views/generic/dates.py:628
#, python-format
msgid "Invalid date string “%(datestr)s” given format “%(format)s”"
msgstr ""
@@ -1516,21 +1525,18 @@ msgid "Index of %(directory)s"
msgstr ""
#: views/templates/default_urlconf.html:7
-msgid "Django: the Web framework for perfectionists with deadlines."
+#: views/templates/default_urlconf.html:221
+msgid "The install worked successfully! Congratulations!"
msgstr ""
-#: views/templates/default_urlconf.html:346
+#: views/templates/default_urlconf.html:207
#, python-format
msgid ""
"View <a href=\"https://docs.djangoproject.com/en/%(version)s/releases/\" "
"target=\"_blank\" rel=\"noopener\">release notes</a> for Django %(version)s"
msgstr ""
-#: views/templates/default_urlconf.html:368
-msgid "The install worked successfully! Congratulations!"
-msgstr ""
-
-#: views/templates/default_urlconf.html:369
+#: views/templates/default_urlconf.html:222
#, python-format
msgid ""
"You are seeing this page because <a href=\"https://docs.djangoproject.com/en/"
@@ -1539,26 +1545,26 @@ msgid ""
"URLs."
msgstr ""
-#: views/templates/default_urlconf.html:384
+#: views/templates/default_urlconf.html:230
msgid "Django Documentation"
msgstr ""
-#: views/templates/default_urlconf.html:385
+#: views/templates/default_urlconf.html:231
msgid "Topics, references, &amp; how-to’s"
msgstr ""
-#: views/templates/default_urlconf.html:396
+#: views/templates/default_urlconf.html:239
msgid "Tutorial: A Polling App"
msgstr ""
-#: views/templates/default_urlconf.html:397
+#: views/templates/default_urlconf.html:240
msgid "Get started with Django"
msgstr ""
-#: views/templates/default_urlconf.html:408
+#: views/templates/default_urlconf.html:248
msgid "Django Community"
msgstr ""
-#: views/templates/default_urlconf.html:409
+#: views/templates/default_urlconf.html:249
msgid "Connect, get help, or contribute"
msgstr ""
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
index 137b85c151..d5dc5e564e 100644
--- a/django/contrib/admin/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-14 19:53+0200\n"
+"POT-Creation-Date: 2021-01-15 09:00+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -14,80 +14,80 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: contrib/admin/actions.py:41
+#: contrib/admin/actions.py:16
+#, python-format
+msgid "Delete selected %(verbose_name_plural)s"
+msgstr ""
+
+#: contrib/admin/actions.py:46
#, python-format
msgid "Successfully deleted %(count)d %(items)s."
msgstr ""
-#: contrib/admin/actions.py:50 contrib/admin/options.py:1883
+#: contrib/admin/actions.py:55 contrib/admin/options.py:1886
#, python-format
msgid "Cannot delete %(name)s"
msgstr ""
-#: contrib/admin/actions.py:52 contrib/admin/options.py:1885
+#: contrib/admin/actions.py:57 contrib/admin/options.py:1888
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/actions.py:79
-#, python-format
-msgid "Delete selected %(verbose_name_plural)s"
-msgstr ""
-
-#: contrib/admin/apps.py:12
+#: contrib/admin/apps.py:13
msgid "Administration"
msgstr ""
#: 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 contrib/admin/filters.py:466
+#: contrib/admin/filters.py:249 contrib/admin/filters.py:284
+#: contrib/admin/filters.py:403 contrib/admin/filters.py:468
msgid "All"
msgstr ""
-#: contrib/admin/filters.py:249
+#: contrib/admin/filters.py:250
msgid "Yes"
msgstr ""
-#: contrib/admin/filters.py:250
+#: contrib/admin/filters.py:251
msgid "No"
msgstr ""
-#: contrib/admin/filters.py:260
+#: contrib/admin/filters.py:262
msgid "Unknown"
msgstr ""
-#: contrib/admin/filters.py:330
+#: contrib/admin/filters.py:332
msgid "Any date"
msgstr ""
-#: contrib/admin/filters.py:331
+#: contrib/admin/filters.py:333
msgid "Today"
msgstr ""
-#: contrib/admin/filters.py:335
+#: contrib/admin/filters.py:337
msgid "Past 7 days"
msgstr ""
-#: contrib/admin/filters.py:339
+#: contrib/admin/filters.py:341
msgid "This month"
msgstr ""
-#: contrib/admin/filters.py:343
+#: contrib/admin/filters.py:345
msgid "This year"
msgstr ""
-#: contrib/admin/filters.py:351
+#: contrib/admin/filters.py:353
msgid "No date"
msgstr ""
-#: contrib/admin/filters.py:352
+#: contrib/admin/filters.py:354
msgid "Has date"
msgstr ""
-#: contrib/admin/filters.py:467
+#: contrib/admin/filters.py:469
msgid "Empty"
msgstr ""
-#: contrib/admin/filters.py:468
+#: contrib/admin/filters.py:470
msgid "Not empty"
msgstr ""
@@ -98,16 +98,16 @@ msgid ""
"that both fields may be case-sensitive."
msgstr ""
-#: contrib/admin/helpers.py:21
+#: contrib/admin/helpers.py:23
msgid "Action:"
msgstr ""
-#: contrib/admin/helpers.py:312
+#: contrib/admin/helpers.py:329
#, python-format
msgid "Add another %(verbose_name)s"
msgstr ""
-#: contrib/admin/helpers.py:315
+#: contrib/admin/helpers.py:332
msgid "Remove"
msgstr ""
@@ -191,7 +191,7 @@ msgstr ""
msgid "Added."
msgstr ""
-#: contrib/admin/models.py:117 contrib/admin/options.py:2109
+#: contrib/admin/models.py:117 contrib/admin/options.py:2112
msgid "and"
msgstr ""
@@ -214,148 +214,148 @@ msgstr ""
msgid "No fields changed."
msgstr ""
-#: contrib/admin/options.py:201 contrib/admin/options.py:233
+#: contrib/admin/options.py:203 contrib/admin/options.py:235
msgid "None"
msgstr ""
-#: contrib/admin/options.py:279
+#: contrib/admin/options.py:281
msgid "Hold down “Control”, or “Command” on a Mac, to select more than one."
msgstr ""
-#: contrib/admin/options.py:1217 contrib/admin/options.py:1241
+#: contrib/admin/options.py:1221 contrib/admin/options.py:1245
#, python-brace-format
msgid "The {name} “{obj}” was added successfully."
msgstr ""
-#: contrib/admin/options.py:1219
+#: contrib/admin/options.py:1223
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/options.py:1231
+#: contrib/admin/options.py:1235
#, python-brace-format
msgid ""
"The {name} “{obj}” was added successfully. You may add another {name} below."
msgstr ""
-#: contrib/admin/options.py:1281
+#: contrib/admin/options.py:1285
#, python-brace-format
msgid ""
"The {name} “{obj}” was changed successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/options.py:1291
+#: contrib/admin/options.py:1295
#, python-brace-format
msgid "The {name} “{obj}” was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/options.py:1304
+#: contrib/admin/options.py:1308
#, python-brace-format
msgid ""
"The {name} “{obj}” was changed successfully. You may add another {name} "
"below."
msgstr ""
-#: contrib/admin/options.py:1316
+#: contrib/admin/options.py:1320
#, python-brace-format
msgid "The {name} “{obj}” was changed successfully."
msgstr ""
-#: contrib/admin/options.py:1393 contrib/admin/options.py:1725
+#: contrib/admin/options.py:1397 contrib/admin/options.py:1727
msgid ""
"Items must be selected in order to perform actions on them. No items have "
"been changed."
msgstr ""
-#: contrib/admin/options.py:1412
+#: contrib/admin/options.py:1416
msgid "No action selected."
msgstr ""
-#: contrib/admin/options.py:1437
+#: contrib/admin/options.py:1441
#, python-format
msgid "The %(name)s “%(obj)s” was deleted successfully."
msgstr ""
-#: contrib/admin/options.py:1523
+#: contrib/admin/options.py:1527
#, python-format
msgid "%(name)s with ID “%(key)s” doesn’t exist. Perhaps it was deleted?"
msgstr ""
-#: contrib/admin/options.py:1618
+#: contrib/admin/options.py:1622
#, python-format
msgid "Add %s"
msgstr ""
-#: contrib/admin/options.py:1620
+#: contrib/admin/options.py:1624
#, python-format
msgid "Change %s"
msgstr ""
-#: contrib/admin/options.py:1622
+#: contrib/admin/options.py:1626
#, python-format
msgid "View %s"
msgstr ""
-#: contrib/admin/options.py:1703
+#: contrib/admin/options.py:1705
msgid "Database error"
msgstr ""
-#: contrib/admin/options.py:1772
+#: contrib/admin/options.py:1774
#, 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:1803
+#: contrib/admin/options.py:1805
#, python-format
msgid "%(total_count)s selected"
msgid_plural "All %(total_count)s selected"
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/options.py:1811
+#: contrib/admin/options.py:1813
#, python-format
msgid "0 of %(cnt)s selected"
msgstr ""
-#: contrib/admin/options.py:1928
+#: contrib/admin/options.py:1932
#, 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:2102
+#: contrib/admin/options.py:2105
#, python-format
msgid "%(class_name)s %(instance)s"
msgstr ""
-#: contrib/admin/options.py:2111
+#: contrib/admin/options.py:2114
#, 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:42 contrib/admin/templates/admin/base_site.html:3
+#: contrib/admin/sites.py:47 contrib/admin/templates/admin/base_site.html:3
msgid "Django site admin"
msgstr ""
-#: contrib/admin/sites.py:45 contrib/admin/templates/admin/base_site.html:6
+#: contrib/admin/sites.py:50 contrib/admin/templates/admin/base_site.html:6
msgid "Django administration"
msgstr ""
-#: contrib/admin/sites.py:48
+#: contrib/admin/sites.py:53
msgid "Site administration"
msgstr ""
-#: contrib/admin/sites.py:395 contrib/admin/templates/admin/login.html:63
-#: contrib/admin/templates/registration/password_reset_complete.html:18
+#: contrib/admin/sites.py:399 contrib/admin/templates/admin/login.html:63
+#: contrib/admin/templates/registration/password_reset_complete.html:15
#: contrib/admin/tests.py:135
msgid "Log in"
msgstr ""
-#: contrib/admin/sites.py:524
+#: contrib/admin/sites.py:544
#, python-format
msgid "%(app)s administration"
msgstr ""
@@ -371,8 +371,8 @@ msgstr ""
#: contrib/admin/templates/admin/500.html:6
#: contrib/admin/templates/admin/app_index.html:9
-#: contrib/admin/templates/admin/auth/user/change_password.html:13
-#: contrib/admin/templates/admin/base.html:64
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
+#: contrib/admin/templates/admin/base.html:65
#: contrib/admin/templates/admin/change_form.html:18
#: contrib/admin/templates/admin/change_list.html:31
#: contrib/admin/templates/admin/delete_confirmation.html:14
@@ -458,50 +458,50 @@ msgstr ""
msgid "Enter a username and password."
msgstr ""
-#: contrib/admin/templates/admin/auth/user/change_password.html:17
-#: contrib/admin/templates/admin/auth/user/change_password.html:55
-#: contrib/admin/templates/admin/base.html:52
+#: contrib/admin/templates/admin/auth/user/change_password.html:14
+#: contrib/admin/templates/admin/auth/user/change_password.html:52
+#: contrib/admin/templates/admin/base.html:53
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Change password"
msgstr ""
-#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#: contrib/admin/templates/admin/auth/user/change_password.html:25
#: contrib/admin/templates/admin/change_form.html:43
#: contrib/admin/templates/admin/change_list.html:51
#: contrib/admin/templates/admin/login.html:23
-#: contrib/admin/templates/registration/password_change_form.html:21
+#: contrib/admin/templates/registration/password_change_form.html:18
msgid "Please correct the error below."
msgstr ""
-#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#: contrib/admin/templates/admin/auth/user/change_password.html:25
#: contrib/admin/templates/admin/change_form.html:43
#: contrib/admin/templates/admin/change_list.html:51
#: contrib/admin/templates/admin/login.html:23
-#: contrib/admin/templates/registration/password_change_form.html:21
+#: contrib/admin/templates/registration/password_change_form.html:18
msgid "Please correct the errors below."
msgstr ""
-#: contrib/admin/templates/admin/auth/user/change_password.html:32
+#: contrib/admin/templates/admin/auth/user/change_password.html:29
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
msgstr ""
-#: contrib/admin/templates/admin/base.html:38
+#: contrib/admin/templates/admin/base.html:39
msgid "Welcome,"
msgstr ""
-#: contrib/admin/templates/admin/base.html:43
+#: contrib/admin/templates/admin/base.html:44
msgid "View site"
msgstr ""
-#: contrib/admin/templates/admin/base.html:48
+#: contrib/admin/templates/admin/base.html:49
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Documentation"
msgstr ""
-#: contrib/admin/templates/admin/base.html:54
+#: contrib/admin/templates/admin/base.html:55
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Log out"
@@ -524,11 +524,11 @@ msgstr ""
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_list.html:62
+#: contrib/admin/templates/admin/change_list.html:76
msgid "Filter"
msgstr ""
-#: contrib/admin/templates/admin/change_list.html:64
+#: contrib/admin/templates/admin/change_list.html:78
msgid "Clear all filters"
msgstr ""
@@ -761,18 +761,18 @@ msgstr ""
msgid "Password change"
msgstr ""
-#: contrib/admin/templates/registration/password_change_done.html:14
+#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
msgstr ""
-#: contrib/admin/templates/registration/password_change_form.html:26
+#: contrib/admin/templates/registration/password_change_form.html:23
msgid ""
"Please enter your old password, for security’s sake, and then enter your new "
"password twice so we can verify you typed it in correctly."
msgstr ""
-#: contrib/admin/templates/registration/password_change_form.html:54
-#: contrib/admin/templates/registration/password_reset_confirm.html:32
+#: contrib/admin/templates/registration/password_change_form.html:51
+#: contrib/admin/templates/registration/password_reset_confirm.html:31
msgid "Change my password"
msgstr ""
@@ -782,7 +782,7 @@ msgstr ""
msgid "Password reset"
msgstr ""
-#: contrib/admin/templates/registration/password_reset_complete.html:16
+#: contrib/admin/templates/registration/password_reset_complete.html:13
msgid "Your password has been set. You may go ahead and log in now."
msgstr ""
@@ -790,33 +790,33 @@ msgstr ""
msgid "Password reset confirmation"
msgstr ""
-#: contrib/admin/templates/registration/password_reset_confirm.html:18
+#: contrib/admin/templates/registration/password_reset_confirm.html:16
msgid ""
"Please enter your new password twice so we can verify you typed it in "
"correctly."
msgstr ""
-#: contrib/admin/templates/registration/password_reset_confirm.html:24
+#: contrib/admin/templates/registration/password_reset_confirm.html:23
msgid "New password:"
msgstr ""
-#: contrib/admin/templates/registration/password_reset_confirm.html:29
+#: contrib/admin/templates/registration/password_reset_confirm.html:28
msgid "Confirm password:"
msgstr ""
-#: contrib/admin/templates/registration/password_reset_confirm.html:38
+#: contrib/admin/templates/registration/password_reset_confirm.html:37
msgid ""
"The password reset link was invalid, possibly because it has already been "
"used. Please request a new password reset."
msgstr ""
-#: contrib/admin/templates/registration/password_reset_done.html:15
+#: contrib/admin/templates/registration/password_reset_done.html:13
msgid ""
"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
+#: contrib/admin/templates/registration/password_reset_done.html:15
msgid ""
"If you don’t receive an email, please make sure you’ve entered the address "
"you registered with, and check your spam folder."
@@ -846,35 +846,35 @@ msgstr ""
msgid "The %(site_name)s team"
msgstr ""
-#: contrib/admin/templates/registration/password_reset_form.html:16
+#: contrib/admin/templates/registration/password_reset_form.html:14
msgid ""
"Forgotten your password? Enter your email address below, and we’ll email "
"instructions for setting a new one."
msgstr ""
-#: contrib/admin/templates/registration/password_reset_form.html:22
+#: contrib/admin/templates/registration/password_reset_form.html:20
msgid "Email address:"
msgstr ""
-#: contrib/admin/templates/registration/password_reset_form.html:25
+#: contrib/admin/templates/registration/password_reset_form.html:23
msgid "Reset my password"
msgstr ""
-#: contrib/admin/templatetags/admin_list.py:423
+#: contrib/admin/templatetags/admin_list.py:390
msgid "All dates"
msgstr ""
-#: contrib/admin/views/main.py:100
+#: contrib/admin/views/main.py:102
#, python-format
msgid "Select %s"
msgstr ""
-#: contrib/admin/views/main.py:102
+#: contrib/admin/views/main.py:104
#, python-format
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:104
+#: contrib/admin/views/main.py:106
#, python-format
msgid "Select %s to view"
msgstr ""
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
index ed5ee8d920..bca964aa43 100644
--- a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 20:56+0200\n"
+"POT-Creation-Date: 2021-01-15 09:00+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -72,30 +72,26 @@ msgstr ""
msgid "Click to remove all chosen %s at once."
msgstr ""
-#: contrib/admin/static/admin/js/actions.js:49
-#: contrib/admin/static/admin/js/actions.min.js:2
+#: contrib/admin/static/admin/js/actions.js:64
msgid "%(sel)s of %(cnt)s selected"
msgid_plural "%(sel)s of %(cnt)s selected"
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/static/admin/js/actions.js:118
-#: contrib/admin/static/admin/js/actions.min.js:5
+#: contrib/admin/static/admin/js/actions.js:130
msgid ""
"You have unsaved changes on individual editable fields. If you run an "
"action, your unsaved changes will be lost."
msgstr ""
-#: contrib/admin/static/admin/js/actions.js:130
-#: contrib/admin/static/admin/js/actions.min.js:5
+#: contrib/admin/static/admin/js/actions.js:143
msgid ""
"You have selected an action, but you haven’t saved your changes to "
"individual fields yet. Please click OK to save. You’ll need to re-run the "
"action."
msgstr ""
-#: contrib/admin/static/admin/js/actions.js:132
-#: contrib/admin/static/admin/js/actions.min.js:6
+#: contrib/admin/static/admin/js/actions.js:144
msgid ""
"You have selected an action, and you haven’t made any changes on individual "
"fields. You’re probably looking for the Go button rather than the Save "
@@ -103,7 +99,7 @@ msgid ""
msgstr ""
#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:13
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:113
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:111
msgid "Now"
msgstr ""
@@ -123,47 +119,47 @@ msgstr ""
msgid "6 p.m."
msgstr ""
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:80
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:78
#, javascript-format
msgid "Note: You are %s hour ahead of server time."
msgid_plural "Note: You are %s hours ahead of server time."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:88
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:86
#, javascript-format
msgid "Note: You are %s hour behind server time."
msgid_plural "Note: You are %s hours behind server time."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:131
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:129
msgid "Choose a Time"
msgstr ""
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:161
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:159
msgid "Choose a time"
msgstr ""
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:178
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:336
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:176
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:334
msgid "Cancel"
msgstr ""
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:241
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:321
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:239
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:319
msgid "Today"
msgstr ""
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:258
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:256
msgid "Choose a Date"
msgstr ""
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:315
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:313
msgid "Yesterday"
msgstr ""
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:327
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:325
msgid "Tomorrow"
msgstr ""
@@ -216,48 +212,105 @@ msgid "December"
msgstr ""
#: contrib/admin/static/admin/js/calendar.js:25
+msgctxt "abbrev. month January"
+msgid "Jan"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:26
+msgctxt "abbrev. month February"
+msgid "Feb"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:27
+msgctxt "abbrev. month March"
+msgid "Mar"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:28
+msgctxt "abbrev. month April"
+msgid "Apr"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:29
+msgctxt "abbrev. month May"
+msgid "May"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:30
+msgctxt "abbrev. month June"
+msgid "Jun"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:31
+msgctxt "abbrev. month July"
+msgid "Jul"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:32
+msgctxt "abbrev. month August"
+msgid "Aug"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:33
+msgctxt "abbrev. month September"
+msgid "Sep"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:34
+msgctxt "abbrev. month October"
+msgid "Oct"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:35
+msgctxt "abbrev. month November"
+msgid "Nov"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:36
+msgctxt "abbrev. month December"
+msgid "Dec"
+msgstr ""
+
+#: contrib/admin/static/admin/js/calendar.js:39
msgctxt "one letter Sunday"
msgid "S"
msgstr ""
-#: contrib/admin/static/admin/js/calendar.js:26
+#: contrib/admin/static/admin/js/calendar.js:40
msgctxt "one letter Monday"
msgid "M"
msgstr ""
-#: contrib/admin/static/admin/js/calendar.js:27
+#: contrib/admin/static/admin/js/calendar.js:41
msgctxt "one letter Tuesday"
msgid "T"
msgstr ""
-#: contrib/admin/static/admin/js/calendar.js:28
+#: contrib/admin/static/admin/js/calendar.js:42
msgctxt "one letter Wednesday"
msgid "W"
msgstr ""
-#: contrib/admin/static/admin/js/calendar.js:29
+#: contrib/admin/static/admin/js/calendar.js:43
msgctxt "one letter Thursday"
msgid "T"
msgstr ""
-#: contrib/admin/static/admin/js/calendar.js:30
+#: contrib/admin/static/admin/js/calendar.js:44
msgctxt "one letter Friday"
msgid "F"
msgstr ""
-#: contrib/admin/static/admin/js/calendar.js:31
+#: contrib/admin/static/admin/js/calendar.js:45
msgctxt "one letter Saturday"
msgid "S"
msgstr ""
#: contrib/admin/static/admin/js/collapse.js:16
#: contrib/admin/static/admin/js/collapse.js:34
-#: contrib/admin/static/admin/js/collapse.min.js:1
-#: contrib/admin/static/admin/js/collapse.min.js:2
msgid "Show"
msgstr ""
#: contrib/admin/static/admin/js/collapse.js:30
-#: contrib/admin/static/admin/js/collapse.min.js:2
msgid "Hide"
msgstr ""
diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
index ebbbd3abd9..34eb488012 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: 2019-09-08 17:27+0200\n"
+"POT-Creation-Date: 2021-01-15 09:00+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -131,7 +131,7 @@ msgstr ""
#: contrib/admindocs/templates/admin_doc/missing_docutils.html:17
#, python-format
msgid ""
-"The admin documentation system requires Python's <a href=\"%(link)s"
+"The admin documentation system requires Python’s <a href=\"%(link)s"
"\">docutils</a> library."
msgstr ""
@@ -301,54 +301,54 @@ msgid ""
"code>.\n"
msgstr ""
-#: contrib/admindocs/views.py:71 contrib/admindocs/views.py:72
-#: contrib/admindocs/views.py:74
+#: contrib/admindocs/views.py:72 contrib/admindocs/views.py:73
+#: contrib/admindocs/views.py:75
msgid "tag:"
msgstr ""
-#: contrib/admindocs/views.py:102 contrib/admindocs/views.py:103
-#: contrib/admindocs/views.py:105
+#: contrib/admindocs/views.py:103 contrib/admindocs/views.py:104
+#: contrib/admindocs/views.py:106
msgid "filter:"
msgstr ""
-#: contrib/admindocs/views.py:161 contrib/admindocs/views.py:162
-#: contrib/admindocs/views.py:164
+#: contrib/admindocs/views.py:162 contrib/admindocs/views.py:163
+#: contrib/admindocs/views.py:165
msgid "view:"
msgstr ""
-#: contrib/admindocs/views.py:191
+#: contrib/admindocs/views.py:192
#, python-format
msgid "App %(app_label)r not found"
msgstr ""
-#: contrib/admindocs/views.py:195
+#: contrib/admindocs/views.py:196
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr ""
-#: 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
+#: contrib/admindocs/views.py:201 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:301 contrib/admindocs/views.py:306
msgid "model:"
msgstr ""
-#: contrib/admindocs/views.py:212
+#: contrib/admindocs/views.py:213
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr ""
-#: contrib/admindocs/views.py:232 contrib/admindocs/views.py:292
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:293
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr ""
-#: contrib/admindocs/views.py:239 contrib/admindocs/views.py:300
+#: contrib/admindocs/views.py:240 contrib/admindocs/views.py:301
#, python-format
msgid "all %s"
msgstr ""
-#: contrib/admindocs/views.py:244 contrib/admindocs/views.py:305
+#: contrib/admindocs/views.py:245 contrib/admindocs/views.py:306
#, python-format
msgid "number of %s"
msgstr ""
diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
index d4239a187a..88f8982ecc 100644
--- a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-16 20:42+0100\n"
+"POT-Creation-Date: 2021-01-15 09:00+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -19,282 +19,205 @@ msgid "Humanize"
msgstr ""
#. Translators: Ordinal format for 11 (11th), 12 (12th), and 13 (13th).
-#: contrib/humanize/templatetags/humanize.py:31
+#: contrib/humanize/templatetags/humanize.py:30
msgctxt "ordinal 11, 12, 13"
msgid "{}th"
msgstr ""
#. Translators: Ordinal format when value ends with 0, e.g. 80th.
-#: contrib/humanize/templatetags/humanize.py:35
+#: contrib/humanize/templatetags/humanize.py:34
msgctxt "ordinal 0"
msgid "{}th"
msgstr ""
#. Translators: Ordinal format when value ends with 1, e.g. 81st, except 11.
-#: contrib/humanize/templatetags/humanize.py:37
+#: contrib/humanize/templatetags/humanize.py:36
msgctxt "ordinal 1"
msgid "{}st"
msgstr ""
#. Translators: Ordinal format when value ends with 2, e.g. 82nd, except 12.
-#: contrib/humanize/templatetags/humanize.py:39
+#: contrib/humanize/templatetags/humanize.py:38
msgctxt "ordinal 2"
msgid "{}nd"
msgstr ""
#. Translators: Ordinal format when value ends with 3, e.g. 83th, except 13.
-#: contrib/humanize/templatetags/humanize.py:41
+#: contrib/humanize/templatetags/humanize.py:40
msgctxt "ordinal 3"
msgid "{}rd"
msgstr ""
#. Translators: Ordinal format when value ends with 4, e.g. 84th.
-#: contrib/humanize/templatetags/humanize.py:43
+#: contrib/humanize/templatetags/humanize.py:42
msgctxt "ordinal 4"
msgid "{}th"
msgstr ""
#. Translators: Ordinal format when value ends with 5, e.g. 85th.
-#: contrib/humanize/templatetags/humanize.py:45
+#: contrib/humanize/templatetags/humanize.py:44
msgctxt "ordinal 5"
msgid "{}th"
msgstr ""
#. Translators: Ordinal format when value ends with 6, e.g. 86th.
-#: contrib/humanize/templatetags/humanize.py:47
+#: contrib/humanize/templatetags/humanize.py:46
msgctxt "ordinal 6"
msgid "{}th"
msgstr ""
#. Translators: Ordinal format when value ends with 7, e.g. 87th.
-#: contrib/humanize/templatetags/humanize.py:49
+#: contrib/humanize/templatetags/humanize.py:48
msgctxt "ordinal 7"
msgid "{}th"
msgstr ""
#. Translators: Ordinal format when value ends with 8, e.g. 88th.
-#: contrib/humanize/templatetags/humanize.py:51
+#: contrib/humanize/templatetags/humanize.py:50
msgctxt "ordinal 8"
msgid "{}th"
msgstr ""
#. Translators: Ordinal format when value ends with 9, e.g. 89th.
-#: contrib/humanize/templatetags/humanize.py:53
+#: contrib/humanize/templatetags/humanize.py:52
msgctxt "ordinal 9"
msgid "{}th"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:85
-#, python-format
-msgid "%(value).1f million"
-msgid_plural "%(value).1f million"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:86
+#: contrib/humanize/templatetags/humanize.py:83
#, python-format
msgid "%(value)s million"
msgid_plural "%(value)s million"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:89
-#, python-format
-msgid "%(value).1f billion"
-msgid_plural "%(value).1f billion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:90
+#: contrib/humanize/templatetags/humanize.py:84
#, python-format
msgid "%(value)s billion"
msgid_plural "%(value)s billion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:93
-#, python-format
-msgid "%(value).1f trillion"
-msgid_plural "%(value).1f trillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:94
+#: contrib/humanize/templatetags/humanize.py:85
#, python-format
msgid "%(value)s trillion"
msgid_plural "%(value)s trillion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:97
-#, python-format
-msgid "%(value).1f quadrillion"
-msgid_plural "%(value).1f quadrillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:98
+#: contrib/humanize/templatetags/humanize.py:86
#, python-format
msgid "%(value)s quadrillion"
msgid_plural "%(value)s quadrillion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:101
-#, python-format
-msgid "%(value).1f quintillion"
-msgid_plural "%(value).1f quintillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:102
+#: contrib/humanize/templatetags/humanize.py:87
#, python-format
msgid "%(value)s quintillion"
msgid_plural "%(value)s quintillion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:105
-#, python-format
-msgid "%(value).1f sextillion"
-msgid_plural "%(value).1f sextillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:106
+#: contrib/humanize/templatetags/humanize.py:88
#, python-format
msgid "%(value)s sextillion"
msgid_plural "%(value)s sextillion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:109
-#, python-format
-msgid "%(value).1f septillion"
-msgid_plural "%(value).1f septillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:110
+#: contrib/humanize/templatetags/humanize.py:89
#, python-format
msgid "%(value)s septillion"
msgid_plural "%(value)s septillion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:113
-#, python-format
-msgid "%(value).1f octillion"
-msgid_plural "%(value).1f octillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:114
+#: contrib/humanize/templatetags/humanize.py:90
#, python-format
msgid "%(value)s octillion"
msgid_plural "%(value)s octillion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:117
-#, python-format
-msgid "%(value).1f nonillion"
-msgid_plural "%(value).1f nonillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:118
+#: contrib/humanize/templatetags/humanize.py:91
#, python-format
msgid "%(value)s nonillion"
msgid_plural "%(value)s nonillion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:121
-#, python-format
-msgid "%(value).1f decillion"
-msgid_plural "%(value).1f decillion"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:122
+#: contrib/humanize/templatetags/humanize.py:92
#, python-format
msgid "%(value)s decillion"
msgid_plural "%(value)s decillion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:125
-#, python-format
-msgid "%(value).1f googol"
-msgid_plural "%(value).1f googol"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:126
+#: contrib/humanize/templatetags/humanize.py:93
#, python-format
msgid "%(value)s googol"
msgid_plural "%(value)s googol"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:177
+#: contrib/humanize/templatetags/humanize.py:136
msgid "one"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:177
+#: contrib/humanize/templatetags/humanize.py:136
msgid "two"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:177
+#: contrib/humanize/templatetags/humanize.py:136
msgid "three"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:177
+#: contrib/humanize/templatetags/humanize.py:136
msgid "four"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:177
+#: contrib/humanize/templatetags/humanize.py:136
msgid "five"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:178
+#: contrib/humanize/templatetags/humanize.py:137
msgid "six"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:178
+#: contrib/humanize/templatetags/humanize.py:137
msgid "seven"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:178
+#: contrib/humanize/templatetags/humanize.py:137
msgid "eight"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:178
+#: contrib/humanize/templatetags/humanize.py:137
msgid "nine"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:199
+#: contrib/humanize/templatetags/humanize.py:158
msgid "today"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:201
+#: contrib/humanize/templatetags/humanize.py:160
msgid "tomorrow"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:203
+#: contrib/humanize/templatetags/humanize.py:162
msgid "yesterday"
msgstr ""
#. Translators: delta will contain a string like '2 months' or '1 month, 2 weeks'
-#: contrib/humanize/templatetags/humanize.py:221
+#: contrib/humanize/templatetags/humanize.py:180
#, python-format
msgid "%(delta)s ago"
msgstr ""
#. Translators: please keep a non-breaking space (U+00A0) between count
#. and time unit.
-#: contrib/humanize/templatetags/humanize.py:224
+#: contrib/humanize/templatetags/humanize.py:183
#, python-format
msgid "an hour ago"
msgid_plural "%(count)s hours ago"
@@ -303,7 +226,7 @@ msgstr[1] ""
#. Translators: please keep a non-breaking space (U+00A0) between count
#. and time unit.
-#: contrib/humanize/templatetags/humanize.py:227
+#: contrib/humanize/templatetags/humanize.py:186
#, python-format
msgid "a minute ago"
msgid_plural "%(count)s minutes ago"
@@ -312,20 +235,20 @@ msgstr[1] ""
#. Translators: please keep a non-breaking space (U+00A0) between count
#. and time unit.
-#: contrib/humanize/templatetags/humanize.py:230
+#: contrib/humanize/templatetags/humanize.py:189
#, python-format
msgid "a second ago"
msgid_plural "%(count)s seconds ago"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:231
+#: contrib/humanize/templatetags/humanize.py:190
msgid "now"
msgstr ""
#. Translators: please keep a non-breaking space (U+00A0) between count
#. and time unit.
-#: contrib/humanize/templatetags/humanize.py:234
+#: contrib/humanize/templatetags/humanize.py:193
#, python-format
msgid "a second from now"
msgid_plural "%(count)s seconds from now"
@@ -334,7 +257,7 @@ msgstr[1] ""
#. Translators: please keep a non-breaking space (U+00A0) between count
#. and time unit.
-#: contrib/humanize/templatetags/humanize.py:237
+#: contrib/humanize/templatetags/humanize.py:196
#, python-format
msgid "a minute from now"
msgid_plural "%(count)s minutes from now"
@@ -343,7 +266,7 @@ msgstr[1] ""
#. Translators: please keep a non-breaking space (U+00A0) between count
#. and time unit.
-#: contrib/humanize/templatetags/humanize.py:240
+#: contrib/humanize/templatetags/humanize.py:199
#, python-format
msgid "an hour from now"
msgid_plural "%(count)s hours from now"
@@ -351,13 +274,13 @@ msgstr[0] ""
msgstr[1] ""
#. Translators: delta will contain a string like '2 months' or '1 month, 2 weeks'
-#: contrib/humanize/templatetags/humanize.py:242
+#: contrib/humanize/templatetags/humanize.py:201
#, python-format
msgid "%(delta)s from now"
msgstr ""
#. Translators: 'naturaltime-past' strings will be included in '%(delta)s ago'
-#: contrib/humanize/templatetags/humanize.py:246
+#: contrib/humanize/templatetags/humanize.py:205
#, python-format
msgctxt "naturaltime-past"
msgid "%d year"
@@ -365,7 +288,7 @@ msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:247
+#: contrib/humanize/templatetags/humanize.py:206
#, python-format
msgctxt "naturaltime-past"
msgid "%d month"
@@ -373,7 +296,7 @@ msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:248
+#: contrib/humanize/templatetags/humanize.py:207
#, python-format
msgctxt "naturaltime-past"
msgid "%d week"
@@ -381,7 +304,7 @@ msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:249
+#: contrib/humanize/templatetags/humanize.py:208
#, python-format
msgctxt "naturaltime-past"
msgid "%d day"
@@ -389,7 +312,7 @@ msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:250
+#: contrib/humanize/templatetags/humanize.py:209
#, python-format
msgctxt "naturaltime-past"
msgid "%d hour"
@@ -397,7 +320,7 @@ msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:251
+#: contrib/humanize/templatetags/humanize.py:210
#, python-format
msgctxt "naturaltime-past"
msgid "%d minute"
@@ -406,7 +329,7 @@ msgstr[0] ""
msgstr[1] ""
#. Translators: 'naturaltime-future' strings will be included in '%(delta)s from now'
-#: contrib/humanize/templatetags/humanize.py:255
+#: contrib/humanize/templatetags/humanize.py:214
#, python-format
msgctxt "naturaltime-future"
msgid "%d year"
@@ -414,7 +337,7 @@ msgid_plural "%d years"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:256
+#: contrib/humanize/templatetags/humanize.py:215
#, python-format
msgctxt "naturaltime-future"
msgid "%d month"
@@ -422,7 +345,7 @@ msgid_plural "%d months"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:257
+#: contrib/humanize/templatetags/humanize.py:216
#, python-format
msgctxt "naturaltime-future"
msgid "%d week"
@@ -430,7 +353,7 @@ msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:258
+#: contrib/humanize/templatetags/humanize.py:217
#, python-format
msgctxt "naturaltime-future"
msgid "%d day"
@@ -438,7 +361,7 @@ msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:259
+#: contrib/humanize/templatetags/humanize.py:218
#, python-format
msgctxt "naturaltime-future"
msgid "%d hour"
@@ -446,7 +369,7 @@ msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:260
+#: contrib/humanize/templatetags/humanize.py:219
#, python-format
msgctxt "naturaltime-future"
msgid "%d minute"
diff --git a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
index 5da48fb866..01a3eb7c1b 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: 2019-09-08 17:27+0200\n"
+"POT-Creation-Date: 2021-01-15 09:00+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/redirects/apps.py:7
+#: contrib/redirects/apps.py:8
msgid "Redirects"
msgstr ""
@@ -35,16 +35,16 @@ msgstr ""
msgid "redirect to"
msgstr ""
-#: contrib/redirects/models.py:18
+#: contrib/redirects/models.py:19
msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"“http://”."
+"This can be either an absolute path (as above) or a full URL starting with a "
+"scheme such as “https://”."
msgstr ""
-#: contrib/redirects/models.py:22
+#: contrib/redirects/models.py:25
msgid "redirect"
msgstr ""
-#: contrib/redirects/models.py:23
+#: contrib/redirects/models.py:26
msgid "redirects"
msgstr ""