From f717cb2ab4accd9e808449bb0a59b6c5b35059f1 Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Fri, 9 Oct 2015 18:00:06 +0200
Subject: [PATCH] [1.9.x] Updated translation catalogs

---
 django/conf/locale/en/LC_MESSAGES/django.po   | 724 +++++++++---------
 .../admin/locale/en/LC_MESSAGES/django.po     | 198 ++---
 .../admin/locale/en/LC_MESSAGES/djangojs.po   |  76 +-
 .../admindocs/locale/en/LC_MESSAGES/django.po |  98 ++-
 .../auth/locale/en/LC_MESSAGES/django.po      | 187 +++--
 .../flatpages/locale/en/LC_MESSAGES/django.po |   8 +-
 .../gis/locale/en/LC_MESSAGES/django.po       |  37 +-
 .../postgres/locale/en/LC_MESSAGES/django.po  |  27 +-
 .../redirects/locale/en/LC_MESSAGES/django.po |   8 +-
 9 files changed, 724 insertions(+), 639 deletions(-)

diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index ad4ab8b066..9de4200e66 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: 2015-03-18 09:16+0100\n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -341,11 +341,11 @@ msgstr ""
 msgid "Vietnamese"
 msgstr ""
 
-#: conf/global_settings.py:133 conf/global_settings.py:134
+#: conf/global_settings.py:133
 msgid "Simplified Chinese"
 msgstr ""
 
-#: conf/global_settings.py:135 conf/global_settings.py:136
+#: conf/global_settings.py:134
 msgid "Traditional Chinese"
 msgstr ""
 
@@ -357,71 +357,77 @@ msgstr ""
 msgid "Site Maps"
 msgstr ""
 
-#: contrib/staticfiles/apps.py:8
+#: contrib/staticfiles/apps.py:7
 msgid "Static Files"
 msgstr ""
 
-#: contrib/syndication/apps.py:8
+#: contrib/syndication/apps.py:7
 msgid "Syndication"
 msgstr ""
 
-#: contrib/webdesign/apps.py:8
+#: contrib/webdesign/apps.py:7
 msgid "Web Design"
 msgstr ""
 
-#: core/validators.py:21
+#: core/validators.py:33
 msgid "Enter a valid value."
 msgstr ""
 
-#: core/validators.py:88 forms/fields.py:708
+#: core/validators.py:98 forms/fields.py:677
 msgid "Enter a valid URL."
 msgstr ""
 
-#: core/validators.py:134
+#: core/validators.py:141
 msgid "Enter a valid integer."
 msgstr ""
 
-#: core/validators.py:139
+#: core/validators.py:152
 msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:213
