diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 8587e1107c..267f765bda 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: 2014-08-23 14:10+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -25,330 +25,410 @@ msgstr ""
 msgid "Asturian"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Azerbaijani"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Bulgarian"
 msgstr ""
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
 msgid "Belarusian"
 msgstr ""
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
 msgid "Breton"
 msgstr ""
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
 msgid "Bosnian"
 msgstr ""
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
 msgid "Catalan"
 msgstr ""
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
 msgid "Danish"
 msgstr ""
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
 msgid "Greek"
 msgstr ""
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Australian English"
 msgstr ""
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "British English"
 msgstr ""
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Esperanto"
 msgstr ""
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Argentinian Spanish"
 msgstr ""
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Mexican Spanish"
 msgstr ""
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Venezuelan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Estonian"
 msgstr ""
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Basque"
 msgstr ""
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Persian"
 msgstr ""
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Finnish"
 msgstr ""
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
 msgid "Frisian"
 msgstr ""
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Irish"
 msgstr ""
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
 msgid "Hebrew"
 msgstr ""
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
 msgid "Hindi"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
 msgid "Croatian"
 msgstr ""
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
 msgid "Hungarian"
 msgstr ""
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
 msgid "Interlingua"
 msgstr ""
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
 msgid "Indonesian"
 msgstr ""
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
 msgid "Ido"
 msgstr ""
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:90
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:91
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:92
 msgid "Japanese"
 msgstr ""
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:93
 msgid "Georgian"
 msgstr ""
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:94
 msgid "Kazakh"
 msgstr ""
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:95
 msgid "Khmer"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:96
 msgid "Kannada"
 msgstr ""
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:97
 msgid "Korean"
 msgstr ""
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:98
 msgid "Luxembourgish"
 msgstr ""
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:99
 msgid "Lithuanian"
 msgstr ""
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:100
 msgid "Latvian"
 msgstr ""
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:101
 msgid "Macedonian"
 msgstr ""
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:102
 msgid "Malayalam"
 msgstr ""
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:103
 msgid "Mongolian"
 msgstr ""
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:104
 msgid "Marathi"
 msgstr ""
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
 msgid "Burmese"
 msgstr ""
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
 msgid "Norwegian Bokmal"
 msgstr ""
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
 msgid "Nepali"
 msgstr ""
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
 msgid "Dutch"
 msgstr ""
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
 msgid "Ossetic"
 msgstr ""
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
 msgid "Punjabi"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
 msgid "Polish"
 msgstr ""
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
 msgid "Portuguese"
 msgstr ""
 
-#: conf/global_settings.py:111
+#: conf/global_settings.py:114
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: conf/global_settings.py:112
+#: conf/global_settings.py:115
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:113
+#: conf/global_settings.py:116
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:114
+#: conf/global_settings.py:117
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:115
+#: conf/global_settings.py:118
 msgid "Slovenian"
 msgstr ""
 
-#: conf/global_settings.py:116
+#: conf/global_settings.py:119
 msgid "Albanian"
 msgstr ""
 
-#: conf/global_settings.py:117
+#: conf/global_settings.py:120
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:118
+#: conf/global_settings.py:121
 msgid "Serbian Latin"
 msgstr ""
 
-#: conf/global_settings.py:119
+#: conf/global_settings.py:122
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:120
+#: conf/global_settings.py:123
 msgid "Swahili"
 msgstr ""
 
-#: conf/global_settings.py:121
+#: conf/global_settings.py:124
 msgid "Tamil"
 msgstr ""
 
-#: conf/global_settings.py:122
+#: conf/global_settings.py:125
 msgid "Telugu"
 msgstr ""
 
-#: conf/global_settings.py:123
+#: conf/global_settings.py:126
 msgid "Thai"
 msgstr ""
 
-#: conf/global_settings.py:124
+#: conf/global_settings.py:127
 msgid "Turkish"
 msgstr ""
 
-#: conf/global_settings.py:125
+#: conf/global_settings.py:128
 msgid "Tatar"
 msgstr ""
 
-#: conf/global_settings.py:126
+#: conf/global_settings.py:129
 msgid "Udmurt"
 msgstr ""
 
-#: conf/global_settings.py:127
+#: conf/global_settings.py:130
 msgid "Ukrainian"
 msgstr ""
 
-#: conf/global_settings.py:128
+#: conf/global_settings.py:131
 msgid "Urdu"
 msgstr ""
 
-#: conf/global_settings.py:129
+#: conf/global_settings.py:132
 msgid "Vietnamese"
 msgstr ""
 
-#: conf/global_settings.py:130 conf/global_settings.py:131
+#: conf/global_settings.py:133 conf/global_settings.py:134
 msgid "Simplified Chinese"
 msgstr ""
 
-#: conf/global_settings.py:132 conf/global_settings.py:133
+#: conf/global_settings.py:135 conf/global_settings.py:136
 msgid "Traditional Chinese"
 msgstr ""
 
+#: contrib/postgres/apps.py:12
+msgid "PostgreSQL extensions"
+msgstr ""
+
+#: contrib/postgres/fields/array.py:23 contrib/postgres/forms/array.py:13
+#: contrib/postgres/forms/array.py:143
+#, python-format
+msgid "Item %(nth)s in the array did not validate: "
+msgstr ""
+
+#: contrib/postgres/fields/array.py:24
+msgid "Nested arrays must have the same length."
+msgstr ""
+
+#: contrib/postgres/fields/hstore.py:16
+msgid "Map of strings to strings"
+msgstr ""
+
+#: contrib/postgres/fields/hstore.py:18
+#, python-format
+msgid "The value of \"%(key)s\" is not a string."
+msgstr ""
+
+#: contrib/postgres/forms/hstore.py:16
+msgid "Could not load JSON data."
+msgstr ""
+
+#: contrib/postgres/forms/ranges.py:13
+msgid "Enter two valid values."
+msgstr ""
+
+#: contrib/postgres/forms/ranges.py:14
+msgid "The start of the range must not exceed the end of the range."
+msgstr ""
+
+#: contrib/postgres/validators.py:14
+#, python-format
+msgid ""
+"List contains %(show_value)d item, it should contain no more than "
+"%(limit_value)d."
+msgid_plural ""
+"List contains %(show_value)d items, it should contain no more than "
+"%(limit_value)d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/postgres/validators.py:21
+#, python-format
+msgid ""
+"List contains %(show_value)d item, it should contain no fewer than "
+"%(limit_value)d."
+msgid_plural ""
+"List contains %(show_value)d items, it should contain no fewer than "
+"%(limit_value)d."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/postgres/validators.py:31
+#, python-format
+msgid "Some keys were missing: %(keys)s"
+msgstr ""
+
+#: contrib/postgres/validators.py:32
+#, python-format
+msgid "Some unknown keys were provided: %(keys)s"
+msgstr ""
+
+#: contrib/postgres/validators.py:73
+#, python-format
+msgid ""
+"Ensure that this range is completely less than or equal to %(limit_value)s."
+msgstr ""
+
+#: contrib/postgres/validators.py:78
+#, python-format
+msgid ""
+"Ensure that this range is completely greater than or equal to "
+"%(limit_value)s."
+msgstr ""
+
 #: contrib/sitemaps/apps.py:8
 msgid "Site Maps"
 msgstr ""
