diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 73acc786d1..2c52175822 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: 2018-05-17 11:49+0200\n"
+"POT-Creation-Date: 2019-01-16 20:42+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -175,198 +175,202 @@ msgid "Hungarian"
 msgstr ""
 
 #: conf/global_settings.py:92
-msgid "Interlingua"
+msgid "Armenian"
 msgstr ""
 
 #: conf/global_settings.py:93
-msgid "Indonesian"
+msgid "Interlingua"
 msgstr ""
 
 #: conf/global_settings.py:94
-msgid "Ido"
+msgid "Indonesian"
 msgstr ""
 
 #: conf/global_settings.py:95
-msgid "Icelandic"
+msgid "Ido"
 msgstr ""
 
 #: conf/global_settings.py:96
-msgid "Italian"
+msgid "Icelandic"
 msgstr ""
 
 #: conf/global_settings.py:97
-msgid "Japanese"
+msgid "Italian"
 msgstr ""
 
 #: conf/global_settings.py:98
-msgid "Georgian"
+msgid "Japanese"
 msgstr ""
 
 #: conf/global_settings.py:99
-msgid "Kabyle"
+msgid "Georgian"
 msgstr ""
 
 #: conf/global_settings.py:100
-msgid "Kazakh"
+msgid "Kabyle"
 msgstr ""
 
 #: conf/global_settings.py:101
-msgid "Khmer"
+msgid "Kazakh"
 msgstr ""
 
 #: conf/global_settings.py:102
-msgid "Kannada"
+msgid "Khmer"
 msgstr ""
 
 #: conf/global_settings.py:103
-msgid "Korean"
+msgid "Kannada"
 msgstr ""
 
 #: conf/global_settings.py:104
-msgid "Luxembourgish"
+msgid "Korean"
 msgstr ""
 
 #: conf/global_settings.py:105
-msgid "Lithuanian"
+msgid "Luxembourgish"
 msgstr ""
 
 #: conf/global_settings.py:106
-msgid "Latvian"
+msgid "Lithuanian"
 msgstr ""
 
 #: conf/global_settings.py:107
-msgid "Macedonian"
+msgid "Latvian"
 msgstr ""
 
 #: conf/global_settings.py:108
-msgid "Malayalam"
+msgid "Macedonian"
 msgstr ""
 
 #: conf/global_settings.py:109
-msgid "Mongolian"
+msgid "Malayalam"
 msgstr ""
 
 #: conf/global_settings.py:110
-msgid "Marathi"
+msgid "Mongolian"
 msgstr ""
 
 #: conf/global_settings.py:111
-msgid "Burmese"
+msgid "Marathi"
 msgstr ""
 
 #: conf/global_settings.py:112
-msgid "Norwegian Bokmål"
+msgid "Burmese"
 msgstr ""
 
 #: conf/global_settings.py:113
-msgid "Nepali"
+msgid "Norwegian Bokmål"
 msgstr ""
 
 #: conf/global_settings.py:114
-msgid "Dutch"
+msgid "Nepali"
 msgstr ""
 
 #: conf/global_settings.py:115
-msgid "Norwegian Nynorsk"
+msgid "Dutch"
 msgstr ""
 
 #: conf/global_settings.py:116
-msgid "Ossetic"
+msgid "Norwegian Nynorsk"
 msgstr ""
 
 #: conf/global_settings.py:117
-msgid "Punjabi"
+msgid "Ossetic"
 msgstr ""
 
 #: conf/global_settings.py:118
-msgid "Polish"
+msgid "Punjabi"
 msgstr ""
 
 #: conf/global_settings.py:119
-msgid "Portuguese"
+msgid "Polish"
 msgstr ""
 
 #: conf/global_settings.py:120
-msgid "Brazilian Portuguese"
+msgid "Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:121
-msgid "Romanian"
+msgid "Brazilian Portuguese"
 msgstr ""
 
 #: conf/global_settings.py:122
-msgid "Russian"
+msgid "Romanian"
 msgstr ""
 
 #: conf/global_settings.py:123
-msgid "Slovak"
+msgid "Russian"
 msgstr ""
 
 #: conf/global_settings.py:124
-msgid "Slovenian"
+msgid "Slovak"
 msgstr ""
 
 #: conf/global_settings.py:125
-msgid "Albanian"
+msgid "Slovenian"
 msgstr ""
 
 #: conf/global_settings.py:126
-msgid "Serbian"
+msgid "Albanian"
 msgstr ""
 
 #: conf/global_settings.py:127
-msgid "Serbian Latin"
+msgid "Serbian"
 msgstr ""
 
 #: conf/global_settings.py:128
-msgid "Swedish"
+msgid "Serbian Latin"
 msgstr ""
 
 #: conf/global_settings.py:129
-msgid "Swahili"
+msgid "Swedish"
 msgstr ""
 
 #: conf/global_settings.py:130