+#: core/validators.py:225
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: core/validators.py:218 core/validators.py:237
+#: core/validators.py:232
+msgid ""
+"Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, or "
+"hyphens."
+msgstr ""
+
+#: core/validators.py:237 core/validators.py:256
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: core/validators.py:223 core/validators.py:238
+#: core/validators.py:242 core/validators.py:257
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:233 core/validators.py:236
+#: core/validators.py:252 core/validators.py:255
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:261 db/models/fields/__init__.py:1133
+#: core/validators.py:284 db/models/fields/__init__.py:1147
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: core/validators.py:270
+#: core/validators.py:292
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:296
+#: core/validators.py:318
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:303
+#: core/validators.py:325
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:312
+#: core/validators.py:334
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d character (it has "
@@ -432,7 +438,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:323
+#: core/validators.py:345
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d character (it has "
@@ -443,271 +449,21 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: db/models/base.py:1089 forms/models.py:721
-msgid "and"
-msgstr ""
-
-#: db/models/base.py:1091
-#, python-format
-msgid "%(model_name)s with this %(field_labels)s already exists."
-msgstr ""
-
-#: db/models/fields/__init__.py:107
-#, python-format
-msgid "Value %(value)r is not a valid choice."
-msgstr ""
-
-#: db/models/fields/__init__.py:108
-msgid "This field cannot be null."
-msgstr ""
-
-#: db/models/fields/__init__.py:109
-msgid "This field cannot be blank."
-msgstr ""
-
-#: db/models/fields/__init__.py:110
-#, 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:114
-#, python-format
-msgid ""
-"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-msgstr ""
-
-#: db/models/fields/__init__.py:132
-#, python-format
-msgid "Field of type: %(field_type)s"
-msgstr ""
-
-#: db/models/fields/__init__.py:911 db/models/fields/__init__.py:1814
-msgid "Integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:915 db/models/fields/__init__.py:1812
-#, python-format
-msgid "'%(value)s' value must be an integer."
-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:992
-msgid "Boolean (Either True or False)"
-msgstr ""
-
-#: db/models/fields/__init__.py:1067
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr ""
-
-#: db/models/fields/__init__.py:1128
-msgid "Comma-separated integers"
-msgstr ""
-
-#: db/models/fields/__init__.py:1177
-#, 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:1179 db/models/fields/__init__.py:1329
-#, 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:1182
-msgid "Date (without time)"
-msgstr ""
-
-#: db/models/fields/__init__.py:1327
-#, 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:1331
-#, 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:1335
-msgid "Date (with time)"
-msgstr ""
-
-#: db/models/fields/__init__.py:1487
-#, python-format
-msgid "'%(value)s' value must be a decimal number."
-msgstr ""
-
-#: db/models/fields/__init__.py:1489
-msgid "Decimal number"
-msgstr ""
-
-#: db/models/fields/__init__.py:1640
-#, 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:1643
-msgid "Duration"
-msgstr ""
-
-#: db/models/fields/__init__.py:1687
-msgid "Email address"
-msgstr ""
-
-#: db/models/fields/__init__.py:1711
-msgid "File path"
-msgstr ""
-
-#: db/models/fields/__init__.py:1778
-#, python-format
-msgid "'%(value)s' value must be a float."
-msgstr ""
-
-#: db/models/fields/__init__.py:1780
-msgid "Floating point number"
-msgstr ""
-
-#: db/models/fields/__init__.py:1881
-msgid "Big (8 byte) integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:1896
-msgid "IPv4 address"
-msgstr ""
-
-#: db/models/fields/__init__.py:1932
-msgid "IP address"
-msgstr ""
-
-#: db/models/fields/__init__.py:2011
-#, python-format
-msgid "'%(value)s' value must be either None, True or False."
-msgstr ""
-
-#: db/models/fields/__init__.py:2013
-msgid "Boolean (Either True, False or None)"
-msgstr ""
-
-#: db/models/fields/__init__.py:2073
-msgid "Positive integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:2085
-msgid "Positive small integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:2098
-#, python-format
-msgid "Slug (up to %(max_length)s)"
-msgstr ""
-
-#: db/models/fields/__init__.py:2127
-msgid "Small integer"
-msgstr ""
-
-#: db/models/fields/__init__.py:2134
-msgid "Text"
-msgstr ""
-
-#: db/models/fields/__init__.py:2157
-#, 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:2159
-#, 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:2162
-msgid "Time"
-msgstr ""
-
-#: db/models/fields/__init__.py:2290
-msgid "URL"
-msgstr ""
-
-#: db/models/fields/__init__.py:2313
-msgid "Raw binary data"
-msgstr ""
-
-#: db/models/fields/__init__.py:2357
-#, python-format
-msgid "'%(value)s' is not a valid UUID."
-msgstr ""
-
-#: db/models/fields/files.py:239
-msgid "File"
-msgstr ""
-
-#: db/models/fields/files.py:389
-msgid "Image"
-msgstr ""
-
-#: db/models/fields/related.py:1798
-#, python-format
-msgid "%(model)s instance with %(field)s %(value)r does not exist."
-msgstr ""
-
-#: db/models/fields/related.py:1800
-msgid "Foreign Key (type determined by related field)"
-msgstr ""
-
-#: db/models/fields/related.py:2013
-msgid "One-to-one relationship"
-msgstr ""
-
-#: db/models/fields/related.py:2103
-msgid "Many-to-many relationship"
-msgstr ""
-
-#: forms/fields.py:64
-msgid "This field is required."
-msgstr ""
-
-#: forms/fields.py:237
-msgid "Enter a whole number."
-msgstr ""
-
-#: forms/fields.py:280 forms/fields.py:317
-msgid "Enter a number."
-msgstr ""
-
-#: forms/fields.py:319
+#: core/validators.py:359
 #, python-format
 msgid "Ensure that there are no more than %(max)s digit in total."
 msgid_plural "Ensure that there are no more than %(max)s digits in total."
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:323
+#: core/validators.py:364
 #, python-format
 msgid "Ensure that there are no more than %(max)s decimal place."
 msgid_plural "Ensure that there are no more than %(max)s decimal places."
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:327
+#: core/validators.py:369
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
@@ -716,35 +472,291 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:438 forms/fields.py:1189
+#: db/models/base.py:1095 forms/models.py:727
+msgid "and"
+msgstr ""
+
+#: db/models/base.py:1097
+#, python-format
+msgid "%(model_name)s with this %(field_labels)s already exists."
+msgstr ""
+
+#: db/models/fields/__init__.py:110
+#, python-format
+msgid "Value %(value)r is not a valid choice."
+msgstr ""
+
+#: db/models/fields/__init__.py:111
+msgid "This field cannot be null."
+msgstr ""
+
+#: db/models/fields/__init__.py:112
+msgid "This field cannot be blank."
+msgstr ""
+
+#: db/models/fields/__init__.py:113
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr ""
+
+#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'.
+#. Eg: "Title must be unique for pub_date year"
+#: db/models/fields/__init__.py:117
+#, python-format
+msgid ""
+"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
+msgstr ""
+
+#: db/models/fields/__init__.py:134
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr ""
+
+#: db/models/fields/__init__.py:930 db/models/fields/__init__.py:1834
+msgid "Integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:934 db/models/fields/__init__.py:1832
+#, python-format
+msgid "'%(value)s' value must be an integer."
+msgstr ""
+
+#: db/models/fields/__init__.py:1009
+#, python-format
+msgid "'%(value)s' value must be either True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:1011
+msgid "Boolean (Either True or False)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1086
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1142
+msgid "Comma-separated integers"
+msgstr ""
+
+#: db/models/fields/__init__.py:1191
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1193 db/models/fields/__init__.py:1336
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid "
+"date."
+msgstr ""
+
+#: db/models/fields/__init__.py:1196
+msgid "Date (without time)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1334
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
+"uuuuuu]][TZ] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1338
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"[TZ]) but it is an invalid date/time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1342
+msgid "Date (with time)"
+msgstr ""
+
+#: db/models/fields/__init__.py:1494
+#, python-format
+msgid "'%(value)s' value must be a decimal number."
+msgstr ""
+
+#: db/models/fields/__init__.py:1496
+msgid "Decimal number"
+msgstr ""
+
+#: db/models/fields/__init__.py:1653
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
+"uuuuuu] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1656
+msgid "Duration"
+msgstr ""
+
+#: db/models/fields/__init__.py:1707
+msgid "Email address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1731
+msgid "File path"
+msgstr ""
+
+#: db/models/fields/__init__.py:1798
+#, python-format
+msgid "'%(value)s' value must be a float."
+msgstr ""
+
+#: db/models/fields/__init__.py:1800
+msgid "Floating point number"
+msgstr ""
+
+#: db/models/fields/__init__.py:1901
+msgid "Big (8 byte) integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:1916
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1947
+msgid "IP address"
+msgstr ""
+
+#: db/models/fields/__init__.py:2031
+#, python-format
+msgid "'%(value)s' value must be either None, True or False."
+msgstr ""
+
+#: db/models/fields/__init__.py:2033
+msgid "Boolean (Either True, False or None)"
+msgstr ""
+
+#: db/models/fields/__init__.py:2093
+msgid "Positive integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:2105
+msgid "Positive small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:2118
+#, python-format
+msgid "Slug (up to %(max_length)s)"
+msgstr ""
+
+#: db/models/fields/__init__.py:2152
+msgid "Small integer"
+msgstr ""
+
+#: db/models/fields/__init__.py:2159
+msgid "Text"
+msgstr ""
+
+#: db/models/fields/__init__.py:2185
+#, python-format
+msgid ""
+"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] "
+"format."
+msgstr ""
+
+#: db/models/fields/__init__.py:2187
+#, python-format
+msgid ""
+"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an "
+"invalid time."
+msgstr ""
+
+#: db/models/fields/__init__.py:2190
+msgid "Time"
+msgstr ""
+
+#: db/models/fields/__init__.py:2318
+msgid "URL"
+msgstr ""
+
+#: db/models/fields/__init__.py:2341
+msgid "Raw binary data"
+msgstr ""
+
+#: db/models/fields/__init__.py:2385
+#, python-format
+msgid "'%(value)s' is not a valid UUID."
+msgstr ""
+
+#: db/models/fields/files.py:237
+msgid "File"
+msgstr ""
+
+#: db/models/fields/files.py:392
+msgid "Image"
+msgstr ""
+
+#: db/models/fields/related.py:723
+#, python-format
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
+msgstr ""
+
+#: db/models/fields/related.py:725
+msgid "Foreign Key (type determined by related field)"
+msgstr ""
+
+#: db/models/fields/related.py:983
+msgid "One-to-one relationship"
+msgstr ""
+
+#: db/models/fields/related.py:1100
+msgid "Many-to-many relationship"
+msgstr ""
+
+#. Translators: If found as last label character, these punctuation
+#. characters will prevent the default label_suffix to be appended to the label
+#: forms/boundfield.py:167
+msgid ":?.!"
+msgstr ""
+
+#: forms/fields.py:65
+msgid "This field is required."
+msgstr ""
+
+#: forms/fields.py:254
+msgid "Enter a whole number."
+msgstr ""
+
+#: forms/fields.py:299 forms/fields.py:336
+msgid "Enter a number."
+msgstr ""
+
+#: forms/fields.py:414 forms/fields.py:1158
 msgid "Enter a valid date."
 msgstr ""
 
-#: forms/fields.py:462 forms/fields.py:1190
+#: forms/fields.py:438 forms/fields.py:1159
 msgid "Enter a valid time."
 msgstr ""
 
-#: forms/fields.py:484
+#: forms/fields.py:460
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: forms/fields.py:525
+#: forms/fields.py:489
 msgid "Enter a valid duration."
 msgstr ""
 
-#: forms/fields.py:589
+#: forms/fields.py:556
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: forms/fields.py:590
+#: forms/fields.py:557
 msgid "No file was submitted."
 msgstr ""
 
-#: forms/fields.py:591
+#: forms/fields.py:558
 msgid "The submitted file is empty."
 msgstr ""
 
-#: forms/fields.py:593
+#: forms/fields.py:560
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
 msgid_plural ""
@@ -752,197 +764,191 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:596
+#: forms/fields.py:563
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:658
+#: forms/fields.py:625
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: forms/fields.py:823 forms/fields.py:917 forms/models.py:1220
+#: forms/fields.py:792 forms/fields.py:886 forms/models.py:1230
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: forms/fields.py:918 forms/fields.py:1033 forms/models.py:1219
+#: forms/fields.py:887 forms/fields.py:1002 forms/models.py:1229
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/fields.py:1034
+#: forms/fields.py:1003
 msgid "Enter a complete value."
 msgstr ""
 
-#: forms/fields.py:1260
+#: forms/fields.py:1217
 msgid "Enter a valid UUID."
 msgstr ""
 
 #. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:125
+#: forms/forms.py:84
 msgid ":"
 msgstr ""
 
-#: forms/forms.py:207
+#: forms/forms.py:191
 #, python-format
 msgid "(Hidden field %(name)s) %(error)s"
 msgstr ""
 
-#. Translators: If found as last label character, these punctuation
-#. characters will prevent the default label_suffix to be appended to the label
-#: forms/forms.py:652
-msgid ":?.!"
-msgstr ""
-
-#: forms/formsets.py:95
+#: forms/formsets.py:97
 msgid "ManagementForm data is missing or has been tampered with"
 msgstr ""
 
-#: forms/formsets.py:332
+#: forms/formsets.py:345
 #, python-format
 msgid "Please submit %d or fewer forms."
 msgid_plural "Please submit %d or fewer forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/formsets.py:339
+#: forms/formsets.py:352
 #, python-format
 msgid "Please submit %d or more forms."
 msgid_plural "Please submit %d or more forms."
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/formsets.py:367 forms/formsets.py:369
+#: forms/formsets.py:380 forms/formsets.py:382
 msgid "Order"
 msgstr ""
 
-#: forms/formsets.py:371
+#: forms/formsets.py:384
 msgid "Delete"
 msgstr ""
 
-#: forms/models.py:715
+#: forms/models.py:721
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:719
+#: forms/models.py:725
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:725
+#: forms/models.py:731
 #, 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:733
+#: forms/models.py:739
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:1039
+#: forms/models.py:1063
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:1105
+#: forms/models.py:1123
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1222
+#: forms/models.py:1232
 #, python-format
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/utils.py:165
+#: forms/utils.py:172
 #, python-format
 msgid ""
 "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it "
 "may be ambiguous or it may not exist."
 msgstr ""
 
-#: forms/widgets.py:343
+#: forms/widgets.py:353
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:344
+#: forms/widgets.py:354
 msgid "Change"
 msgstr ""
 
-#: forms/widgets.py:345
+#: forms/widgets.py:355
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:553
+#: forms/widgets.py:570
 msgid "Unknown"
 msgstr ""
 
-#: forms/widgets.py:554
+#: forms/widgets.py:571
 msgid "Yes"
 msgstr ""
 
-#: forms/widgets.py:555
+#: forms/widgets.py:572
 msgid "No"
 msgstr ""
 
-#: template/defaultfilters.py:859
+#: template/defaultfilters.py:867
 msgid "yes,no,maybe"
 msgstr ""
 
-#: template/defaultfilters.py:888 template/defaultfilters.py:900
+#: template/defaultfilters.py:896 template/defaultfilters.py:908
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/defaultfilters.py:902
+#: template/defaultfilters.py:910
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:904
+#: template/defaultfilters.py:912
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: template/defaultfilters.py:906
+#: template/defaultfilters.py:914
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: template/defaultfilters.py:908
+#: template/defaultfilters.py:916
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:910
+#: template/defaultfilters.py:918
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: utils/dateformat.py:59
+#: utils/dateformat.py:61
 msgid "p.m."
 msgstr ""
 
-#: utils/dateformat.py:60
+#: utils/dateformat.py:62
 msgid "a.m."
 msgstr ""
 
-#: utils/dateformat.py:65
+#: utils/dateformat.py:67
 msgid "PM"
 msgstr ""
 
-#: utils/dateformat.py:66
+#: utils/dateformat.py:68
 msgid "AM"
 msgstr ""
 
-#: utils/dateformat.py:149
+#: utils/dateformat.py:151
 msgid "midnight"
 msgstr ""
 
-#: utils/dateformat.py:151
+#: utils/dateformat.py:153
 msgid "noon"
 msgstr ""
 
@@ -1222,76 +1228,76 @@ msgstr ""
 msgid "This is not a valid IPv6 address."
 msgstr ""
 
-#: utils/text.py:79
+#: utils/text.py:77
 #, python-format
 msgctxt "String to return when truncating text"
 msgid "%(truncated_text)s..."
 msgstr ""
 
-#: utils/text.py:248
+#: utils/text.py:246
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:267 utils/timesince.py:57
+#: utils/text.py:265 utils/timesince.py:63
 msgid ", "
 msgstr ""
 
-#: utils/timesince.py:25
+#: utils/timesince.py:11
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:26
+#: utils/timesince.py:12
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:27
+#: utils/timesince.py:13
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:28
+#: utils/timesince.py:14
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:29
+#: utils/timesince.py:15
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:30
+#: utils/timesince.py:16
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:46
+#: utils/timesince.py:52
 msgid "0 minutes"
 msgstr ""
 
-#: views/csrf.py:106
+#: views/csrf.py:107
 msgid "Forbidden"
 msgstr ""
 
-#: views/csrf.py:107
+#: views/csrf.py:108
 msgid "CSRF verification failed. Request aborted."
 msgstr ""
 
-#: views/csrf.py:111
+#: views/csrf.py:112
 msgid ""
 "You are seeing this message because this HTTPS site requires a 'Referer "
 "header' to be sent by your Web browser, but none was sent. This header is "
@@ -1299,83 +1305,83 @@ msgid ""
 "hijacked by third parties."
 msgstr ""
 
-#: views/csrf.py:116
+#: views/csrf.py:117
 msgid ""
 "If you have configured your browser to disable 'Referer' headers, please re-"
 "enable them, at least for this site, or for HTTPS connections, or for 'same-"
 "origin' requests."
 msgstr ""
 
-#: views/csrf.py:121
+#: views/csrf.py:122
 msgid ""
 "You are seeing this message because this site requires a CSRF cookie when "
 "submitting forms. This cookie is required for security reasons, to ensure "
 "that your browser is not being hijacked by third parties."
 msgstr ""
 
-#: views/csrf.py:126
+#: views/csrf.py:127
 msgid ""
 "If you have configured your browser to disable cookies, please re-enable "
 "them, at least for this site, or for 'same-origin' requests."
 msgstr ""
 
-#: views/csrf.py:131
+#: views/csrf.py:132
 msgid "More information is available with DEBUG=True."
 msgstr ""
 
-#: views/debug.py:582
+#: views/debug.py:508
 msgid "Welcome to Django"
 msgstr ""
 
-#: views/debug.py:583
+#: views/debug.py:509
 msgid "It worked!"
 msgstr ""
 
-#: views/debug.py:584
+#: views/debug.py:510
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 
-#: views/debug.py:585
+#: views/debug.py:511
 msgid ""
 "Of course, you haven't actually done any work yet. Next, start your first "
 "app by running <code>python manage.py startapp [app_label]</code>."
 msgstr ""
 
-#: views/debug.py:587
+#: views/debug.py:513
 msgid ""
 "You're seeing this message because you have <code>DEBUG = True</code> in "
 "your Django settings file and you haven't configured any URLs. Get to work!"
 msgstr ""
 
-#: views/generic/dates.py:43
+#: views/generic/dates.py:48
 msgid "No year specified"
 msgstr ""
 
-#: views/generic/dates.py:99
+#: views/generic/dates.py:104
 msgid "No month specified"
 msgstr ""
 
-#: views/generic/dates.py:158
+#: views/generic/dates.py:163
 msgid "No day specified"
 msgstr ""
 
-#: views/generic/dates.py:214
+#: views/generic/dates.py:219
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:373 views/generic/dates.py:401
+#: views/generic/dates.py:378 views/generic/dates.py:406
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:655
+#: views/generic/dates.py:660
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:689
+#: views/generic/dates.py:694
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
@@ -1399,16 +1405,16 @@ msgstr ""
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
 
-#: views/static.py:56
+#: views/static.py:58
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:58
+#: views/static.py:60
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:98
+#: views/static.py:100
 #, python-format
 msgid "Index of %(directory)s"
 msgstr ""
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
index 8bce097676..0fe256158d 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: 2015-01-17 11:07+0100\n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: contrib/admin/actions.py:62 contrib/admin/options.py:1722
+#: contrib/admin/actions.py:62 contrib/admin/options.py:1641
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: contrib/admin/actions.py:64 contrib/admin/options.py:1724
+#: contrib/admin/actions.py:64 contrib/admin/options.py:1643
 msgid "Are you sure?"
 msgstr ""
 
@@ -36,268 +36,281 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/admin/filters.py:105 contrib/admin/filters.py:203
-#: contrib/admin/filters.py:243 contrib/admin/filters.py:280
-#: contrib/admin/filters.py:396
+#: contrib/admin/filters.py:105 contrib/admin/filters.py:205
+#: contrib/admin/filters.py:241 contrib/admin/filters.py:278
+#: contrib/admin/filters.py:386
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filters.py:244
+#: contrib/admin/filters.py:242
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filters.py:245
+#: contrib/admin/filters.py:243
 msgid "No"
 msgstr ""
 
-#: contrib/admin/filters.py:259
+#: contrib/admin/filters.py:257
 msgid "Unknown"
 msgstr ""
 
-#: contrib/admin/filters.py:319
+#: contrib/admin/filters.py:317
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filters.py:320
+#: contrib/admin/filters.py:318
 msgid "Today"
 msgstr ""
 
-#: contrib/admin/filters.py:324
+#: contrib/admin/filters.py:322
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filters.py:328
+#: contrib/admin/filters.py:326
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filters.py:332
+#: contrib/admin/filters.py:330
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/forms.py:14
+#: contrib/admin/forms.py:13
 #, python-format
 msgid ""
 "Please enter the correct %(username)s and password for a staff account. Note "
 "that both fields may be case-sensitive."
 msgstr ""
 
-#: contrib/admin/helpers.py:27
+#: contrib/admin/helpers.py:30
 msgid "Action:"
 msgstr ""
 
-#: contrib/admin/models.py:30
+#: contrib/admin/models.py:34
 msgid "action time"
 msgstr ""
 
-#: contrib/admin/models.py:33
+#: contrib/admin/models.py:41
+msgid "user"
+msgstr ""
+
+#: contrib/admin/models.py:46
+msgid "content type"
+msgstr ""
+
+#: contrib/admin/models.py:49
 msgid "object id"
 msgstr ""
 
-#: contrib/admin/models.py:34
+#: contrib/admin/models.py:50
 msgid "object repr"
 msgstr ""
 
-#: contrib/admin/models.py:35
+#: contrib/admin/models.py:51
 msgid "action flag"
 msgstr ""
 
-#: contrib/admin/models.py:36
+#: contrib/admin/models.py:52
 msgid "change message"
 msgstr ""
 
-#: contrib/admin/models.py:41
+#: contrib/admin/models.py:57
 msgid "log entry"
 msgstr ""
 
-#: contrib/admin/models.py:42
+#: contrib/admin/models.py:58
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/models.py:51
+#: contrib/admin/models.py:67
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: contrib/admin/models.py:53
+#: contrib/admin/models.py:69
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: contrib/admin/models.py:58
+#: contrib/admin/models.py:74
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: contrib/admin/models.py:60
+#: contrib/admin/models.py:76
 msgid "LogEntry Object"
 msgstr ""
 
-#: contrib/admin/options.py:228 contrib/admin/options.py:257
+#: contrib/admin/options.py:192 contrib/admin/options.py:221
 msgid "None"
 msgstr ""
 
-#: contrib/admin/options.py:293
+#: contrib/admin/options.py:257
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: contrib/admin/options.py:1021
+#: contrib/admin/options.py:931
+msgid "Added."
+msgstr ""
+
+#: contrib/admin/options.py:933
 #, python-format
 msgid "Changed %s."
 msgstr ""
 
-#: contrib/admin/options.py:1021 contrib/admin/options.py:1031
-#: contrib/admin/options.py:1926
+#: contrib/admin/options.py:933 contrib/admin/options.py:943
+#: contrib/admin/options.py:1848
 msgid "and"
 msgstr ""
 
-#: contrib/admin/options.py:1026
+#: contrib/admin/options.py:938
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr ""
 
-#: contrib/admin/options.py:1030
+#: contrib/admin/options.py:942
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr ""
 
-#: contrib/admin/options.py:1035
+#: contrib/admin/options.py:947
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr ""
 
-#: contrib/admin/options.py:1039
+#: contrib/admin/options.py:951
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/options.py:1165 contrib/admin/options.py:1221
+#: contrib/admin/options.py:1076 contrib/admin/options.py:1132
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/options.py:1179
+#: contrib/admin/options.py:1090
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may add another "
 "%(name)s below."
 msgstr ""
 
-#: contrib/admin/options.py:1186
+#: contrib/admin/options.py:1097
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/options.py:1214
+#: contrib/admin/options.py:1125
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
 "below."
 msgstr ""
 
-#: contrib/admin/options.py:1231
+#: contrib/admin/options.py:1142
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was changed successfully. You may add another "
 "%(name)s below."
 msgstr ""
 
-#: contrib/admin/options.py:1240
+#: contrib/admin/options.py:1151
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/options.py:1323 contrib/admin/options.py:1579
+#: contrib/admin/options.py:1234 contrib/admin/options.py:1498
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: contrib/admin/options.py:1342
+#: contrib/admin/options.py:1253
 msgid "No action selected."
 msgstr ""
 
-#: contrib/admin/options.py:1360
+#: contrib/admin/options.py:1271
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/options.py:1447 contrib/admin/options.py:1697
+#: contrib/admin/options.py:1358 contrib/admin/options.py:1616
+#: contrib/admin/options.py:1672
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: contrib/admin/options.py:1497
+#: contrib/admin/options.py:1409
 #, python-format
 msgid "Add %s"
 msgstr ""
 
-#: contrib/admin/options.py:1497
+#: contrib/admin/options.py:1409
 #, python-format
 msgid "Change %s"
 msgstr ""
 
-#: contrib/admin/options.py:1558
+#: contrib/admin/options.py:1477
 msgid "Database error"
 msgstr ""
 
-#: contrib/admin/options.py:1621
+#: contrib/admin/options.py:1540
 #, 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:1648
+#: contrib/admin/options.py:1567
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/admin/options.py:1654
+#: contrib/admin/options.py:1573
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: contrib/admin/options.py:1765
+#: contrib/admin/options.py:1689
 #, 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:1920
+#: contrib/admin/options.py:1842
 #, python-format
 msgid "%(class_name)s %(instance)s"
 msgstr ""
 
-#: contrib/admin/options.py:1927
+#: contrib/admin/options.py:1849
 #, 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:39 contrib/admin/templates/admin/base_site.html:3
+#: contrib/admin/sites.py:40 contrib/admin/templates/admin/base_site.html.py:3
 msgid "Django site admin"
 msgstr ""
 
-#: contrib/admin/sites.py:42 contrib/admin/templates/admin/base_site.html:6
+#: contrib/admin/sites.py:43 contrib/admin/templates/admin/base_site.html.py:6
 msgid "Django administration"
 msgstr ""
 
-#: contrib/admin/sites.py:45
+#: contrib/admin/sites.py:46
 msgid "Site administration"
 msgstr ""
 
-#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:49
+#: contrib/admin/sites.py:393 contrib/admin/templates/admin/login.html.py:61
 #: contrib/admin/templates/registration/password_reset_complete.html:18
-#: contrib/admin/tests.py:113
+#: contrib/admin/tests.py:120
 msgid "Log in"
 msgstr ""
 
-#: contrib/admin/sites.py:505
+#: contrib/admin/sites.py:520
 #, python-format
 msgid "%(app)s administration"
 msgstr ""
@@ -314,7 +327,7 @@ 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:58
+#: contrib/admin/templates/admin/base.html:56
 #: contrib/admin/templates/admin/change_form.html:18
 #: contrib/admin/templates/admin/change_list.html:40
 #: contrib/admin/templates/admin/delete_confirmation.html:8
@@ -382,7 +395,7 @@ msgstr ""
 
 #: contrib/admin/templates/admin/auth/user/change_password.html:17
 #: contrib/admin/templates/admin/auth/user/change_password.html:54
-#: contrib/admin/templates/admin/base.html:46
+#: contrib/admin/templates/admin/base.html:44
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Change password"
@@ -391,7 +404,7 @@ msgstr ""
 #: contrib/admin/templates/admin/auth/user/change_password.html:27
 #: contrib/admin/templates/admin/change_form.html:47
 #: contrib/admin/templates/admin/change_list.html:67
-#: contrib/admin/templates/admin/login.html:19
+#: contrib/admin/templates/admin/login.html:21
 #: contrib/admin/templates/registration/password_change_form.html:21
 msgid "Please correct the error below."
 msgstr ""
@@ -399,7 +412,7 @@ msgstr ""
 #: contrib/admin/templates/admin/auth/user/change_password.html:27
 #: contrib/admin/templates/admin/change_form.html:47
 #: contrib/admin/templates/admin/change_list.html:67
-#: contrib/admin/templates/admin/login.html:19
+#: contrib/admin/templates/admin/login.html:21
 #: contrib/admin/templates/registration/password_change_form.html:21
 msgid "Please correct the errors below."
 msgstr ""
@@ -409,21 +422,21 @@ msgstr ""
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:32
+#: contrib/admin/templates/admin/base.html:30
 msgid "Welcome,"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:37
+#: contrib/admin/templates/admin/base.html:35
 msgid "View site"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:42
+#: contrib/admin/templates/admin/base.html:40
 #: 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:48
+#: contrib/admin/templates/admin/base.html:46
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Log out"
@@ -431,7 +444,7 @@ msgstr ""
 
 #: contrib/admin/templates/admin/change_form.html:21
 #: contrib/admin/templates/admin/index.html:31
-#: contrib/admin/templates/admin/related_widget_wrapper.html:18
+#: contrib/admin/templates/admin/related_widget_wrapper.html:16
 msgid "Add"
 msgstr ""
 
@@ -469,7 +482,7 @@ msgid "Toggle sorting"
 msgstr ""
 
 #: contrib/admin/templates/admin/delete_confirmation.html:12
-#: contrib/admin/templates/admin/related_widget_wrapper.html:26
+#: contrib/admin/templates/admin/related_widget_wrapper.html:23
 #: contrib/admin/templates/admin/submit_line.html:6
 msgid "Delete"
 msgstr ""
@@ -540,17 +553,17 @@ msgstr ""
 #: contrib/admin/templates/admin/edit_inline/stacked.html:8
 #: contrib/admin/templates/admin/edit_inline/tabular.html:31
 #: contrib/admin/templates/admin/index.html:37
-#: contrib/admin/templates/admin/related_widget_wrapper.html:10
+#: contrib/admin/templates/admin/related_widget_wrapper.html:9
 msgid "Change"
 msgstr ""
 
-#: contrib/admin/templates/admin/edit_inline/stacked.html:27
-#: contrib/admin/templates/admin/edit_inline/tabular.html:81
+#: contrib/admin/templates/admin/edit_inline/stacked.html:26
+#: contrib/admin/templates/admin/edit_inline/tabular.html:80
 msgid "Remove"
 msgstr ""
 
-#: contrib/admin/templates/admin/edit_inline/stacked.html:28
-#: contrib/admin/templates/admin/edit_inline/tabular.html:80
+#: contrib/admin/templates/admin/edit_inline/stacked.html:27
+#: contrib/admin/templates/admin/edit_inline/tabular.html:79
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr ""
@@ -600,7 +613,14 @@ msgid ""
 "the appropriate user."
 msgstr ""
 
-#: contrib/admin/templates/admin/login.html:45
+#: contrib/admin/templates/admin/login.html:37
+#, python-format
+msgid ""
+"You are authenticated as %(username)s, but are not authorized to access this "
+"page. Would you like to login to a different account?"
+msgstr ""
+
+#: contrib/admin/templates/admin/login.html:57
 msgid "Forgotten your password or username?"
 msgstr ""
 
@@ -637,12 +657,12 @@ msgstr ""
 msgid "Change selected %(model)s"
 msgstr ""
 
-#: contrib/admin/templates/admin/related_widget_wrapper.html:16
+#: contrib/admin/templates/admin/related_widget_wrapper.html:15
 #, python-format
 msgid "Add another %(model)s"
 msgstr ""
 
-#: contrib/admin/templates/admin/related_widget_wrapper.html:24
+#: contrib/admin/templates/admin/related_widget_wrapper.html:22
 #, python-format
 msgid "Delete selected %(model)s"
 msgstr ""
@@ -787,40 +807,36 @@ msgstr ""
 msgid "Reset my password"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:382
+#: contrib/admin/templatetags/admin_list.py:389
 msgid "All dates"
 msgstr ""
 
-#: contrib/admin/views/main.py:33
-msgid "(None)"
-msgstr ""
-
-#: contrib/admin/views/main.py:80
+#: contrib/admin/views/main.py:81
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:82
+#: contrib/admin/views/main.py:83
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/widgets.py:93
+#: contrib/admin/widgets.py:95
 msgid "Date:"
 msgstr ""
 
-#: contrib/admin/widgets.py:94
+#: contrib/admin/widgets.py:96
 msgid "Time:"
 msgstr ""
 
-#: contrib/admin/widgets.py:176
+#: contrib/admin/widgets.py:178
 msgid "Lookup"
 msgstr ""
 
-#: contrib/admin/widgets.py:365
+#: contrib/admin/widgets.py:366
 msgid "Currently:"
 msgstr ""
 
-#: contrib/admin/widgets.py:366
+#: contrib/admin/widgets.py:367
 msgid "Change:"
 msgstr ""
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
index 47af03bbca..a5d3b3b71b 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: 2015-01-17 11:07+0100\n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,80 +13,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:45
+#: contrib/admin/static/admin/js/SelectFilter2.js:47
 #, javascript-format
 msgid "Available %s"
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:46
+#: contrib/admin/static/admin/js/SelectFilter2.js:53
 #, javascript-format
 msgid ""
 "This is the list of available %s. You may choose some by selecting them in "
 "the box below and then clicking the \"Choose\" arrow between the two boxes."
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:53
+#: contrib/admin/static/admin/js/SelectFilter2.js:69
 #, javascript-format
 msgid "Type into this box to filter down the list of available %s."
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:57
+#: contrib/admin/static/admin/js/SelectFilter2.js:74
 msgid "Filter"
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:61
+#: contrib/admin/static/admin/js/SelectFilter2.js:78
 msgid "Choose all"
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:61
+#: contrib/admin/static/admin/js/SelectFilter2.js:78
 #, javascript-format
 msgid "Click to choose all %s at once."
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:67
+#: contrib/admin/static/admin/js/SelectFilter2.js:84
 msgid "Choose"
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:69
+#: contrib/admin/static/admin/js/SelectFilter2.js:86
 msgid "Remove"
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:75
+#: contrib/admin/static/admin/js/SelectFilter2.js:92
 #, javascript-format
 msgid "Chosen %s"
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:76
+#: contrib/admin/static/admin/js/SelectFilter2.js:98
 #, javascript-format
 msgid ""
 "This is the list of chosen %s. You may remove some by selecting them in the "
 "box below and then clicking the \"Remove\" arrow between the two boxes."
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:80
+#: contrib/admin/static/admin/js/SelectFilter2.js:108
 msgid "Remove all"
 msgstr ""
 
-#: contrib/admin/static/admin/js/SelectFilter2.js:80
+#: contrib/admin/static/admin/js/SelectFilter2.js:108
 #, javascript-format
 msgid "Click to remove all chosen %s at once."
 msgstr ""
 
-#: contrib/admin/static/admin/js/actions.js:22
-#: contrib/admin/static/admin/js/actions.min.js:1
+#: contrib/admin/static/admin/js/actions.js:47
+#: contrib/admin/static/admin/js/actions.min.js:2
 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:114
+#: contrib/admin/static/admin/js/actions.js:116
 #: contrib/admin/static/admin/js/actions.min.js:4
 msgid ""
 "You have unsaved changes on individual editable fields. If you run an "
 "action, your unsaved changes will be lost."
 msgstr ""
 
-#: contrib/admin/static/admin/js/actions.js:126
+#: contrib/admin/static/admin/js/actions.js:128
 #: contrib/admin/static/admin/js/actions.min.js:5
 msgid ""
 "You have selected an action, but you haven't saved your changes to "
@@ -94,7 +94,7 @@ msgid ""
 "action."
 msgstr ""
 
-#: contrib/admin/static/admin/js/actions.js:128
+#: contrib/admin/static/admin/js/actions.js:130
 #: contrib/admin/static/admin/js/actions.min.js:5
 msgid ""
 "You have selected an action, and you haven't made any changes on individual "
@@ -102,27 +102,27 @@ msgid ""
 "button."
 msgstr ""
 
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:74
 #, 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:87
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:82
 #, 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:114
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:109
 #: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149
 msgid "Now"
 msgstr ""
 
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118
-msgid "Clock"
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:116
+msgid "Choose a Time"
 msgstr ""
 
 #: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146
@@ -141,45 +141,49 @@ msgstr ""
 msgid "Noon"
 msgstr ""
 
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:153
+msgid "6 p.m."
+msgstr ""
+
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:157
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:281
 msgid "Cancel"
 msgstr ""
 
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:217
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:274
 msgid "Today"
 msgstr ""
 
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220
-msgid "Calendar"
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:224
+msgid "Choose a Date"
 msgstr ""
 
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:272
 msgid "Yesterday"
 msgstr ""
 
-#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271
+#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276
 msgid "Tomorrow"
 msgstr ""
 
-#: contrib/admin/static/admin/js/calendar.js:8
+#: contrib/admin/static/admin/js/calendar.js:11
 msgid ""
 "January February March April May June July August September October November "
 "December"
 msgstr ""
 
-#: contrib/admin/static/admin/js/calendar.js:9
+#: contrib/admin/static/admin/js/calendar.js:12
 msgid "S M T W T F S"
 msgstr ""
 
-#: contrib/admin/static/admin/js/collapse.js:8
-#: contrib/admin/static/admin/js/collapse.js:19
+#: contrib/admin/static/admin/js/collapse.js:10
+#: contrib/admin/static/admin/js/collapse.js:21
 #: contrib/admin/static/admin/js/collapse.min.js:1
 msgid "Show"
 msgstr ""
 
-#: contrib/admin/static/admin/js/collapse.js:16
+#: contrib/admin/static/admin/js/collapse.js:18
 #: contrib/admin/static/admin/js/collapse.min.js:1
 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 5bb2a8f7de..4b7e8489a8 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: 2015-01-17 11:07+0100\n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\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/admindocs/apps.py:8
+#: contrib/admindocs/apps.py:7
 msgid "Administrative Documentation"
 msgstr ""
 
@@ -60,48 +60,19 @@ msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
 "toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site.  Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").</p>\n"
+"select the bookmarklet from any page in the site.</p>\n"
 msgstr ""
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:25
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:22
 msgid "Documentation for this page"
 msgstr ""
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:26
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:23
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:28
-msgid "Show object ID"
-msgstr ""
-
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:29
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
-msgstr ""
-
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:31
-msgid "Edit this object (current window)"
-msgstr ""
-
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:32
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
-
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:34
-msgid "Edit this object (new window)"
-msgstr ""
-
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:35
-msgid "As above, but opens the admin page in a new window."
-msgstr ""
-
 #: contrib/admindocs/templates/admin_doc/index.html:17
 #: contrib/admindocs/templates/admin_doc/template_tag_index.html:9
 msgid "Tags"
@@ -176,19 +147,36 @@ msgstr ""
 msgid "Model: %(name)s"
 msgstr ""
 
-#: contrib/admindocs/templates/admin_doc/model_detail.html:34
-msgid "Field"
+#: contrib/admindocs/templates/admin_doc/model_detail.html:30
+msgid "Fields"
 msgstr ""
 
 #: contrib/admindocs/templates/admin_doc/model_detail.html:35
-msgid "Type"
+msgid "Field"
 msgstr ""
 
 #: contrib/admindocs/templates/admin_doc/model_detail.html:36
+msgid "Type"
+msgstr ""
+
+#: contrib/admindocs/templates/admin_doc/model_detail.html:37
+#: contrib/admindocs/templates/admin_doc/model_detail.html:60
 msgid "Description"
 msgstr ""
 
-#: contrib/admindocs/templates/admin_doc/model_detail.html:51
+#: contrib/admindocs/templates/admin_doc/model_detail.html:53
+msgid "Methods with arguments"
+msgstr ""
+
+#: contrib/admindocs/templates/admin_doc/model_detail.html:58
+msgid "Method"
+msgstr ""
+
+#: contrib/admindocs/templates/admin_doc/model_detail.html:59
+msgid "Arguments"
+msgstr ""
+
+#: contrib/admindocs/templates/admin_doc/model_detail.html:76
 msgid "Back to Model Documentation"
 msgstr ""
 
@@ -322,59 +310,59 @@ msgstr ""
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: contrib/admindocs/views.py:71 contrib/admindocs/views.py:73
-#: contrib/admindocs/views.py:75
+#: contrib/admindocs/views.py:75 contrib/admindocs/views.py:77
+#: contrib/admindocs/views.py:79
 msgid "tag:"
 msgstr ""
 
-#: contrib/admindocs/views.py:104 contrib/admindocs/views.py:106
-#: contrib/admindocs/views.py:108
+#: contrib/admindocs/views.py:109 contrib/admindocs/views.py:111
+#: contrib/admindocs/views.py:113
 msgid "filter:"
 msgstr ""
 
-#: contrib/admindocs/views.py:156 contrib/admindocs/views.py:158
-#: contrib/admindocs/views.py:160
+#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
+#: contrib/admindocs/views.py:162
 msgid "view:"
 msgstr ""
 
-#: contrib/admindocs/views.py:188
+#: contrib/admindocs/views.py:190
 #, python-format
 msgid "App %(app_label)r not found"
 msgstr ""
 
-#: contrib/admindocs/views.py:192
+#: contrib/admindocs/views.py:194
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 
-#: contrib/admindocs/views.py:198 contrib/admindocs/views.py:200
-#: contrib/admindocs/views.py:215 contrib/admindocs/views.py:238
-#: contrib/admindocs/views.py:243 contrib/admindocs/views.py:257
-#: contrib/admindocs/views.py:274 contrib/admindocs/views.py:279
+#: contrib/admindocs/views.py:200 contrib/admindocs/views.py:202
+#: contrib/admindocs/views.py:217 contrib/admindocs/views.py:240
+#: contrib/admindocs/views.py:245 contrib/admindocs/views.py:260
+#: contrib/admindocs/views.py:295 contrib/admindocs/views.py:300
 msgid "model:"
 msgstr ""
 
-#: contrib/admindocs/views.py:211
+#: contrib/admindocs/views.py:213
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr ""
 
-#: contrib/admindocs/views.py:231 contrib/admindocs/views.py:266
+#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:287
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr ""
 
-#: contrib/admindocs/views.py:238 contrib/admindocs/views.py:274
+#: contrib/admindocs/views.py:240 contrib/admindocs/views.py:295
 #, python-format
 msgid "all %s"
 msgstr ""
 
-#: contrib/admindocs/views.py:243 contrib/admindocs/views.py:279
+#: contrib/admindocs/views.py:245 contrib/admindocs/views.py:300
 #, python-format
 msgid "number of %s"
 msgstr ""
 
-#: contrib/admindocs/views.py:389
+#: contrib/admindocs/views.py:388
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr ""
diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po
index 3812af0831..fdfde63b77 100644
--- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-18 09:16+0100\n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,28 +13,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/auth/admin.py:46
+#: contrib/auth/admin.py:49
 msgid "Personal info"
 msgstr ""
 
-#: contrib/auth/admin.py:47
+#: contrib/auth/admin.py:50
 msgid "Permissions"
 msgstr ""
 
-#: contrib/auth/admin.py:49
+#: contrib/auth/admin.py:52
 msgid "Important dates"
 msgstr ""
 
-#: contrib/auth/admin.py:129
+#: contrib/auth/admin.py:136
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: contrib/auth/admin.py:139
+#: contrib/auth/admin.py:146
 msgid "Password changed successfully."
 msgstr ""
 
-#: contrib/auth/admin.py:150
+#: contrib/auth/admin.py:165
 #, python-format
 msgid "Change password: %s"
 msgstr ""
@@ -43,6 +43,14 @@ msgstr ""
 msgid "Authentication and Authorization"
 msgstr ""
 
+#: contrib/auth/base_user.py:50
+msgid "password"
+msgstr ""
+
+#: contrib/auth/base_user.py:51
+msgid "last login"
+msgstr ""
+
 #: contrib/auth/forms.py:30
 msgid "No password set."
 msgstr ""
@@ -51,13 +59,13 @@ msgstr ""
 msgid "Invalid password format or unknown hashing algorithm."
 msgstr ""
 
-#: contrib/auth/forms.py:69 contrib/auth/forms.py:265
-#: contrib/auth/forms.py:329
+#: contrib/auth/forms.py:69 contrib/auth/forms.py:268
+#: contrib/auth/forms.py:332
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: contrib/auth/forms.py:71 contrib/auth/forms.py:100
-#: contrib/auth/forms.py:128 contrib/auth/forms.py:333
+#: contrib/auth/forms.py:71 contrib/auth/forms.py:102
+#: contrib/auth/forms.py:130 contrib/auth/forms.py:336
 msgid "Password"
 msgstr ""
 
@@ -65,56 +73,56 @@ msgstr ""
 msgid "Password confirmation"
 msgstr ""
 
-#: contrib/auth/forms.py:75 contrib/auth/forms.py:339
-msgid "Enter the same password as above, for verification."
+#: contrib/auth/forms.py:75 contrib/auth/forms.py:343
+msgid "Enter the same password as before, for verification."
 msgstr ""
 
-#: contrib/auth/forms.py:101
+#: contrib/auth/forms.py:103
 msgid ""
 "Raw passwords are not stored, so there is no way to see this user's "
-"password, but you can change the password using <a href=\"password/\">this "
-"form</a>."
+"password, but you can change the password using <a href=\"../password/"
+"\">this form</a>."
 msgstr ""
 
-#: contrib/auth/forms.py:131
+#: contrib/auth/forms.py:133
 #, python-format
 msgid ""
 "Please enter a correct %(username)s and password. Note that both fields may "
 "be case-sensitive."
 msgstr ""
 
-#: contrib/auth/forms.py:133
+#: contrib/auth/forms.py:135
 msgid "This account is inactive."
 msgstr ""
 
-#: contrib/auth/forms.py:196
+#: contrib/auth/forms.py:198
 msgid "Email"
 msgstr ""
 
-#: contrib/auth/forms.py:267
+#: contrib/auth/forms.py:270
 msgid "New password"
 msgstr ""
 
-#: contrib/auth/forms.py:269
+#: contrib/auth/forms.py:273
 msgid "New password confirmation"
 msgstr ""
 
-#: contrib/auth/forms.py:300
+#: contrib/auth/forms.py:306
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: contrib/auth/forms.py:303
+#: contrib/auth/forms.py:309
 msgid "Old password"
 msgstr ""
 
-#: contrib/auth/forms.py:337
+#: contrib/auth/forms.py:341
 msgid "Password (again)"
 msgstr ""
 
 #: contrib/auth/hashers.py:251 contrib/auth/hashers.py:334
-#: contrib/auth/hashers.py:382 contrib/auth/hashers.py:410
-#: contrib/auth/hashers.py:443 contrib/auth/hashers.py:476
-#: contrib/auth/hashers.py:510
+#: contrib/auth/hashers.py:386 contrib/auth/hashers.py:414
+#: contrib/auth/hashers.py:447 contrib/auth/hashers.py:480
+#: contrib/auth/hashers.py:514
 msgid "algorithm"
 msgstr ""
 
@@ -123,14 +131,14 @@ msgid "iterations"
 msgstr ""
 
 #: contrib/auth/hashers.py:253 contrib/auth/hashers.py:336
-#: contrib/auth/hashers.py:383 contrib/auth/hashers.py:411
-#: contrib/auth/hashers.py:511
+#: contrib/auth/hashers.py:387 contrib/auth/hashers.py:415
+#: contrib/auth/hashers.py:515
 msgid "salt"
 msgstr ""
 
-#: contrib/auth/hashers.py:254 contrib/auth/hashers.py:384
-#: contrib/auth/hashers.py:412 contrib/auth/hashers.py:444
-#: contrib/auth/hashers.py:477 contrib/auth/hashers.py:512
+#: contrib/auth/hashers.py:254 contrib/auth/hashers.py:388
+#: contrib/auth/hashers.py:416 contrib/auth/hashers.py:448
+#: contrib/auth/hashers.py:481 contrib/auth/hashers.py:516
 msgid "hash"
 msgstr ""
 
@@ -142,155 +150,188 @@ msgstr ""
 msgid "checksum"
 msgstr ""
 
-#: contrib/auth/models.py:64 contrib/auth/models.py:115
+#: contrib/auth/models.py:61 contrib/auth/models.py:116
 msgid "name"
 msgstr ""
 
-#: contrib/auth/models.py:66
+#: contrib/auth/models.py:65
+msgid "content type"
+msgstr ""
+
+#: contrib/auth/models.py:67
 msgid "codename"
 msgstr ""
 
-#: contrib/auth/models.py:70
+#: contrib/auth/models.py:71
 msgid "permission"
 msgstr ""
 
-#: contrib/auth/models.py:71 contrib/auth/models.py:117
+#: contrib/auth/models.py:72 contrib/auth/models.py:119
 msgid "permissions"
 msgstr ""
 
-#: contrib/auth/models.py:122
+#: contrib/auth/models.py:126
 msgid "group"
 msgstr ""
 
-#: contrib/auth/models.py:123 contrib/auth/models.py:311
+#: contrib/auth/models.py:127 contrib/auth/models.py:222
 msgid "groups"
 msgstr ""
 
-#: contrib/auth/models.py:196
-msgid "password"
-msgstr ""
-
-#: contrib/auth/models.py:197
-msgid "last login"
-msgstr ""
-
-#: contrib/auth/models.py:308
+#: contrib/auth/models.py:213
 msgid "superuser status"
 msgstr ""
 
-#: contrib/auth/models.py:309
+#: contrib/auth/models.py:216
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: contrib/auth/models.py:312
+#: contrib/auth/models.py:225
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
 "each of their groups."
 msgstr ""
 
-#: contrib/auth/models.py:317
+#: contrib/auth/models.py:233
 msgid "user permissions"
 msgstr ""
 
-#: contrib/auth/models.py:318
+#: contrib/auth/models.py:235
 msgid "Specific permissions for this user."
 msgstr ""
 
-#: contrib/auth/models.py:385
+#: contrib/auth/models.py:305
 msgid "username"
 msgstr ""
 
-#: contrib/auth/models.py:386
+#: contrib/auth/models.py:308
 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
-#: contrib/auth/models.py:390
+#: contrib/auth/models.py:312
 msgid ""
 "Enter a valid username. This value may contain only letters, numbers and @/./"
 "+/-/_ characters."
 msgstr ""
 
-#: contrib/auth/models.py:395
+#: contrib/auth/models.py:317
 msgid "A user with that username already exists."
 msgstr ""
 
-#: contrib/auth/models.py:397
+#: contrib/auth/models.py:320
 msgid "first name"
 msgstr ""
 
-#: contrib/auth/models.py:398
+#: contrib/auth/models.py:321
 msgid "last name"
 msgstr ""
 
-#: contrib/auth/models.py:399
+#: contrib/auth/models.py:322
 msgid "email address"
 msgstr ""
 
-#: contrib/auth/models.py:400
+#: contrib/auth/models.py:324
 msgid "staff status"
 msgstr ""
 
-#: contrib/auth/models.py:401
+#: contrib/auth/models.py:326
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: contrib/auth/models.py:403
+#: contrib/auth/models.py:329
 msgid "active"
 msgstr ""
 
-#: contrib/auth/models.py:404
+#: contrib/auth/models.py:332
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: contrib/auth/models.py:406
+#: contrib/auth/models.py:336
 msgid "date joined"
 msgstr ""
 
-#: contrib/auth/models.py:414
+#: contrib/auth/models.py:344
 msgid "user"
 msgstr ""
 
-#: contrib/auth/models.py:415
+#: contrib/auth/models.py:345
 msgid "users"
 msgstr ""
 
+#: contrib/auth/password_validation.py:100
+#, python-format
+msgid ""
+"This password is too short. It must contain at least %(min_length)d "
+"characters."
+msgstr ""
+
+#: contrib/auth/password_validation.py:106
+#, python-format
+msgid "Your password must contain at least %(min_length)d characters."
+msgstr ""
+
+#: contrib/auth/password_validation.py:139
+#, python-format
+msgid "The password is too similar to the %(verbose_name)s."
+msgstr ""
+
+#: contrib/auth/password_validation.py:145
+msgid "Your password can't be too similar to your other personal information."
+msgstr ""
+
+#: contrib/auth/password_validation.py:172
+msgid "This password is too common."
+msgstr ""
+
+#: contrib/auth/password_validation.py:177
+msgid "Your password can't be a commonly used password."
+msgstr ""
+
+#: contrib/auth/password_validation.py:187
+msgid "This password is entirely numeric."
+msgstr ""
+
+#: contrib/auth/password_validation.py:192
+msgid "Your password can't be entirely numeric."
+msgstr ""
+
 #: contrib/auth/templates/registration/password_reset_subject.txt:2
 #, python-format
 msgid "Password reset on %(site_name)s"
 msgstr ""
 
-#: contrib/auth/views.py:102
+#: contrib/auth/views.py:125
 msgid "Logged out"
 msgstr ""
 
-#: contrib/auth/views.py:188
+#: contrib/auth/views.py:211
 msgid "Password reset"
 msgstr ""
 
-#: contrib/auth/views.py:203
+#: contrib/auth/views.py:224
 msgid "Password reset sent"
 msgstr ""
 
-#: contrib/auth/views.py:242
+#: contrib/auth/views.py:261
 msgid "Enter new password"
 msgstr ""
 
-#: contrib/auth/views.py:253
+#: contrib/auth/views.py:272
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: contrib/auth/views.py:273
+#: contrib/auth/views.py:290
 msgid "Password reset complete"
 msgstr ""
 
-#: contrib/auth/views.py:310
+#: contrib/auth/views.py:325
 msgid "Password change"
 msgstr ""
 
-#: contrib/auth/views.py:326
+#: contrib/auth/views.py:339
 msgid "Password change successful"
 msgstr ""
diff --git a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
index bab242cb9e..4e226e416d 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-03-18 09:16+0100\n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\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/flatpages/admin.py:11
+#: contrib/flatpages/admin.py:12
 msgid "Advanced options"
 msgstr ""
 
@@ -79,6 +79,10 @@ msgstr ""
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 
+#: contrib/flatpages/models.py:25
+msgid "sites"
+msgstr ""
+
 #: contrib/flatpages/models.py:29
 msgid "flat page"
 msgstr ""
diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po
index d1048f72f8..997f5f4405 100644
--- a/django/contrib/gis/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-18 09:16+0100\n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -18,54 +18,63 @@ msgid "GIS"
 msgstr ""
 
 #: contrib/gis/db/models/fields.py:78
-msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
+msgid "The base GIS field."
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:325
+#: contrib/gis/db/models/fields.py:165
+msgid ""
+"The base Geometry field -- maps to the OpenGIS Specification Geometry type."
+msgstr ""
+
+#: contrib/gis/db/models/fields.py:352
 msgid "Point"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:331
+#: contrib/gis/db/models/fields.py:358
 msgid "Line string"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:337
+#: contrib/gis/db/models/fields.py:364
 msgid "Polygon"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:343
+#: contrib/gis/db/models/fields.py:370
 msgid "Multi-point"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:349
+#: contrib/gis/db/models/fields.py:376
 msgid "Multi-line string"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:355
+#: contrib/gis/db/models/fields.py:382
 msgid "Multi polygon"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:361
+#: contrib/gis/db/models/fields.py:388
 msgid "Geometry collection"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:367
+#: contrib/gis/db/models/fields.py:394
 msgid "Extent Aggregate Field"
 msgstr ""
 
-#: contrib/gis/forms/fields.py:22
+#: contrib/gis/db/models/fields.py:405
+msgid "Raster Field"
+msgstr ""
+
+#: contrib/gis/forms/fields.py:20
 msgid "No geometry value provided."
 msgstr ""
 
-#: contrib/gis/forms/fields.py:23
+#: contrib/gis/forms/fields.py:21
 msgid "Invalid geometry value."
 msgstr ""
 
-#: contrib/gis/forms/fields.py:24
+#: contrib/gis/forms/fields.py:22
 msgid "Invalid geometry type."
 msgstr ""
 
-#: contrib/gis/forms/fields.py:25
+#: contrib/gis/forms/fields.py:23
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
diff --git a/django/contrib/postgres/locale/en/LC_MESSAGES/django.po b/django/contrib/postgres/locale/en/LC_MESSAGES/django.po
index 724a5b955e..66384de934 100644
--- a/django/contrib/postgres/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/postgres/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-18 09:16+0100\n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\n"
 "PO-Revision-Date: 2015-01-18 20:56+0100\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 msgid "PostgreSQL extensions"
 msgstr ""
 
-#: contrib/postgres/fields/array.py:22 contrib/postgres/forms/array.py:15
+#: contrib/postgres/fields/array.py:19 contrib/postgres/forms/array.py:15
 #: contrib/postgres/forms/array.py:145
 #, python-format
 msgid "Item %(nth)s in the array did not validate: "
 msgstr ""
 
-#: contrib/postgres/fields/array.py:23
+#: contrib/postgres/fields/array.py:20
 msgid "Nested arrays must have the same length."
 msgstr ""
 
@@ -37,10 +37,23 @@ msgstr ""
 msgid "The value of \"%(key)s\" is not a string."
 msgstr ""
 
+#: contrib/postgres/fields/jsonb.py:15
+msgid "A JSON object"
+msgstr ""
+
+#: contrib/postgres/fields/jsonb.py:17
+msgid "Value must be valid JSON."
+msgstr ""
+
 #: contrib/postgres/forms/hstore.py:15
 msgid "Could not load JSON data."
 msgstr ""
 
+#: contrib/postgres/forms/jsonb.py:11
+#, python-format
+msgid "'%(value)s' value must be valid JSON."
+msgstr ""
+
 #: contrib/postgres/forms/ranges.py:13
 msgid "Enter two valid values."
 msgstr ""
@@ -49,19 +62,19 @@ msgstr ""
 msgid "The start of the range must not exceed the end of the range."
 msgstr ""
 
-#: contrib/postgres/forms/ranges.py:52
+#: contrib/postgres/forms/ranges.py:59
 msgid "Enter two whole numbers."
 msgstr ""
 
-#: contrib/postgres/forms/ranges.py:58
+#: contrib/postgres/forms/ranges.py:65
 msgid "Enter two numbers."
 msgstr ""
 
-#: contrib/postgres/forms/ranges.py:64
+#: contrib/postgres/forms/ranges.py:71
 msgid "Enter two valid date/times."
 msgstr ""
 
-#: contrib/postgres/forms/ranges.py:70
+#: contrib/postgres/forms/ranges.py:77
 msgid "Enter two valid dates."
 msgstr ""
 
diff --git a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
index 2b73f2d161..eb33e60d34 100644
--- a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-17 11:07+0100\n"
+"POT-Creation-Date: 2015-10-09 17:42+0200\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,10 +13,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/redirects/apps.py:8
+#: contrib/redirects/apps.py:7
 msgid "Redirects"
 msgstr ""
 
+#: contrib/redirects/models.py:9
+msgid "site"
+msgstr ""
+
 #: contrib/redirects/models.py:10
 msgid "redirect from"
 msgstr ""