@@ -369,55 +449,55 @@ msgstr ""
 msgid "Enter a valid value."
 msgstr ""
 
-#: core/validators.py:77 forms/fields.py:678
+#: core/validators.py:88 forms/fields.py:708
 msgid "Enter a valid URL."
 msgstr ""
 
-#: core/validators.py:115
+#: core/validators.py:134
 msgid "Enter a valid integer."
 msgstr ""
 
-#: core/validators.py:120
+#: core/validators.py:139
 msgid "Enter a valid email address."
 msgstr ""
 
-#: core/validators.py:185
+#: core/validators.py:213
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: core/validators.py:188 core/validators.py:207
+#: core/validators.py:218 core/validators.py:237
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: core/validators.py:193 core/validators.py:208
+#: core/validators.py:223 core/validators.py:238
 msgid "Enter a valid IPv6 address."
 msgstr ""
 
-#: core/validators.py:203 core/validators.py:206
+#: core/validators.py:233 core/validators.py:236
 msgid "Enter a valid IPv4 or IPv6 address."
 msgstr ""
 
-#: core/validators.py:229 db/models/fields/__init__.py:1070
+#: core/validators.py:261 db/models/fields/__init__.py:1133
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: core/validators.py:236
+#: core/validators.py:270
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:255
+#: core/validators.py:296
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:262
+#: core/validators.py:303
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:271
+#: core/validators.py:312
 #, python-format
 msgid ""
 "Ensure this value has at least %(limit_value)d character (it has "
@@ -428,7 +508,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:282
+#: core/validators.py:323
 #, python-format
 msgid ""
 "Ensure this value has at most %(limit_value)d character (it has "
@@ -439,255 +519,271 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: db/models/base.py:978 forms/models.py:713
+#: db/models/base.py:1089 forms/models.py:721
 msgid "and"
 msgstr ""
 
-#: db/models/base.py:980
+#: db/models/base.py:1091
 #, python-format
 msgid "%(model_name)s with this %(field_labels)s already exists."
 msgstr ""
 
-#: db/models/fields/__init__.py:104
+#: db/models/fields/__init__.py:107
 #, python-format
 msgid "Value %(value)r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:105
+#: db/models/fields/__init__.py:108
 msgid "This field cannot be null."
 msgstr ""
 
-#: db/models/fields/__init__.py:106
+#: db/models/fields/__init__.py:109
 msgid "This field cannot be blank."
 msgstr ""
 
-#: db/models/fields/__init__.py:107
+#: 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:111
+#: 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:116
+#: db/models/fields/__init__.py:132
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1696
+#: db/models/fields/__init__.py:911 db/models/fields/__init__.py:1814
 msgid "Integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1694
+#: 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:926
+#: db/models/fields/__init__.py:990
 #, python-format
 msgid "'%(value)s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:928
+#: db/models/fields/__init__.py:992
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1004
+#: db/models/fields/__init__.py:1067
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1065
+#: db/models/fields/__init__.py:1128
 msgid "Comma-separated integers"
 msgstr ""
 
-#: db/models/fields/__init__.py:1114
+#: 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:1116 db/models/fields/__init__.py:1266
+#: 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:1119
+#: db/models/fields/__init__.py:1182
 msgid "Date (without time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1264
+#: 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:1268
+#: 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:1272
+#: db/models/fields/__init__.py:1335
 msgid "Date (with time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1420
+#: db/models/fields/__init__.py:1487
 #, python-format
 msgid "'%(value)s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:1422
+#: db/models/fields/__init__.py:1489
 msgid "Decimal number"
 msgstr ""
 
-#: db/models/fields/__init__.py:1567
+#: 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:1593
+#: db/models/fields/__init__.py:1711
 msgid "File path"
 msgstr ""
 
-#: db/models/fields/__init__.py:1660
+#: db/models/fields/__init__.py:1778
 #, python-format
 msgid "'%(value)s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:1662
+#: db/models/fields/__init__.py:1780
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:1746
+#: db/models/fields/__init__.py:1881
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1761
+#: db/models/fields/__init__.py:1896
 msgid "IPv4 address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1791
+#: db/models/fields/__init__.py:1932
 msgid "IP address"
 msgstr ""
 
-#: db/models/fields/__init__.py:1870
+#: 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:1872
+#: db/models/fields/__init__.py:2013
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1932
+#: db/models/fields/__init__.py:2073
 msgid "Positive integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1944
+#: db/models/fields/__init__.py:2085
 msgid "Positive small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1957
+#: db/models/fields/__init__.py:2098
 #, python-format
 msgid "Slug (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1986
+#: db/models/fields/__init__.py:2127
 msgid "Small integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:1993
+#: db/models/fields/__init__.py:2134
 msgid "Text"
 msgstr ""
 
-#: db/models/fields/__init__.py:2016
+#: 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:2018
+#: 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:2021
+#: db/models/fields/__init__.py:2162
 msgid "Time"
 msgstr ""
 
-#: db/models/fields/__init__.py:2146
+#: db/models/fields/__init__.py:2290
 msgid "URL"
 msgstr ""
 
-#: db/models/fields/__init__.py:2169
+#: db/models/fields/__init__.py:2313
 msgid "Raw binary data"
 msgstr ""
 
-#: db/models/fields/files.py:224
+#: 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:374
+#: db/models/fields/files.py:389
 msgid "Image"
 msgstr ""
 
-#: db/models/fields/related.py:1594
+#: db/models/fields/related.py:1798
 #, python-format
-msgid "%(model)s instance with pk %(pk)r does not exist."
+msgid "%(model)s instance with %(field)s %(value)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:1596
+#: db/models/fields/related.py:1800
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:1787
+#: db/models/fields/related.py:2013
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1857
+#: db/models/fields/related.py:2103
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: forms/fields.py:55
+#: forms/fields.py:64
 msgid "This field is required."
 msgstr ""
 
-#: forms/fields.py:239
+#: forms/fields.py:237
 msgid "Enter a whole number."
 msgstr ""
 
-#: forms/fields.py:282 forms/fields.py:319
+#: forms/fields.py:280 forms/fields.py:317
 msgid "Enter a number."
 msgstr ""
 
-#: forms/fields.py:321
+#: forms/fields.py:319
 #, 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:325
+#: forms/fields.py:323
 #, 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:329
+#: forms/fields.py:327
 #, python-format
 msgid ""
 "Ensure that there are no more than %(max)s digit before the decimal point."
@@ -696,31 +792,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:440 forms/fields.py:1139
+#: forms/fields.py:438 forms/fields.py:1189
 msgid "Enter a valid date."
 msgstr ""
 
-#: forms/fields.py:464 forms/fields.py:1140
+#: forms/fields.py:462 forms/fields.py:1190
 msgid "Enter a valid time."
 msgstr ""
 
-#: forms/fields.py:486
+#: forms/fields.py:484
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: forms/fields.py:567
+#: forms/fields.py:525
+msgid "Enter a valid duration."
+msgstr ""
+
+#: forms/fields.py:589
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: forms/fields.py:568
+#: forms/fields.py:590
 msgid "No file was submitted."
 msgstr ""
 
-#: forms/fields.py:569
+#: forms/fields.py:591
 msgid "The submitted file is empty."
 msgstr ""
 