-msgid "Tamil"
+msgid "Swahili"
 msgstr ""
 
 #: conf/global_settings.py:131
-msgid "Telugu"
+msgid "Tamil"
 msgstr ""
 
 #: conf/global_settings.py:132
-msgid "Thai"
+msgid "Telugu"
 msgstr ""
 
 #: conf/global_settings.py:133
-msgid "Turkish"
+msgid "Thai"
 msgstr ""
 
 #: conf/global_settings.py:134
-msgid "Tatar"
+msgid "Turkish"
 msgstr ""
 
 #: conf/global_settings.py:135
-msgid "Udmurt"
+msgid "Tatar"
 msgstr ""
 
 #: conf/global_settings.py:136
-msgid "Ukrainian"
+msgid "Udmurt"
 msgstr ""
 
 #: conf/global_settings.py:137
-msgid "Urdu"
+msgid "Ukrainian"
 msgstr ""
 
 #: conf/global_settings.py:138
-msgid "Vietnamese"
+msgid "Urdu"
 msgstr ""
 
 #: conf/global_settings.py:139
-msgid "Simplified Chinese"
+msgid "Vietnamese"
 msgstr ""
 
 #: conf/global_settings.py:140
+msgid "Simplified Chinese"
+msgstr ""
+
+#: conf/global_settings.py:141
 msgid "Traditional Chinese"
 msgstr ""
 
@@ -386,15 +390,15 @@ msgstr ""
 msgid "Syndication"
 msgstr ""
 
-#: core/paginator.py:42
+#: core/paginator.py:45
 msgid "That page number is not an integer"
 msgstr ""
 
-#: core/paginator.py:44
+#: core/paginator.py:47
 msgid "That page number is less than 1"
 msgstr ""
 
-#: core/paginator.py:49
+#: core/paginator.py:52
 msgid "That page contains no results"
 msgstr ""
 
@@ -402,7 +406,7 @@ msgstr ""
 msgid "Enter a valid value."
 msgstr ""
 
-#: core/validators.py:102 forms/fields.py:659
+#: core/validators.py:102 forms/fields.py:658
 msgid "Enter a valid URL."
 msgstr ""
 