-#: forms/fields.py:571
+#: forms/fields.py:593
 #, python-format
 msgid "Ensure this filename has at most %(max)d character (it has %(length)d)."
 msgid_plural ""
@@ -728,42 +828,46 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms/fields.py:574
+#: forms/fields.py:596
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:635
+#: forms/fields.py:658
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1182
+#: forms/fields.py:823 forms/fields.py:917 forms/models.py:1220
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1181
+#: forms/fields.py:918 forms/fields.py:1033 forms/models.py:1219
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/fields.py:988
+#: forms/fields.py:1034
 msgid "Enter a complete value."
 msgstr ""
 
+#: forms/fields.py:1260
+msgid "Enter a valid UUID."
+msgstr ""
+
 #. Translators: This is the default suffix added to form field labels
-#: forms/forms.py:122
+#: forms/forms.py:125
 msgid ":"
 msgstr ""
 
-#: forms/forms.py:192
+#: forms/forms.py:207
 #, 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:625
+#: forms/forms.py:652
 msgid ":?.!"
 msgstr ""
 
@@ -793,103 +897,103 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: forms/models.py:707
+#: forms/models.py:715
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:711
+#: forms/models.py:719
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:717
+#: forms/models.py:725
 #, 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:725
+#: forms/models.py:733
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:1018
+#: forms/models.py:1039
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:1084
+#: forms/models.py:1105
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:1184
+#: forms/models.py:1222
 #, python-format
 msgid "\"%(pk)s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/utils.py:145
+#: forms/utils.py:165
 #, 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:340
+#: forms/widgets.py:343
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:341
+#: forms/widgets.py:344
 msgid "Change"
 msgstr ""
 
-#: forms/widgets.py:342
+#: forms/widgets.py:345
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:536
+#: forms/widgets.py:553
 msgid "Unknown"
 msgstr ""
 
-#: forms/widgets.py:537
+#: forms/widgets.py:554
 msgid "Yes"
 msgstr ""
 
-#: forms/widgets.py:538
+#: forms/widgets.py:555
 msgid "No"
 msgstr ""
 
-#: template/defaultfilters.py:849
+#: template/defaultfilters.py:859
 msgid "yes,no,maybe"
 msgstr ""
 
-#: template/defaultfilters.py:878 template/defaultfilters.py:890
+#: template/defaultfilters.py:888 template/defaultfilters.py:900
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/defaultfilters.py:892
+#: template/defaultfilters.py:902
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:894
+#: template/defaultfilters.py:904
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: template/defaultfilters.py:896
+#: template/defaultfilters.py:906
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: template/defaultfilters.py:898
+#: template/defaultfilters.py:908
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:900
+#: template/defaultfilters.py:910
 #, python-format
 msgid "%s PB"
 msgstr ""
@@ -1255,15 +1359,15 @@ msgstr[1] ""
 msgid "0 minutes"
 msgstr ""
 
-#: views/csrf.py:105
+#: views/csrf.py:106
 msgid "Forbidden"
 msgstr ""
 
-#: views/csrf.py:106
+#: views/csrf.py:107
 msgid "CSRF verification failed. Request aborted."
 msgstr ""
 
-#: views/csrf.py:110
+#: views/csrf.py:111
 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 "
@@ -1271,49 +1375,49 @@ msgid ""
 "hijacked by third parties."
 msgstr ""
 
-#: views/csrf.py:115
+#: views/csrf.py:116
 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:120
+#: views/csrf.py:121
 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:125
+#: views/csrf.py:126
 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:129
+#: views/csrf.py:131
 msgid "More information is available with DEBUG=True."
 msgstr ""
 
-#: views/debug.py:517
+#: views/debug.py:582
 msgid "Welcome to Django"
 msgstr ""
 
-#: views/debug.py:518
+#: views/debug.py:583
 msgid "It worked!"
 msgstr ""
 
-#: views/debug.py:519
+#: views/debug.py:584
 msgid "Congratulations on your first Django-powered page."
 msgstr ""
 
-#: views/debug.py:520
+#: views/debug.py:585
 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:522
+#: views/debug.py:587
 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!"
@@ -1335,52 +1439,52 @@ msgstr ""
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:369 views/generic/dates.py:397
+#: views/generic/dates.py:373 views/generic/dates.py:401
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:650
+#: views/generic/dates.py:655
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:682
+#: views/generic/dates.py:689
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
 
-#: views/generic/detail.py:54
+#: views/generic/detail.py:55
 #, python-format
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:62
+#: views/generic/list.py:76
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:67
+#: views/generic/list.py:81
 #, python-format
 msgid "Invalid page (%(page_number)s): %(message)s"
 msgstr ""
 
-#: views/generic/list.py:158
+#: views/generic/list.py:172
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
 
-#: views/static.py:54
+#: views/static.py:56
 msgid "Directory indexes are not allowed here."
 msgstr ""
 
-#: views/static.py:56
+#: views/static.py:58
 #, python-format
 msgid "\"%(path)s\" does not exist"
 msgstr ""
 
-#: views/static.py:97
+#: views/static.py:98
 #, 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 7303a2529e..8bce097676 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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -18,16 +18,16 @@ msgstr ""
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: contrib/admin/actions.py:62 contrib/admin/options.py:1615
+#: contrib/admin/actions.py:62 contrib/admin/options.py:1722
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: contrib/admin/actions.py:64 contrib/admin/options.py:1617
+#: contrib/admin/actions.py:64 contrib/admin/options.py:1724
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/actions.py:84
+#: contrib/admin/actions.py:88
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr ""
@@ -36,41 +36,41 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: contrib/admin/filters.py:104 contrib/admin/filters.py:199
-#: contrib/admin/filters.py:239 contrib/admin/filters.py:276
-#: contrib/admin/filters.py:387
+#: 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
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filters.py:240
+#: contrib/admin/filters.py:244
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filters.py:241
+#: contrib/admin/filters.py:245
 msgid "No"
 msgstr ""
 
-#: contrib/admin/filters.py:255
+#: contrib/admin/filters.py:259
 msgid "Unknown"
 msgstr ""
 
-#: contrib/admin/filters.py:315
+#: contrib/admin/filters.py:319
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filters.py:316
+#: contrib/admin/filters.py:320
 msgid "Today"
 msgstr ""
 
-#: contrib/admin/filters.py:320
+#: contrib/admin/filters.py:324
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filters.py:324
+#: contrib/admin/filters.py:328
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filters.py:328
+#: contrib/admin/filters.py:332
 msgid "This year"
 msgstr ""
 
@@ -81,222 +81,223 @@ msgid ""
 "that both fields may be case-sensitive."
 msgstr ""
 
-#: contrib/admin/helpers.py:23
+#: contrib/admin/helpers.py:27
 msgid "Action:"
 msgstr ""
 
-#: contrib/admin/models.py:25
+#: contrib/admin/models.py:30
 msgid "action time"
 msgstr ""
 
-#: contrib/admin/models.py:28
+#: contrib/admin/models.py:33
 msgid "object id"
 msgstr ""
 
-#: contrib/admin/models.py:29
+#: contrib/admin/models.py:34
 msgid "object repr"
 msgstr ""
 
-#: contrib/admin/models.py:30
+#: contrib/admin/models.py:35
 msgid "action flag"
 msgstr ""
 
-#: contrib/admin/models.py:31
+#: contrib/admin/models.py:36
 msgid "change message"
 msgstr ""
 
-#: contrib/admin/models.py:36
+#: contrib/admin/models.py:41
 msgid "log entry"
 msgstr ""
 
-#: contrib/admin/models.py:37
+#: contrib/admin/models.py:42
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/models.py:46
+#: contrib/admin/models.py:51
 #, python-format
 msgid "Added \"%(object)s\"."
 msgstr ""
 
-#: contrib/admin/models.py:48
+#: contrib/admin/models.py:53
 #, python-format
 msgid "Changed \"%(object)s\" - %(changes)s"
 msgstr ""
 
-#: contrib/admin/models.py:53
+#: contrib/admin/models.py:58
 #, python-format
 msgid "Deleted \"%(object)s.\""
 msgstr ""
 
-#: contrib/admin/models.py:55
+#: contrib/admin/models.py:60
 msgid "LogEntry Object"
 msgstr ""
 
-#: contrib/admin/options.py:225 contrib/admin/options.py:254
+#: contrib/admin/options.py:228 contrib/admin/options.py:257
 msgid "None"
 msgstr ""
 
-#: contrib/admin/options.py:287
+#: contrib/admin/options.py:293
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: contrib/admin/options.py:955
+#: contrib/admin/options.py:1021
 #, python-format
 msgid "Changed %s."
 msgstr ""
 
-#: contrib/admin/options.py:955 contrib/admin/options.py:965
-#: contrib/admin/options.py:1807
+#: contrib/admin/options.py:1021 contrib/admin/options.py:1031
+#: contrib/admin/options.py:1926
 msgid "and"
 msgstr ""
 
-#: contrib/admin/options.py:960
+#: contrib/admin/options.py:1026
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr ""
 
-#: contrib/admin/options.py:964
+#: contrib/admin/options.py:1030
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr ""
 
-#: contrib/admin/options.py:969
+#: contrib/admin/options.py:1035
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr ""
 
-#: contrib/admin/options.py:973
+#: contrib/admin/options.py:1039
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/options.py:1097 contrib/admin/options.py:1137
+#: contrib/admin/options.py:1165 contrib/admin/options.py:1221
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/options.py:1108
+#: contrib/admin/options.py:1179
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may add another "
 "%(name)s below."
 msgstr ""
 
-#: contrib/admin/options.py:1115
+#: contrib/admin/options.py:1186
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/options.py:1130
+#: contrib/admin/options.py:1214
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again "
 "below."
 msgstr ""
 
-#: contrib/admin/options.py:1147
+#: contrib/admin/options.py:1231
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was changed successfully. You may add another "
 "%(name)s below."
 msgstr ""
 
-#: contrib/admin/options.py:1156
+#: contrib/admin/options.py:1240
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/options.py:1239 contrib/admin/options.py:1480
+#: contrib/admin/options.py:1323 contrib/admin/options.py:1579
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: contrib/admin/options.py:1258
+#: contrib/admin/options.py:1342
 msgid "No action selected."
 msgstr ""
 
-#: contrib/admin/options.py:1270
+#: contrib/admin/options.py:1360
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/options.py:1347 contrib/admin/options.py:1592
+#: contrib/admin/options.py:1447 contrib/admin/options.py:1697
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: contrib/admin/options.py:1397
+#: contrib/admin/options.py:1497
 #, python-format
 msgid "Add %s"
 msgstr ""
 
-#: contrib/admin/options.py:1397
+#: contrib/admin/options.py:1497
 #, python-format
 msgid "Change %s"
 msgstr ""
 
-#: contrib/admin/options.py:1459
+#: contrib/admin/options.py:1558
 msgid "Database error"
 msgstr ""
 
-#: contrib/admin/options.py:1522
+#: contrib/admin/options.py:1621
 #, 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:1549
+#: contrib/admin/options.py:1648
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/admin/options.py:1555
+#: contrib/admin/options.py:1654
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: contrib/admin/options.py:1654
+#: contrib/admin/options.py:1765
 #, 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:1801
+#. Translators: Model verbose name and instance representation,
+#. suitable to be an item in a list.
+#: contrib/admin/options.py:1920
 #, python-format
 msgid "%(class_name)s %(instance)s"
 msgstr ""
 
-#: contrib/admin/options.py:1808
+#: contrib/admin/options.py:1927
 #, 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:36 contrib/admin/templates/admin/base_site.html:3
+#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:3
 msgid "Django site admin"
 msgstr ""
 
-#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6
+#: contrib/admin/sites.py:42 contrib/admin/templates/admin/base_site.html:6
 msgid "Django administration"
 msgstr ""
 
-#: contrib/admin/sites.py:42
+#: contrib/admin/sites.py:45
 msgid "Site administration"
 msgstr ""
 
-#: contrib/admin/sites.py:347 contrib/admin/templates/admin/login.html:47
+#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:49
 #: contrib/admin/templates/registration/password_reset_complete.html:18
 #: contrib/admin/tests.py:113
 msgid "Log in"
 msgstr ""
 
-#: contrib/admin/sites.py:474
+#: contrib/admin/sites.py:505
 #, python-format
 msgid "%(app)s administration"
 msgstr ""
@@ -313,7 +314,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:50
+#: contrib/admin/templates/admin/base.html:58
 #: contrib/admin/templates/admin/change_form.html:18
 #: contrib/admin/templates/admin/change_list.html:40
 #: contrib/admin/templates/admin/delete_confirmation.html:8
@@ -380,8 +381,8 @@ msgid "Enter a username and password."
 msgstr ""
 
 #: contrib/admin/templates/admin/auth/user/change_password.html:17
-#: contrib/admin/templates/admin/auth/user/change_password.html:49
-#: contrib/admin/templates/admin/base.html:39
+#: contrib/admin/templates/admin/auth/user/change_password.html:54
+#: 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 "Change password"
@@ -390,7 +391,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:17
+#: contrib/admin/templates/admin/login.html:19
 #: contrib/admin/templates/registration/password_change_form.html:21
 msgid "Please correct the error below."
 msgstr ""
@@ -398,7 +399,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:17
+#: contrib/admin/templates/admin/login.html:19
 #: contrib/admin/templates/registration/password_change_form.html:21
 msgid "Please correct the errors below."
 msgstr ""
@@ -408,21 +409,21 @@ msgstr ""
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 
-#: contrib/admin/templates/admin/auth/user/change_password.html:43
-msgid "Enter the same password as above, for verification."
-msgstr ""
-
-#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/base.html:32
 msgid "Welcome,"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:36
+#: contrib/admin/templates/admin/base.html:37
+msgid "View site"
+msgstr ""
+
+#: contrib/admin/templates/admin/base.html:42
 #: 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:41
+#: contrib/admin/templates/admin/base.html:48
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:4
 msgid "Log out"
@@ -430,6 +431,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
 msgid "Add"
 msgstr ""
 
@@ -439,8 +441,8 @@ msgid "History"
 msgstr ""
 
 #: contrib/admin/templates/admin/change_form.html:35