@@ -447,17 +451,17 @@ msgstr ""
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:341
+#: core/validators.py:342
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:350
+#: core/validators.py:351
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:360
+#: core/validators.py:361
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d character (it has "
@@ -468,7 +472,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:375
+#: core/validators.py:376
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d character (it has "
@@ -479,25 +483,25 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:394 forms/fields.py:289 forms/fields.py:324
+#: core/validators.py:395 forms/fields.py:290 forms/fields.py:325
 msgid "Enter a number."
 msgstr ""
 
-#: core/validators.py:396
+#: core/validators.py:397
 #, 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:401
+#: core/validators.py:402
 #, 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:406
+#: core/validators.py:407
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
@@ -506,81 +510,81 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:468
+#: core/validators.py:469
 #, python-format
 msgid ""
 "File extension '%(extension)s' is not allowed. Allowed extensions are: "
 "'%(allowed_extensions)s'."
 msgstr ""
 
-#: core/validators.py:520
+#: core/validators.py:521
 msgid "Null characters are not allowed."
 msgstr ""
 
-#: db/models/base.py:1110 forms/models.py:752
+#: db/models/base.py:1156 forms/models.py:756
 msgid "and"
 msgstr ""
 
-#: db/models/base.py:1112
+#: db/models/base.py:1158
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: db/models/fields/__init__.py:105
+#: db/models/fields/__init__.py:104
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:106
+#: db/models/fields/__init__.py:105
 msgid "This field cannot be null."
 msgstr ""
 
-#: db/models/fields/__init__.py:107
+#: db/models/fields/__init__.py:106
 msgid "This field cannot be blank."
 msgstr ""
 
-#: db/models/fields/__init__.py:108
+#: db/models/fields/__init__.py:107
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr ""
 
 #. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
 #. Eg: "Title must be unique for pub_date year"
-#: db/models/fields/__init__.py:112
+#: db/models/fields/__init__.py:111
 #, python-format
 msgid ""
 "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
 msgstr ""
 
-#: db/models/fields/__init__.py:129
+#: db/models/fields/__init__.py:128
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:898 db/models/fields/__init__.py:1766
+#: db/models/fields/__init__.py:899 db/models/fields/__init__.py:1766
 msgid "Integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:902 db/models/fields/__init__.py:1764
+#: db/models/fields/__init__.py:903 db/models/fields/__init__.py:1764
 #, python-format
 msgid "'%(value)s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:977 db/models/fields/__init__.py:1833
+#: db/models/fields/__init__.py:978 db/models/fields/__init__.py:1832
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:989
-#, python-format
-msgid "'%(value)s' value must be either True or False."
-msgstr ""
-
 #: db/models/fields/__init__.py:990
 #, python-format
+msgid "'%(value)s' value must be either True or False."
+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:992
+#: db/models/fields/__init__.py:993
 msgid "Boolean (Either True or False)"
 msgstr ""
 
@@ -666,75 +670,79 @@ msgstr ""
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:1849
+#: db/models/fields/__init__.py:1848
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1880
+#: db/models/fields/__init__.py:1879
 msgid "IP address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1960 db/models/fields/__init__.py:1961
+#: db/models/fields/__init__.py:1959 db/models/fields/__init__.py:1960
 #, python-format
 msgid "'%(value)s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:1963
+#: db/models/fields/__init__.py:1962
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1998
+#: db/models/fields/__init__.py:1997
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:2011
+#: db/models/fields/__init__.py:2010
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:2025
+#: db/models/fields/__init__.py:2024
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:2057
+#: db/models/fields/__init__.py:2056
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:2064
+#: db/models/fields/__init__.py:2063
 msgid "Text"
 msgstr ""
 
-#: db/models/fields/__init__.py:2092
+#: db/models/fields/__init__.py:2091
 #, 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:2094
+#: db/models/fields/__init__.py:2093
 #, 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:2097
+#: db/models/fields/__init__.py:2096
 msgid "Time"
 msgstr ""
 
-#: db/models/fields/__init__.py:2223
+#: db/models/fields/__init__.py:2222
 msgid "URL"
 msgstr ""
 
-#: db/models/fields/__init__.py:2245
+#: db/models/fields/__init__.py:2244
 msgid "Raw binary data"
 msgstr ""
 
-#: db/models/fields/__init__.py:2295
+#: db/models/fields/__init__.py:2294
 #, python-format
 msgid "'%(value)s' is not a valid UUID."
 msgstr ""
 
+#: db/models/fields/__init__.py:2296
+msgid "Universally unique identifier"
+msgstr ""
+
 #: db/models/fields/files.py:221
 msgid "File"
 msgstr ""
@@ -752,21 +760,21 @@ msgstr ""
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1001
+#: db/models/fields/related.py:1007
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1051
+#: db/models/fields/related.py:1057
 #, python-format
 msgid "%(from)s-%(to)s relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1052
+#: db/models/fields/related.py:1058
 #, python-format
 msgid "%(from)s-%(to)s relationships"
 msgstr ""
 
-#: db/models/fields/related.py:1094
+#: db/models/fields/related.py:1100
 msgid "Many-to-many relationship"
 msgstr ""
 
@@ -776,27 +784,27 @@ msgstr ""
 msgid ":?.!"
 msgstr ""
 
-#: forms/fields.py:52
+#: forms/fields.py:53
 msgid "This field is required."
 msgstr ""
 
-#: forms/fields.py:244
+#: forms/fields.py:245
 msgid "Enter a whole number."
 msgstr ""
 
-#: forms/fields.py:395 forms/fields.py:1128
+#: forms/fields.py:396 forms/fields.py:1126
 msgid "Enter a valid date."
 msgstr ""
 
-#: forms/fields.py:419 forms/fields.py:1129
+#: forms/fields.py:420 forms/fields.py:1127
 msgid "Enter a valid time."
 msgstr ""
 
-#: forms/fields.py:441
+#: forms/fields.py:442
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: forms/fields.py:470
+#: forms/fields.py:471
 msgid "Enter a valid duration."
 msgstr ""
 
@@ -805,19 +813,19 @@ msgstr ""
 msgid "The number of days must be between {min_days} and {max_days}."
 msgstr ""
 
-#: forms/fields.py:533
+#: forms/fields.py:532
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: forms/fields.py:534
+#: forms/fields.py:533
 msgid "No file was submitted."
 msgstr ""
 
-#: forms/fields.py:535
+#: forms/fields.py:534
 msgid "The submitted file is empty."
 msgstr ""
 
-#: forms/fields.py:537
+#: forms/fields.py:536
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
 msgid_plural ""
@@ -825,30 +833,30 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:540
+#: forms/fields.py:539
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:601
+#: forms/fields.py:600
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: forms/fields.py:763 forms/fields.py:853 forms/models.py:1272
+#: forms/fields.py:762 forms/fields.py:852 forms/models.py:1270
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: forms/fields.py:854 forms/fields.py:969 forms/models.py:1271
+#: forms/fields.py:853 forms/fields.py:968 forms/models.py:1269
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/fields.py:970
+#: forms/fields.py:969
 msgid "Enter a complete value."
 msgstr ""
 
-#: forms/fields.py:1187
+#: forms/fields.py:1185
 msgid "Enter a valid UUID."
 msgstr ""
 
@@ -888,36 +896,36 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: forms/models.py:747
+#: forms/models.py:751
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:751
+#: forms/models.py:755
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:757
+#: forms/models.py:761
 #, 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:766
+#: forms/models.py:770
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:1093
+#: forms/models.py:1091
 msgid "The inline value did not match the parent instance."
 msgstr ""
 
-#: forms/models.py:1160
+#: forms/models.py:1158
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1274
+#: forms/models.py:1272
 #, python-format
 msgid "\"%(pk)s\" is not a valid value."
 msgstr ""
@@ -1289,18 +1297,18 @@ msgstr ""
 msgid "This is not a valid IPv6 address."
 msgstr ""
 
-#: utils/text.py:70
+#: utils/text.py:67
 #, python-format
 msgctxt "String to return when truncating text"
-msgid "%(truncated_text)s..."
+msgid "%(truncated_text)s…"
 msgstr ""
 
-#: utils/text.py:237
+#: utils/text.py:233
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:256 utils/timesince.py:83
+#: utils/text.py:252 utils/timesince.py:83
 msgid ", "
 msgstr ""
 
@@ -1425,14 +1433,14 @@ msgstr ""
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:585
+#: views/generic/dates.py:589
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:619
+#: views/generic/dates.py:623
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
index 94a6a14853..99e47a85ff 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: 2018-05-21 14:16-0300\n"
+"POT-Creation-Date: 2019-01-16 20:42+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,21 +14,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: contrib/admin/actions.py:45
+#: contrib/admin/actions.py:41
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: contrib/admin/actions.py:54 contrib/admin/options.py:1841
+#: contrib/admin/actions.py:50 contrib/admin/options.py:1862
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: contrib/admin/actions.py:56 contrib/admin/options.py:1843
+#: contrib/admin/actions.py:52 contrib/admin/options.py:1864
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/actions.py:82
+#: contrib/admin/actions.py:79
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr ""
@@ -37,49 +37,49 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/admin/filters.py:108 contrib/admin/filters.py:203
-#: contrib/admin/filters.py:238 contrib/admin/filters.py:272
-#: contrib/admin/filters.py:391
+#: 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
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filters.py:239
+#: contrib/admin/filters.py:243
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filters.py:240
+#: contrib/admin/filters.py:244
 msgid "No"
 msgstr ""
 
-#: contrib/admin/filters.py:250
+#: contrib/admin/filters.py:254
 msgid "Unknown"
 msgstr ""
 
-#: contrib/admin/filters.py:320
+#: contrib/admin/filters.py:324
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filters.py:321
+#: contrib/admin/filters.py:325
 msgid "Today"
 msgstr ""
 
-#: contrib/admin/filters.py:325
+#: contrib/admin/filters.py:329
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filters.py:329
+#: contrib/admin/filters.py:333
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filters.py:333
+#: contrib/admin/filters.py:337
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filters.py:341
+#: contrib/admin/filters.py:345
 msgid "No date"
 msgstr ""
 
-#: contrib/admin/filters.py:342
+#: contrib/admin/filters.py:346
 msgid "Has date"
 msgstr ""
 
@@ -94,12 +94,12 @@ msgstr ""
 msgid "Action:"
 msgstr ""
 
-#: contrib/admin/helpers.py:303
+#: contrib/admin/helpers.py:307
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr ""
 
-#: contrib/admin/helpers.py:306
+#: contrib/admin/helpers.py:310
 msgid "Remove"
 msgstr ""
 
@@ -111,7 +111,7 @@ msgstr ""
 #: contrib/admin/templates/admin/edit_inline/stacked.html:12
 #: contrib/admin/templates/admin/edit_inline/tabular.html:34
 #: contrib/admin/templates/admin/index.html:40
-#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:10
+#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:11
 msgid "Change"
 msgstr ""
 
@@ -135,7 +135,7 @@ msgstr ""
 msgid "object id"
 msgstr ""
 
-#. Translators: 'repr' means representation (https://docs.python.org/3/library/functions.html#repr)
+#. Translators: 'repr' means representation (https://docs.python.org/library/functions.html#repr)
 #: contrib/admin/models.py:58
 msgid "object repr"
 msgstr ""
@@ -184,7 +184,7 @@ msgstr ""
 msgid "Added."
 msgstr ""
 
-#: contrib/admin/models.py:117 contrib/admin/options.py:2055
+#: contrib/admin/models.py:117 contrib/admin/options.py:2093
 msgid "and"
 msgstr ""
 
@@ -207,126 +207,126 @@ msgstr ""
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/options.py:202 contrib/admin/options.py:233
+#: contrib/admin/options.py:204 contrib/admin/options.py:236
 msgid "None"
 msgstr ""
 
-#: contrib/admin/options.py:271
+#: contrib/admin/options.py:274
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: contrib/admin/options.py:1202 contrib/admin/options.py:1226
+#: contrib/admin/options.py:1212 contrib/admin/options.py:1236
 #, python-brace-format
 msgid "The {name} \"{obj}\" was added successfully."
 msgstr ""
 
-#: contrib/admin/options.py:1204
+#: contrib/admin/options.py:1214
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/options.py:1216
+#: contrib/admin/options.py:1226
 #, python-brace-format
 msgid ""
 "The {name} \"{obj}\" was added successfully. You may add another {name} "
 "below."
 msgstr ""
 
-#: contrib/admin/options.py:1266
+#: contrib/admin/options.py:1276
 #, python-brace-format
 msgid ""
 "The {name} \"{obj}\" was changed successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/options.py:1276
+#: 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:1289
+#: 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:1301
+#: contrib/admin/options.py:1311
 #, python-brace-format
 msgid "The {name} \"{obj}\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/options.py:1386 contrib/admin/options.py:1682
+#: contrib/admin/options.py:1388 contrib/admin/options.py:1704
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: contrib/admin/options.py:1405
+#: contrib/admin/options.py:1407
 msgid "No action selected."
 msgstr ""
 
-#: contrib/admin/options.py:1430
+#: contrib/admin/options.py:1432
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/options.py:1509
+#: contrib/admin/options.py:1511
 #, python-format
 msgid "%(name)s with ID \"%(key)s\" doesn't exist. Perhaps it was deleted?"
 msgstr ""
 
-#: contrib/admin/options.py:1596
+#: contrib/admin/options.py:1599
 #, python-format
 msgid "Add %s"
 msgstr ""
 
-#: contrib/admin/options.py:1598
+#: contrib/admin/options.py:1601
 #, python-format
 msgid "Change %s"
 msgstr ""
 
-#: contrib/admin/options.py:1600
+#: contrib/admin/options.py:1603
 #, python-format
 msgid "View %s"
 msgstr ""
 
-#: contrib/admin/options.py:1658
+#: contrib/admin/options.py:1682
 msgid "Database error"
 msgstr ""
 
-#: contrib/admin/options.py:1730
+#: contrib/admin/options.py:1751
 #, 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:1761
+#: contrib/admin/options.py:1782
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/admin/options.py:1769
+#: contrib/admin/options.py:1790
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: contrib/admin/options.py:1886
+#: contrib/admin/options.py:1907
 #, 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:2049
+#: contrib/admin/options.py:2086
 #, python-format
 msgid "%(class_name)s %(instance)s"
 msgstr ""
 
-#: contrib/admin/options.py:2056
+#: contrib/admin/options.py:2095
 #, python-format
 msgid ""
 "Deleting %(class_name)s %(instance)s would require deleting the following "
@@ -345,13 +345,13 @@ msgstr ""
 msgid "Site administration"
 msgstr ""
 
-#: contrib/admin/sites.py:383 contrib/admin/templates/admin/login.html:61
+#: contrib/admin/sites.py:384 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:510
+#: contrib/admin/sites.py:513
 #, python-format
 msgid "%(app)s administration"
 msgstr ""
@@ -519,7 +519,7 @@ msgstr ""
 
 #: contrib/admin/templates/admin/delete_confirmation.html:18
 #: contrib/admin/templates/admin/submit_line.html:7
-#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:24
+#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:25
 msgid "Delete"
 msgstr ""
 
@@ -611,7 +611,7 @@ msgid "Models in the %(name)s application"
 msgstr ""
 
 #: contrib/admin/templates/admin/index.html:31
-#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:17
+#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:18
 msgid "Add"
 msgstr ""
 
@@ -682,22 +682,7 @@ msgid "Save"
 msgstr ""
 
 #: contrib/admin/templates/admin/popup_response.html:3
-msgid "Popup closing..."
-msgstr ""
-
-#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:9
-#, python-format
-msgid "Change selected %(model)s"
-msgstr ""
-
-#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:16
-#, python-format
-msgid "Add another %(model)s"
-msgstr ""
-
-#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:23
-#, python-format
-msgid "Delete selected %(model)s"
+msgid "Popup closing…"
 msgstr ""
 
 #: contrib/admin/templates/admin/search_form.html:7
@@ -736,6 +721,21 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:10
+#, python-format
+msgid "Change selected %(model)s"
+msgstr ""
+
+#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:17
+#, python-format
+msgid "Add another %(model)s"
+msgstr ""
+
+#: contrib/admin/templates/admin/widgets/related_widget_wrapper.html:24
+#, python-format
+msgid "Delete selected %(model)s"
+msgstr ""
+
 #: contrib/admin/templates/registration/logged_out.html:8
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
@@ -848,41 +848,41 @@ msgstr ""
 msgid "Reset my password"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:410
+#: contrib/admin/templatetags/admin_list.py:409
 msgid "All dates"
 msgstr ""
 
-#: contrib/admin/views/main.py:83
+#: contrib/admin/views/main.py:84
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:85
+#: contrib/admin/views/main.py:86
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:87
+#: contrib/admin/views/main.py:88
 #, python-format
 msgid "Select %s to view"
 msgstr ""
 
-#: contrib/admin/widgets.py:101
+#: contrib/admin/widgets.py:91
 msgid "Date:"
 msgstr ""
 
-#: contrib/admin/widgets.py:102
+#: contrib/admin/widgets.py:92
 msgid "Time:"
 msgstr ""
 
-#: contrib/admin/widgets.py:164
+#: contrib/admin/widgets.py:154
 msgid "Lookup"
 msgstr ""
 
-#: contrib/admin/widgets.py:343
+#: contrib/admin/widgets.py:338
 msgid "Currently:"
 msgstr ""
 
-#: contrib/admin/widgets.py:344
+#: contrib/admin/widgets.py:339
 msgid "Change:"
 msgstr ""
diff --git a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
index 4e226e416d..3467bd63e3 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: 2015-10-09 17:42+0200\n"
+"POT-Creation-Date: 2019-01-16 20:42+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -21,47 +21,51 @@ msgstr ""
 msgid "Flat Pages"
 msgstr ""
 
-#: contrib/flatpages/forms.py:8 contrib/flatpages/models.py:12
+#: contrib/flatpages/forms.py:9 contrib/flatpages/models.py:9
 msgid "URL"
 msgstr ""
 
-#: contrib/flatpages/forms.py:9
+#: contrib/flatpages/forms.py:12
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
 
-#: contrib/flatpages/forms.py:12
+#: contrib/flatpages/forms.py:15
 msgid ""
 "This value must contain only letters, numbers, dots, underscores, dashes, "
 "slashes or tildes."
 msgstr ""
 
-#: contrib/flatpages/forms.py:25
+#: contrib/flatpages/forms.py:29
+msgid "Example: '/about/contact'. Make sure to have a leading slash."
+msgstr ""
+
+#: contrib/flatpages/forms.py:42
 msgid "URL is missing a leading slash."
 msgstr ""
 
-#: contrib/flatpages/forms.py:32
+#: contrib/flatpages/forms.py:47
 msgid "URL is missing a trailing slash."
 msgstr ""
 
-#: contrib/flatpages/forms.py:49
+#: contrib/flatpages/forms.py:64
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
-#: contrib/flatpages/models.py:13
+#: contrib/flatpages/models.py:10
 msgid "title"
 msgstr ""
 
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:11
 msgid "content"
 msgstr ""
 
-#: contrib/flatpages/models.py:15
+#: contrib/flatpages/models.py:12
 msgid "enable comments"
 msgstr ""
 
-#: contrib/flatpages/models.py:16
+#: contrib/flatpages/models.py:14
 msgid "template name"
 msgstr ""
 
@@ -71,22 +75,22 @@ msgid ""
 "will use 'flatpages/default.html'."
 msgstr ""
 
-#: contrib/flatpages/models.py:22
+#: contrib/flatpages/models.py:23
 msgid "registration required"
 msgstr ""
 
-#: contrib/flatpages/models.py:23
+#: contrib/flatpages/models.py:24
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 
-#: contrib/flatpages/models.py:25
+#: contrib/flatpages/models.py:27
 msgid "sites"
 msgstr ""
 
-#: contrib/flatpages/models.py:29
+#: contrib/flatpages/models.py:31
 msgid "flat page"
 msgstr ""
 
-#: contrib/flatpages/models.py:30
+#: contrib/flatpages/models.py:32
 msgid "flat pages"
 msgstr ""
diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
index e63dc9cd44..d4239a187a 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: 2018-05-17 11:49+0200\n"
+"POT-Creation-Date: 2019-01-16 20:42+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,370 +19,394 @@ msgid "Humanize"
 msgstr ""
 
 #. Translators: Ordinal format for 11 (11th), 12 (12th), and 13 (13th).
-#: contrib/humanize/templatetags/humanize.py:30
+#: contrib/humanize/templatetags/humanize.py:31
 msgctxt "ordinal 11, 12, 13"
 msgid "{}th"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 0, e.g. 80th.
-#: contrib/humanize/templatetags/humanize.py:34
+#: contrib/humanize/templatetags/humanize.py:35
 msgctxt "ordinal 0"
 msgid "{}th"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 1, e.g. 81st, except 11.
-#: contrib/humanize/templatetags/humanize.py:36
+#: contrib/humanize/templatetags/humanize.py:37
 msgctxt "ordinal 1"
 msgid "{}st"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 2, e.g. 82nd, except 12.
-#: contrib/humanize/templatetags/humanize.py:38
+#: contrib/humanize/templatetags/humanize.py:39
 msgctxt "ordinal 2"
 msgid "{}nd"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 3, e.g. 83th, except 13.
-#: contrib/humanize/templatetags/humanize.py:40
+#: contrib/humanize/templatetags/humanize.py:41
 msgctxt "ordinal 3"
 msgid "{}rd"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 4, e.g. 84th.
-#: contrib/humanize/templatetags/humanize.py:42
+#: contrib/humanize/templatetags/humanize.py:43
 msgctxt "ordinal 4"
 msgid "{}th"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 5, e.g. 85th.
-#: contrib/humanize/templatetags/humanize.py:44
+#: contrib/humanize/templatetags/humanize.py:45
 msgctxt "ordinal 5"
 msgid "{}th"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 6, e.g. 86th.
-#: contrib/humanize/templatetags/humanize.py:46
+#: contrib/humanize/templatetags/humanize.py:47
 msgctxt "ordinal 6"
 msgid "{}th"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 7, e.g. 87th.
-#: contrib/humanize/templatetags/humanize.py:48
+#: contrib/humanize/templatetags/humanize.py:49
 msgctxt "ordinal 7"
 msgid "{}th"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 8, e.g. 88th.
-#: contrib/humanize/templatetags/humanize.py:50
+#: contrib/humanize/templatetags/humanize.py:51
 msgctxt "ordinal 8"
 msgid "{}th"
 msgstr ""
 
 #. Translators: Ordinal format when value ends with 9, e.g. 89th.
-#: contrib/humanize/templatetags/humanize.py:52
+#: contrib/humanize/templatetags/humanize.py:53
 msgctxt "ordinal 9"
 msgid "{}th"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:84
+#: 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:85
+#: contrib/humanize/templatetags/humanize.py:86
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:88
+#: 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:89
+#: contrib/humanize/templatetags/humanize.py:90
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:92
+#: 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:93
+#: contrib/humanize/templatetags/humanize.py:94
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:96
+#: 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:97
+#: contrib/humanize/templatetags/humanize.py:98
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:100
+#: 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:101
+#: contrib/humanize/templatetags/humanize.py:102
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:104
+#: 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:105
+#: contrib/humanize/templatetags/humanize.py:106
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:108
+#: 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:109
+#: contrib/humanize/templatetags/humanize.py:110
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:112
+#: 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:113
+#: contrib/humanize/templatetags/humanize.py:114
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:116
+#: 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:117
+#: contrib/humanize/templatetags/humanize.py:118
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:120
+#: 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:121
+#: contrib/humanize/templatetags/humanize.py:122
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:124
+#: 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:125
+#: contrib/humanize/templatetags/humanize.py:126
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:176
+#: contrib/humanize/templatetags/humanize.py:177
 msgid "one"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:176
+#: contrib/humanize/templatetags/humanize.py:177
 msgid "two"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:176
+#: contrib/humanize/templatetags/humanize.py:177
 msgid "three"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:176
+#: contrib/humanize/templatetags/humanize.py:177
 msgid "four"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:176
+#: contrib/humanize/templatetags/humanize.py:177
 msgid "five"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:177
+#: contrib/humanize/templatetags/humanize.py:178
 msgid "six"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:177
+#: contrib/humanize/templatetags/humanize.py:178
 msgid "seven"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:177
+#: contrib/humanize/templatetags/humanize.py:178
 msgid "eight"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:177
+#: contrib/humanize/templatetags/humanize.py:178
 msgid "nine"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:201
+#: contrib/humanize/templatetags/humanize.py:199
 msgid "today"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:203
+#: contrib/humanize/templatetags/humanize.py:201
 msgid "tomorrow"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:205
+#: contrib/humanize/templatetags/humanize.py:203
 msgid "yesterday"
 msgstr ""
 
 #. Translators: delta will contain a string like '2 months' or '1 month, 2 weeks'
-#: contrib/humanize/templatetags/humanize.py:225
+#: contrib/humanize/templatetags/humanize.py:221
 #, python-format
 msgid "%(delta)s ago"
 msgstr ""
 
-#. Translators: 'naturaltime-past' strings will be included in
-#. '%(delta)s ago'
-#: contrib/humanize/templatetags/humanize.py:228
-#, python-format
-msgctxt "naturaltime-past"
-msgid "%d year"
-msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:229
-#, python-format
-msgctxt "naturaltime-past"
-msgid "%d month"
-msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:230
-#, python-format
-msgctxt "naturaltime-past"
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:231
-#, python-format
-msgctxt "naturaltime-past"
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:232
-#, python-format
-msgctxt "naturaltime-past"
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:233
-#, python-format
-msgctxt "naturaltime-past"
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/humanize/templatetags/humanize.py:236
-#: contrib/humanize/templatetags/humanize.py:272
-msgid "now"
-msgstr ""
-
-#. Translators: please keep a non-breaking space (U+00A0)
-#. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:241
-#, python-format
-msgid "a second ago"
-msgid_plural "%(count)s seconds ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Translators: please keep a non-breaking space (U+00A0)
-#. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:248
-#, python-format
-msgid "a minute ago"
-msgid_plural "%(count)s minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Translators: please keep a non-breaking space (U+00A0)
-#. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:255
+#. Translators: please keep a non-breaking space (U+00A0) between count
+#. and time unit.
+#: contrib/humanize/templatetags/humanize.py:224
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
+#. Translators: please keep a non-breaking space (U+00A0) between count
+#. and time unit.
+#: contrib/humanize/templatetags/humanize.py:227
+#, python-format
+msgid "a minute ago"
+msgid_plural "%(count)s minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Translators: please keep a non-breaking space (U+00A0) between count
+#. and time unit.
+#: contrib/humanize/templatetags/humanize.py:230
+#, python-format
+msgid "a second ago"
+msgid_plural "%(count)s seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/humanize/templatetags/humanize.py:231
+msgid "now"
+msgstr ""
+
+#. Translators: please keep a non-breaking space (U+00A0) between count
+#. and time unit.
+#: contrib/humanize/templatetags/humanize.py:234
+#, python-format
+msgid "a second from now"
+msgid_plural "%(count)s seconds from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Translators: please keep a non-breaking space (U+00A0) between count
+#. and time unit.
+#: contrib/humanize/templatetags/humanize.py:237
+#, python-format
+msgid "a minute from now"
+msgid_plural "%(count)s minutes from now"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Translators: please keep a non-breaking space (U+00A0) between count
+#. and time unit.
+#: contrib/humanize/templatetags/humanize.py:240
+#, python-format
+msgid "an hour from now"
+msgid_plural "%(count)s hours from now"
+msgstr[0] ""
+msgstr[1] ""
+
 #. Translators: delta will contain a string like '2 months' or '1 month, 2 weeks'
-#: contrib/humanize/templatetags/humanize.py:261
+#: contrib/humanize/templatetags/humanize.py:242
 #, python-format
 msgid "%(delta)s from now"
 msgstr ""
 
-#. Translators: 'naturaltime-future' strings will be included in
-#. '%(delta)s from now'
-#: contrib/humanize/templatetags/humanize.py:264
+#. Translators: 'naturaltime-past' strings will be included in '%(delta)s ago'
+#: contrib/humanize/templatetags/humanize.py:246
+#, python-format
+msgctxt "naturaltime-past"
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/humanize/templatetags/humanize.py:247
+#, python-format
+msgctxt "naturaltime-past"
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/humanize/templatetags/humanize.py:248
+#, python-format
+msgctxt "naturaltime-past"
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/humanize/templatetags/humanize.py:249
+#, python-format
+msgctxt "naturaltime-past"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/humanize/templatetags/humanize.py:250
+#, python-format
+msgctxt "naturaltime-past"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/humanize/templatetags/humanize.py:251
+#, python-format
+msgctxt "naturaltime-past"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Translators: 'naturaltime-future' strings will be included in '%(delta)s from now'
+#: contrib/humanize/templatetags/humanize.py:255
 #, python-format
 msgctxt "naturaltime-future"
 msgid "%d year"
@@ -390,7 +414,7 @@ msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:265
+#: contrib/humanize/templatetags/humanize.py:256
 #, python-format
 msgctxt "naturaltime-future"
 msgid "%d month"
@@ -398,7 +422,7 @@ msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:266
+#: contrib/humanize/templatetags/humanize.py:257
 #, python-format
 msgctxt "naturaltime-future"
 msgid "%d week"
@@ -406,7 +430,7 @@ msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:267
+#: contrib/humanize/templatetags/humanize.py:258
 #, python-format
 msgctxt "naturaltime-future"
 msgid "%d day"
@@ -414,7 +438,7 @@ msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:268
+#: contrib/humanize/templatetags/humanize.py:259
 #, python-format
 msgctxt "naturaltime-future"
 msgid "%d hour"
@@ -422,37 +446,10 @@ msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:269
+#: contrib/humanize/templatetags/humanize.py:260
 #, python-format
 msgctxt "naturaltime-future"
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
-
-#. Translators: please keep a non-breaking space (U+00A0)
-#. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:277
-#, python-format
-msgid "a second from now"
-msgid_plural "%(count)s seconds from now"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Translators: please keep a non-breaking space (U+00A0)
-#. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:284
-#, python-format
-msgid "a minute from now"
-msgid_plural "%(count)s minutes from now"
-msgstr[0] ""
-msgstr[1] ""
-
-#. Translators: please keep a non-breaking space (U+00A0)
-#. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:291
-#, python-format
-msgid "an hour from now"
-msgid_plural "%(count)s hours from now"
-msgstr[0] ""
-msgstr[1] ""