-#: contrib/admin/templates/admin/edit_inline/stacked.html:9
-#: contrib/admin/templates/admin/edit_inline/tabular.html:30
+#: contrib/admin/templates/admin/edit_inline/stacked.html:10
+#: contrib/admin/templates/admin/edit_inline/tabular.html:33
 msgid "View on site"
 msgstr ""
 
@@ -467,11 +469,12 @@ 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/submit_line.html:6
 msgid "Delete"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:19
+#: contrib/admin/templates/admin/delete_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -479,30 +482,40 @@ msgid ""
 "following types of objects:"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:27
+#: contrib/admin/templates/admin/delete_confirmation.html:25
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:35
+#: contrib/admin/templates/admin/delete_confirmation.html:32
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "All of the following related items will be deleted:"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:40
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:45
+#: contrib/admin/templates/admin/delete_confirmation.html:34
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:33
+msgid "Objects"
+msgstr ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:41
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:44
 msgid "Yes, I'm sure"
 msgstr ""
 
+#: contrib/admin/templates/admin/delete_confirmation.html:42
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:45
+msgid "No, take me back"
+msgstr ""
+
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:11
 msgid "Delete multiple objects"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:18
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:17
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -510,27 +523,34 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:26
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:24
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:34
+#: contrib/admin/templates/admin/delete_selected_confirmation.html:31
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
 "following objects and their related items will be deleted:"
 msgstr ""
 
-#: contrib/admin/templates/admin/edit_inline/stacked.html:26
-#: contrib/admin/templates/admin/edit_inline/tabular.html:78
-msgid "Remove"
+#: 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
+msgid "Change"
 msgstr ""
 
 #: contrib/admin/templates/admin/edit_inline/stacked.html:27
-#: contrib/admin/templates/admin/edit_inline/tabular.html:77
+#: contrib/admin/templates/admin/edit_inline/tabular.html:81
+msgid "Remove"
+msgstr ""
+
+#: contrib/admin/templates/admin/edit_inline/stacked.html:28
+#: contrib/admin/templates/admin/edit_inline/tabular.html:80
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr ""
@@ -544,15 +564,15 @@ msgstr ""
 msgid " By %(filter_title)s "
 msgstr ""
 
+#: contrib/admin/templates/admin/includes/object_delete_summary.html:2
+msgid "Summary"
+msgstr ""
+
 #: contrib/admin/templates/admin/index.html:20
 #, python-format
 msgid "Models in the %(name)s application"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:37
-msgid "Change"
-msgstr ""
-
 #: contrib/admin/templates/admin/index.html:47
 msgid "You don't have permission to edit anything."
 msgstr ""
@@ -580,7 +600,7 @@ msgid ""
 "the appropriate user."
 msgstr ""
 
-#: contrib/admin/templates/admin/login.html:43
+#: contrib/admin/templates/admin/login.html:45
 msgid "Forgotten your password or username?"
 msgstr ""
 
@@ -603,6 +623,7 @@ msgid ""
 msgstr ""
 
 #: contrib/admin/templates/admin/pagination.html:10
+#: contrib/admin/templates/admin/search_form.html:9
 msgid "Show all"
 msgstr ""
 
@@ -611,6 +632,21 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
+#: contrib/admin/templates/admin/related_widget_wrapper.html:8
+#, python-format
+msgid "Change selected %(model)s"
+msgstr ""
+
+#: contrib/admin/templates/admin/related_widget_wrapper.html:16
+#, python-format
+msgid "Add another %(model)s"
+msgstr ""
+
+#: contrib/admin/templates/admin/related_widget_wrapper.html:24
+#, python-format
+msgid "Delete selected %(model)s"
+msgstr ""
+
 #: contrib/admin/templates/admin/search_form.html:7
 msgid "Search"
 msgstr ""
@@ -662,7 +698,7 @@ msgid ""
 "password twice so we can verify you typed it in correctly."
 msgstr ""
 
-#: contrib/admin/templates/registration/password_change_form.html:48
+#: contrib/admin/templates/registration/password_change_form.html:54
 #: contrib/admin/templates/registration/password_reset_confirm.html:24
 msgid "Change my password"
 msgstr ""
@@ -703,8 +739,8 @@ msgstr ""
 
 #: contrib/admin/templates/registration/password_reset_done.html:15
 msgid ""
-"We've emailed you instructions for setting your password. You should be "
-"receiving them shortly."
+"We've emailed you instructions for setting your password, if an account "
+"exists with the email you entered. You should receive them shortly."
 msgstr ""
 
 #: contrib/admin/templates/registration/password_reset_done.html:17
@@ -751,29 +787,29 @@ msgstr ""
 msgid "Reset my password"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:379
+#: contrib/admin/templatetags/admin_list.py:382
 msgid "All dates"
 msgstr ""
 
-#: contrib/admin/views/main.py:32
+#: contrib/admin/views/main.py:33
 msgid "(None)"
 msgstr ""
 
-#: contrib/admin/views/main.py:76
+#: contrib/admin/views/main.py:80
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:78
+#: contrib/admin/views/main.py:82
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/widgets.py:91
+#: contrib/admin/widgets.py:93
 msgid "Date:"
 msgstr ""
 
-#: contrib/admin/widgets.py:92
+#: contrib/admin/widgets.py:94
 msgid "Time:"
 msgstr ""
 
@@ -781,14 +817,10 @@ msgstr ""
 msgid "Lookup"
 msgstr ""
 
-#: contrib/admin/widgets.py:280
-msgid "Add Another"
-msgstr ""
-
-#: contrib/admin/widgets.py:333
+#: contrib/admin/widgets.py:365
 msgid "Currently:"
 msgstr ""
 
-#: contrib/admin/widgets.py:334
+#: contrib/admin/widgets.py:366
 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 01195bdbc3..47af03bbca 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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+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,19 +14,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: contrib/admin/static/admin/js/SelectFilter2.js:45
-#, c-format
+#, javascript-format
 msgid "Available %s"
 msgstr ""
 
 #: contrib/admin/static/admin/js/SelectFilter2.js:46
-#, c-format
+#, 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
-#, c-format
+#, javascript-format
 msgid "Type into this box to filter down the list of available %s."
 msgstr ""
 
@@ -39,7 +39,7 @@ msgid "Choose all"
 msgstr ""
 
 #: contrib/admin/static/admin/js/SelectFilter2.js:61
-#, c-format
+#, javascript-format
 msgid "Click to choose all %s at once."
 msgstr ""
 
@@ -52,12 +52,12 @@ msgid "Remove"
 msgstr ""
 
 #: contrib/admin/static/admin/js/SelectFilter2.js:75
-#, c-format
+#, javascript-format
 msgid "Chosen %s"
 msgstr ""
 
 #: contrib/admin/static/admin/js/SelectFilter2.js:76
-#, c-format
+#, 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."
@@ -68,7 +68,7 @@ msgid "Remove all"
 msgstr ""
 
 #: contrib/admin/static/admin/js/SelectFilter2.js:80
-#, c-format
+#, javascript-format
 msgid "Click to remove all chosen %s at once."
 msgstr ""
 
@@ -103,14 +103,14 @@ msgid ""
 msgstr ""
 
 #: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79
-#, c-format
+#, 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
-#, c-format
+#, javascript-format
 msgid "Note: You are %s hour behind server time."
 msgid_plural "Note: You are %s hours behind server time."
 msgstr[0] ""
diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
index dfb765f2ca..5bb2a8f7de 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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -176,19 +176,19 @@ msgstr ""
 msgid "Model: %(name)s"
 msgstr ""
 
-#: contrib/admindocs/templates/admin_doc/model_detail.html:35
+#: contrib/admindocs/templates/admin_doc/model_detail.html:34
 msgid "Field"
 msgstr ""
 
-#: contrib/admindocs/templates/admin_doc/model_detail.html:36
+#: contrib/admindocs/templates/admin_doc/model_detail.html:35
 msgid "Type"
 msgstr ""
 
-#: contrib/admindocs/templates/admin_doc/model_detail.html:37
+#: contrib/admindocs/templates/admin_doc/model_detail.html:36
 msgid "Description"
 msgstr ""
 
-#: contrib/admindocs/templates/admin_doc/model_detail.html:52
+#: contrib/admindocs/templates/admin_doc/model_detail.html:51
 msgid "Back to Model Documentation"
 msgstr ""
 
@@ -322,64 +322,59 @@ msgstr ""
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: contrib/admindocs/views.py:69 contrib/admindocs/views.py:71
-#: contrib/admindocs/views.py:73
+#: contrib/admindocs/views.py:71 contrib/admindocs/views.py:73
+#: contrib/admindocs/views.py:75
 msgid "tag:"
 msgstr ""
 
-#: contrib/admindocs/views.py:102 contrib/admindocs/views.py:104
-#: contrib/admindocs/views.py:106
+#: contrib/admindocs/views.py:104 contrib/admindocs/views.py:106
+#: contrib/admindocs/views.py:108
 msgid "filter:"
 msgstr ""
 
-#: contrib/admindocs/views.py:153 contrib/admindocs/views.py:155
-#: contrib/admindocs/views.py:157
+#: contrib/admindocs/views.py:156 contrib/admindocs/views.py:158
+#: contrib/admindocs/views.py:160
 msgid "view:"
 msgstr ""
 
-#: contrib/admindocs/views.py:184
-#, python-format
-msgid "App %(app_label)r not found"
-msgstr ""
-
 #: contrib/admindocs/views.py:188
 #, python-format
+msgid "App %(app_label)r not found"
+msgstr ""
+
+#: contrib/admindocs/views.py:192
+#, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 
-#: contrib/admindocs/views.py:201
+#: 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
+msgid "model:"
+msgstr ""
+
+#: contrib/admindocs/views.py:211
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr ""
 
-#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:225
-#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244
-#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263
-msgid "model:"
-msgstr ""
-
-#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253
+#: contrib/admindocs/views.py:231 contrib/admindocs/views.py:266
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr ""
 
-#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258
+#: contrib/admindocs/views.py:238 contrib/admindocs/views.py:274
 #, python-format
 msgid "all %s"
 msgstr ""
 
-#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263
+#: contrib/admindocs/views.py:243 contrib/admindocs/views.py:279
 #, python-format
 msgid "number of %s"
 msgstr ""
 
-#. Translators: %s is an object type name
-#: contrib/admindocs/views.py:268
-#, python-format
-msgid "Attributes on %s objects"
-msgstr ""
-
-#: contrib/admindocs/views.py:362
+#: contrib/admindocs/views.py:389
 #, 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 d37c78776d..03447e81b7 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: 2014-05-20 12:20+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -34,231 +34,224 @@ msgstr ""
 msgid "Change password: %s"
 msgstr ""
 
-#: contrib/auth/apps.py:10
+#: contrib/auth/apps.py:12
 msgid "Authentication and Authorization"
 msgstr ""
 
-#: contrib/auth/forms.py:37 contrib/auth/tests/test_forms.py:316
-#: contrib/auth/tests/test_forms.py:321 contrib/auth/tests/test_forms.py:504
+#: contrib/auth/forms.py:38 contrib/auth/tests/test_forms.py:315
+#: contrib/auth/tests/test_forms.py:320 contrib/auth/tests/test_forms.py:530
 msgid "No password set."
 msgstr ""
 
-#: contrib/auth/forms.py:43 contrib/auth/tests/test_forms.py:326
-#: contrib/auth/tests/test_forms.py:332
+#: contrib/auth/forms.py:44 contrib/auth/tests/test_forms.py:325
+#: contrib/auth/tests/test_forms.py:331
 msgid "Invalid password format or unknown hashing algorithm."
 msgstr ""
 
-#: contrib/auth/forms.py:76
-msgid "A user with that username already exists."
-msgstr ""
-
-#: contrib/auth/forms.py:77 contrib/auth/forms.py:285
-#: contrib/auth/forms.py:349
+#: contrib/auth/forms.py:77 contrib/auth/forms.py:273
+#: contrib/auth/forms.py:337
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: contrib/auth/forms.py:79 contrib/auth/forms.py:129
-msgid "Username"
-msgstr ""
-
-#: contrib/auth/forms.py:81 contrib/auth/forms.py:130
-#: contrib/auth/models.py:383
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
-msgstr ""
-
-#: contrib/auth/forms.py:84 contrib/auth/forms.py:133
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: contrib/auth/forms.py:86 contrib/auth/forms.py:135
-#: contrib/auth/forms.py:163 contrib/auth/forms.py:352
+#: contrib/auth/forms.py:79 contrib/auth/forms.py:108
+#: contrib/auth/forms.py:136 contrib/auth/forms.py:341
 msgid "Password"
 msgstr ""
 
-#: contrib/auth/forms.py:88
+#: contrib/auth/forms.py:81
 msgid "Password confirmation"
 msgstr ""
 
-#: contrib/auth/forms.py:90
+#: contrib/auth/forms.py:83 contrib/auth/forms.py:347
 msgid "Enter the same password as above, for verification."
 msgstr ""
 
-#: contrib/auth/forms.py:136
+#: contrib/auth/forms.py:109
 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>."
 msgstr ""
 
-#: contrib/auth/forms.py:166
+#: contrib/auth/forms.py:139
 #, python-format
 msgid ""
 "Please enter a correct %(username)s and password. Note that both fields may "
 "be case-sensitive."
 msgstr ""
 
-#: contrib/auth/forms.py:168
+#: contrib/auth/forms.py:141
 msgid "This account is inactive."
 msgstr ""
 
-#: contrib/auth/forms.py:231
+#: contrib/auth/forms.py:204
 msgid "Email"
 msgstr ""
 
-#: contrib/auth/forms.py:287
+#: contrib/auth/forms.py:275
 msgid "New password"
 msgstr ""
 
-#: contrib/auth/forms.py:289
+#: contrib/auth/forms.py:277
 msgid "New password confirmation"
 msgstr ""
 
-#: contrib/auth/forms.py:320
+#: contrib/auth/forms.py:308
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: contrib/auth/forms.py:323
+#: contrib/auth/forms.py:311
 msgid "Old password"
 msgstr ""
 
-#: contrib/auth/forms.py:354
+#: contrib/auth/forms.py:345
 msgid "Password (again)"
 msgstr ""
 
-#: contrib/auth/hashers.py:252 contrib/auth/hashers.py:335
-#: contrib/auth/hashers.py:383 contrib/auth/hashers.py:411
-#: contrib/auth/hashers.py:444 contrib/auth/hashers.py:477
-#: contrib/auth/hashers.py:511
+#: 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
 msgid "algorithm"
 msgstr ""
 
-#: contrib/auth/hashers.py:253
+#: contrib/auth/hashers.py:252
 msgid "iterations"
 msgstr ""
 
-#: contrib/auth/hashers.py:254 contrib/auth/hashers.py:337
-#: contrib/auth/hashers.py:384 contrib/auth/hashers.py:412
-#: contrib/auth/hashers.py:512
+#: 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
 msgid "salt"
 msgstr ""
 
-#: contrib/auth/hashers.py:255 contrib/auth/hashers.py:385
-#: contrib/auth/hashers.py:413 contrib/auth/hashers.py:445
-#: contrib/auth/hashers.py:478 contrib/auth/hashers.py:513
+#: 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
 msgid "hash"
 msgstr ""
 
-#: contrib/auth/hashers.py:336
+#: contrib/auth/hashers.py:335
 msgid "work factor"
 msgstr ""
 
-#: contrib/auth/hashers.py:338
+#: contrib/auth/hashers.py:337
 msgid "checksum"
 msgstr ""
 
-#: contrib/auth/models.py:64 contrib/auth/models.py:113
+#: contrib/auth/models.py:65 contrib/auth/models.py:116
 msgid "name"
 msgstr ""
 
-#: contrib/auth/models.py:66
+#: 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:115
+#: contrib/auth/models.py:72 contrib/auth/models.py:118
 msgid "permissions"
 msgstr ""
 
-#: contrib/auth/models.py:120
+#: contrib/auth/models.py:123
 msgid "group"
 msgstr ""
 
-#: contrib/auth/models.py:121 contrib/auth/models.py:308
+#: contrib/auth/models.py:124 contrib/auth/models.py:312
 msgid "groups"
 msgstr ""
 
-#: contrib/auth/models.py:193
+#: contrib/auth/models.py:197
 msgid "password"
 msgstr ""
 
-#: contrib/auth/models.py:194
+#: contrib/auth/models.py:198
 msgid "last login"
 msgstr ""
 
-#: contrib/auth/models.py:305
+#: contrib/auth/models.py:309
 msgid "superuser status"
 msgstr ""
 
-#: contrib/auth/models.py:306
+#: contrib/auth/models.py:310
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: contrib/auth/models.py:309
+#: contrib/auth/models.py:313
 msgid ""
 "The groups this user belongs to. A user will get all permissions granted to "
-"each of his/her group."
+"each of their groups."
 msgstr ""
 
-#: contrib/auth/models.py:314
+#: contrib/auth/models.py:318
 msgid "user permissions"
 msgstr ""
 
-#: contrib/auth/models.py:315
+#: contrib/auth/models.py:319
 msgid "Specific permissions for this user."
 msgstr ""
 
-#: contrib/auth/models.py:382
+#: contrib/auth/models.py:386
 msgid "username"
 msgstr ""
 
-#: contrib/auth/models.py:386
-msgid "Enter a valid username."
-msgstr ""
-
-#: contrib/auth/models.py:388
-msgid "first name"
-msgstr ""
-
-#: contrib/auth/models.py:389
-msgid "last name"
-msgstr ""
-
-#: contrib/auth/models.py:390
-msgid "email address"
+#: contrib/auth/models.py:387
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
 
 #: contrib/auth/models.py:391
+msgid ""
+"Enter a valid username. This value may contain only letters, numbers and @/./"
+"+/-/_ characters."
+msgstr ""
+
+#: contrib/auth/models.py:396
+msgid "A user with that username already exists."
+msgstr ""
+
+#: contrib/auth/models.py:398
+msgid "first name"
+msgstr ""
+
+#: contrib/auth/models.py:399
+msgid "last name"
+msgstr ""
+
+#: contrib/auth/models.py:400
+msgid "email address"
+msgstr ""
+
+#: contrib/auth/models.py:401
 msgid "staff status"
 msgstr ""
 
-#: contrib/auth/models.py:392
+#: contrib/auth/models.py:402
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: contrib/auth/models.py:394
+#: contrib/auth/models.py:404
 msgid "active"
 msgstr ""
 
-#: contrib/auth/models.py:395
+#: contrib/auth/models.py:405
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: contrib/auth/models.py:397
+#: contrib/auth/models.py:407
 msgid "date joined"
 msgstr ""
 
-#: contrib/auth/models.py:405
+#: contrib/auth/models.py:415
 msgid "user"
 msgstr ""
 
-#: contrib/auth/models.py:406
+#: contrib/auth/models.py:416
 msgid "users"
 msgstr ""
 
@@ -267,38 +260,38 @@ msgstr ""
 msgid "Password reset on %(site_name)s"
 msgstr ""
 
-#: contrib/auth/tests/test_forms.py:387
+#: contrib/auth/tests/test_forms.py:383
 msgid "Enter a valid email address."
 msgstr ""
 
-#: contrib/auth/views.py:92
+#: contrib/auth/views.py:98
 msgid "Logged out"
 msgstr ""
 
-#: contrib/auth/views.py:169
+#: contrib/auth/views.py:184
 msgid "Password reset"
 msgstr ""
 
-#: contrib/auth/views.py:181
-msgid "Password reset successful"
+#: contrib/auth/views.py:199
+msgid "Password reset sent"
 msgstr ""
 
-#: contrib/auth/views.py:216
+#: contrib/auth/views.py:237
 msgid "Enter new password"
 msgstr ""
 
-#: contrib/auth/views.py:227
+#: contrib/auth/views.py:248
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: contrib/auth/views.py:244
+#: contrib/auth/views.py:268
 msgid "Password reset complete"
 msgstr ""
 
-#: contrib/auth/views.py:278
+#: contrib/auth/views.py:305
 msgid "Password change"
 msgstr ""
 
-#: contrib/auth/views.py:291
+#: contrib/auth/views.py:321
 msgid "Password change successful"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
index e337553ac8..7c42dd4eff 100644
--- a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,19 +13,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/contenttypes/apps.py:9
+#: contrib/contenttypes/apps.py:12
 msgid "Content Types"
 msgstr ""
 
-#: contrib/contenttypes/models.py:134
+#: contrib/contenttypes/models.py:160
 msgid "python model class name"
 msgstr ""
 
-#: contrib/contenttypes/models.py:138
+#: contrib/contenttypes/models.py:164
 msgid "content type"
 msgstr ""
 
-#: contrib/contenttypes/models.py:139
+#: contrib/contenttypes/models.py:165
 msgid "content types"
 msgstr ""
 
diff --git a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
index e2d832b5d5..10fa09aa9d 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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -30,21 +30,21 @@ msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
 
-#: contrib/flatpages/forms.py:11
+#: contrib/flatpages/forms.py:12
 msgid ""
 "This value must contain only letters, numbers, dots, underscores, dashes, "
 "slashes or tildes."
 msgstr ""
 
-#: contrib/flatpages/forms.py:22
+#: contrib/flatpages/forms.py:25
 msgid "URL is missing a leading slash."
 msgstr ""
 
-#: contrib/flatpages/forms.py:29
+#: contrib/flatpages/forms.py:32
 msgid "URL is missing a trailing slash."
 msgstr ""
 
-#: contrib/flatpages/forms.py:46
+#: contrib/flatpages/forms.py:49
 #, python-format
 msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
@@ -65,25 +65,25 @@ msgstr ""
 msgid "template name"
 msgstr ""
 
-#: contrib/flatpages/models.py:17
+#: contrib/flatpages/models.py:18
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 msgstr ""
 
-#: contrib/flatpages/models.py:18
+#: contrib/flatpages/models.py:22
 msgid "registration required"
 msgstr ""
 
-#: contrib/flatpages/models.py:19
+#: contrib/flatpages/models.py:23
 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:29
 msgid "flat page"
 msgstr ""
 
-#: contrib/flatpages/models.py:26
+#: contrib/flatpages/models.py:30
 msgid "flat pages"
 msgstr ""
 
diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po
index be68c9f53f..6dec22a1f9 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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,42 +13,46 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/gis/apps.py:8
+#: contrib/gis/apps.py:9
 msgid "GIS"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:56
+#: contrib/gis/db/models/fields.py:78
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:298
+#: contrib/gis/db/models/fields.py:324
 msgid "Point"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:304
+#: contrib/gis/db/models/fields.py:330
 msgid "Line string"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:310
+#: contrib/gis/db/models/fields.py:336
 msgid "Polygon"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:316
+#: contrib/gis/db/models/fields.py:342
 msgid "Multi-point"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:322
+#: contrib/gis/db/models/fields.py:348
 msgid "Multi-line string"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:328
+#: contrib/gis/db/models/fields.py:354
 msgid "Multi polygon"
 msgstr ""
 
-#: contrib/gis/db/models/fields.py:334
+#: contrib/gis/db/models/fields.py:360
 msgid "Geometry collection"
 msgstr ""
 
+#: contrib/gis/db/models/fields.py:366
+msgid "Extent Aggregate Field"
+msgstr ""
+
 #: contrib/gis/forms/fields.py:22
 msgid "No geometry value provided."
 msgstr ""
diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
index 0f0bdddb89..c406066732 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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -207,48 +207,48 @@ msgstr ""
 msgid "five"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:153
+#: contrib/humanize/templatetags/humanize.py:154
 msgid "six"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:153
+#: contrib/humanize/templatetags/humanize.py:154
 msgid "seven"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:153
+#: contrib/humanize/templatetags/humanize.py:154
 msgid "eight"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:153
+#: contrib/humanize/templatetags/humanize.py:154
 msgid "nine"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:177 contrib/humanize/tests.py:145
+#: contrib/humanize/templatetags/humanize.py:178 contrib/humanize/tests.py:145
 msgid "today"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:179 contrib/humanize/tests.py:145
+#: contrib/humanize/templatetags/humanize.py:180 contrib/humanize/tests.py:145
 msgid "tomorrow"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:181 contrib/humanize/tests.py:145
+#: contrib/humanize/templatetags/humanize.py:182 contrib/humanize/tests.py:145
 msgid "yesterday"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:201
+#: contrib/humanize/templatetags/humanize.py:202
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: contrib/humanize/templatetags/humanize.py:204
-#: contrib/humanize/templatetags/humanize.py:232
+#: contrib/humanize/templatetags/humanize.py:205
+#: contrib/humanize/templatetags/humanize.py:233
 msgid "now"
 msgstr ""
 
 #. Translators: please keep a non-breaking space (U+00A0)
 #. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:209
+#: contrib/humanize/templatetags/humanize.py:210
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
@@ -257,7 +257,7 @@ msgstr[1] ""
 
 #. Translators: please keep a non-breaking space (U+00A0)
 #. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:216
+#: contrib/humanize/templatetags/humanize.py:217
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
@@ -266,14 +266,14 @@ msgstr[1] ""
 
 #. Translators: please keep a non-breaking space (U+00A0)
 #. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:223
+#: contrib/humanize/templatetags/humanize.py:224
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: contrib/humanize/templatetags/humanize.py:229
+#: contrib/humanize/templatetags/humanize.py:230
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
@@ -281,7 +281,7 @@ msgstr ""
 
 #. Translators: please keep a non-breaking space (U+00A0)
 #. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:237
+#: contrib/humanize/templatetags/humanize.py:238
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
@@ -290,7 +290,7 @@ msgstr[1] ""
 
 #. Translators: please keep a non-breaking space (U+00A0)
 #. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:244
+#: contrib/humanize/templatetags/humanize.py:245
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
@@ -299,7 +299,7 @@ msgstr[1] ""
 
 #. Translators: please keep a non-breaking space (U+00A0)
 #. between count and time unit.
-#: contrib/humanize/templatetags/humanize.py:251
+#: contrib/humanize/templatetags/humanize.py:252
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/messages/locale/en/LC_MESSAGES/django.po b/django/contrib/messages/locale/en/LC_MESSAGES/django.po
index 998a504a37..6ca468b883 100644
--- a/django/contrib/messages/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/messages/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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 msgid "Messages"
 msgstr ""
 
-#: contrib/messages/tests/base.py:105
+#: contrib/messages/tests/base.py:113
 msgid "lazy message"
 msgstr ""
diff --git a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
index 045e4cbec6..2b73f2d161 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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
diff --git a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po b/django/contrib/sessions/locale/en/LC_MESSAGES/django.po
index c4e7cb0ba7..2ce1872340 100644
--- a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -17,22 +17,22 @@ msgstr ""
 msgid "Sessions"
 msgstr ""
 
-#: contrib/sessions/models.py:38
+#: contrib/sessions/models.py:44
 msgid "session key"
 msgstr ""
 
-#: contrib/sessions/models.py:40
+#: contrib/sessions/models.py:46
 msgid "session data"
 msgstr ""
 
-#: contrib/sessions/models.py:41
+#: contrib/sessions/models.py:47
 msgid "expire date"
 msgstr ""
 
-#: contrib/sessions/models.py:46
+#: contrib/sessions/models.py:52
 msgid "session"
 msgstr ""
 
-#: contrib/sessions/models.py:47
+#: contrib/sessions/models.py:53
 msgid "sessions"
 msgstr ""
diff --git a/django/contrib/sites/locale/en/LC_MESSAGES/django.po b/django/contrib/sites/locale/en/LC_MESSAGES/django.po
index 86595beea4..3b1884c4af 100644
--- a/django/contrib/sites/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/sites/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: 2014-05-19 15:17+0200\n"
+"POT-Creation-Date: 2015-01-17 11:07+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/sites/apps.py:8
+#: contrib/sites/apps.py:11
 msgid "Sites"
 msgstr ""
 
@@ -21,18 +21,18 @@ msgstr ""
 msgid "The domain name cannot contain any spaces or tabs."
 msgstr ""
 
-#: contrib/sites/models.py:67
+#: contrib/sites/models.py:81
 msgid "domain name"
 msgstr ""
 
-#: contrib/sites/models.py:69
+#: contrib/sites/models.py:83
 msgid "display name"
 msgstr ""
 
-#: contrib/sites/models.py:74
+#: contrib/sites/models.py:88
 msgid "site"
 msgstr ""
 
-#: contrib/sites/models.py:75
+#: contrib/sites/models.py:89
 msgid "sites"
 msgstr ""