diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 61090a2d87..abb52ae27f 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -4,707 +4,745 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 20:57+0100\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
 msgid "Arabic"
 msgstr ""
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
 msgid "Azerbaijani"
 msgstr ""
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
 msgid "Bulgarian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
 msgid "Bengali"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
 msgid "Bosnian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
 msgid "Catalan"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
 msgid "Czech"
 msgstr ""
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
 msgid "Welsh"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:56
 msgid "Danish"
 msgstr ""
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:57
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:58
 msgid "Greek"
 msgstr ""
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:59
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:60
 msgid "British English"
 msgstr ""
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:61
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:62
 msgid "Argentinian Spanish"
 msgstr ""
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:63
 msgid "Mexican Spanish"
 msgstr ""
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:64
 msgid "Nicaraguan Spanish"
 msgstr ""
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:65
 msgid "Estonian"
 msgstr ""
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:66
 msgid "Basque"
 msgstr ""
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:67
 msgid "Persian"
 msgstr ""
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:68
 msgid "Finnish"
 msgstr ""
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:69
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:70
 msgid "Frisian"
 msgstr ""
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:71
 msgid "Irish"
 msgstr ""
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:72
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:73
 msgid "Hebrew"
 msgstr ""
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:74
 msgid "Hindi"
 msgstr ""
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:75
 msgid "Croatian"
 msgstr ""
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:76
 msgid "Hungarian"
 msgstr ""
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:77
 msgid "Indonesian"
 msgstr ""
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:78
 msgid "Icelandic"
 msgstr ""
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:79
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:80
 msgid "Japanese"
 msgstr ""
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:81
 msgid "Georgian"
 msgstr ""
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:82
 msgid "Khmer"
 msgstr ""
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:83
 msgid "Kannada"
 msgstr ""
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:84
 msgid "Korean"
 msgstr ""
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:85
 msgid "Lithuanian"
 msgstr ""
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:86
 msgid "Latvian"
 msgstr ""
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:87
 msgid "Macedonian"
 msgstr ""
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:88
 msgid "Malayalam"
 msgstr ""
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:89
 msgid "Mongolian"
 msgstr ""
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:90
 msgid "Dutch"
 msgstr ""
 
-#: conf/global_settings.py:87
-msgid "Norwegian"
-msgstr ""
-
-#: conf/global_settings.py:88
+#: conf/global_settings.py:91
 msgid "Norwegian Bokmal"
 msgstr ""
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:92
 msgid "Norwegian Nynorsk"
 msgstr ""
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:93
 msgid "Punjabi"
 msgstr ""
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:94
 msgid "Polish"
 msgstr ""
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:95
 msgid "Portuguese"
 msgstr ""
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:96
 msgid "Brazilian Portuguese"
 msgstr ""
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:97
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:95
+#: conf/global_settings.py:98
 msgid "Russian"
 msgstr ""
 
-#: conf/global_settings.py:96
+#: conf/global_settings.py:99
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:97
+#: conf/global_settings.py:100
 msgid "Slovenian"
 msgstr ""
 
-#: conf/global_settings.py:98
+#: conf/global_settings.py:101
 msgid "Albanian"
 msgstr ""
 
-#: conf/global_settings.py:99
+#: conf/global_settings.py:102
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:100
+#: conf/global_settings.py:103
 msgid "Serbian Latin"
 msgstr ""
 
-#: conf/global_settings.py:101
+#: conf/global_settings.py:104
 msgid "Swedish"
 msgstr ""
 
-#: conf/global_settings.py:102
+#: conf/global_settings.py:105
 msgid "Tamil"
 msgstr ""
 
-#: conf/global_settings.py:103
+#: conf/global_settings.py:106
 msgid "Telugu"
 msgstr ""
 
-#: conf/global_settings.py:104
+#: conf/global_settings.py:107
 msgid "Thai"
 msgstr ""
 
-#: conf/global_settings.py:105
+#: conf/global_settings.py:108
 msgid "Turkish"
 msgstr ""
 
-#: conf/global_settings.py:106
+#: conf/global_settings.py:109
 msgid "Ukrainian"
 msgstr ""
 
-#: conf/global_settings.py:107
+#: conf/global_settings.py:110
 msgid "Urdu"
 msgstr ""
 
-#: conf/global_settings.py:108
+#: conf/global_settings.py:111
 msgid "Vietnamese"
 msgstr ""
 
-#: conf/global_settings.py:109
+#: conf/global_settings.py:112
 msgid "Simplified Chinese"
 msgstr ""
 
-#: conf/global_settings.py:110
+#: conf/global_settings.py:113
 msgid "Traditional Chinese"
 msgstr ""
 
-#: core/validators.py:21 forms/fields.py:67
+#: core/validators.py:24 forms/fields.py:51
 msgid "Enter a valid value."
 msgstr ""
 
-#: core/validators.py:89 forms/fields.py:575
+#: core/validators.py:99 forms/fields.py:601
 msgid "This URL appears to be a broken link."
 msgstr ""
 
-#: core/validators.py:94 forms/fields.py:574
+#: core/validators.py:131 forms/fields.py:600
 msgid "Enter a valid URL."
 msgstr ""
 
-#: core/validators.py:138 forms/fields.py:449
+#: core/validators.py:164 forms/fields.py:474
 msgid "Enter a valid e-mail address."
 msgstr ""
 
-#: core/validators.py:141 forms/fields.py:958
+#: core/validators.py:167 forms/fields.py:1022
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: core/validators.py:144 forms/fields.py:951
+#: core/validators.py:170 core/validators.py:187 forms/fields.py:996
 msgid "Enter a valid IPv4 address."
 msgstr ""
 
-#: core/validators.py:147 db/models/fields/__init__.py:575
+#: core/validators.py:174 core/validators.py:188
+msgid "Enter a valid IPv6 address."
+msgstr ""
+
+#: core/validators.py:183 core/validators.py:186
+msgid "Enter a valid IPv4 or IPv6 address."
+msgstr ""
+
+#: core/validators.py:208 db/models/fields/__init__.py:636
 msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: core/validators.py:153
+#: core/validators.py:214
 #, python-format
 msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
 msgstr ""
 
-#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:232 forms/fields.py:209 forms/fields.py:262
 #, python-format
 msgid "Ensure this value is less than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:237 forms/fields.py:210 forms/fields.py:263
 #, python-format
 msgid "Ensure this value is greater than or equal to %(limit_value)s."
 msgstr ""
 
-#: core/validators.py:182
+#: core/validators.py:243
 #, python-format
 msgid ""
-"Ensure this value has at least %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at least %(limit_value)d characters (it has "
+"%(show_value)d)."
 msgstr ""
 
-#: core/validators.py:188
+#: core/validators.py:249
 #, python-format
 msgid ""
-"Ensure this value has at most %(limit_value)d characters (it has %"
-"(show_value)d)."
+"Ensure this value has at most %(limit_value)d characters (it has "
+"%(show_value)d)."
 msgstr ""
 
-#: db/models/base.py:769
+#: db/models/base.py:765
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr ""
 
-#: db/models/base.py:784 db/models/base.py:792
+#: db/models/base.py:788 forms/models.py:570
+msgid "and"
+msgstr ""
+
+#: db/models/base.py:789 db/models/fields/__init__.py:65
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr ""
 
-#: db/models/base.py:791 forms/models.py:562
-msgid "and"
-msgstr ""
-
-#: db/models/fields/__init__.py:63
+#: db/models/fields/__init__.py:62
 #, python-format
 msgid "Value %r is not a valid choice."
 msgstr ""
 
-#: db/models/fields/__init__.py:64
+#: db/models/fields/__init__.py:63
 msgid "This field cannot be null."
 msgstr ""
 
-#: db/models/fields/__init__.py:65
+#: db/models/fields/__init__.py:64
 msgid "This field cannot be blank."
 msgstr ""
 
-#: db/models/fields/__init__.py:70
+#: db/models/fields/__init__.py:71
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
-#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
-#: db/models/fields/__init__.py:1018
+#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:948
+#: db/models/fields/__init__.py:1103 db/models/fields/__init__.py:1114
+#: db/models/fields/__init__.py:1141
 msgid "Integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-msgid "This value must be an integer."
+#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:946
+#, python-format
+msgid "'%s' value must be an integer."
 msgstr ""
 
-#: db/models/fields/__init__.py:493
-msgid "This value must be either True or False."
+#: db/models/fields/__init__.py:551
+#, python-format
+msgid "'%s' value must be either True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:495
+#: db/models/fields/__init__.py:553
 msgid "Boolean (Either True or False)"
 msgstr ""
 
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
+#: db/models/fields/__init__.py:603 db/models/fields/__init__.py:1124
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr ""
 
-#: db/models/fields/__init__.py:570
+#: db/models/fields/__init__.py:631
 msgid "Comma-separated integers"
 msgstr ""
 
-#: db/models/fields/__init__.py:584
+#: db/models/fields/__init__.py:645
+#, python-format
+msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
+msgstr ""
+
+#: db/models/fields/__init__.py:647 db/models/fields/__init__.py:732
+#, python-format
+msgid ""
+"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
+msgstr ""
+
+#: db/models/fields/__init__.py:650
 msgid "Date (without time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:588
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr ""
-
-#: db/models/fields/__init__.py:589
+#: db/models/fields/__init__.py:730
 #, python-format
-msgid "Invalid date: %s"
+msgid ""
+"'%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:670
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
+#: db/models/fields/__init__.py:734
+#, python-format
+msgid ""
+"'%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:672
+#: db/models/fields/__init__.py:738
 msgid "Date (with time)"
 msgstr ""
 
-#: db/models/fields/__init__.py:746
-msgid "This value must be a decimal number."
+#: db/models/fields/__init__.py:818
+#, python-format
+msgid "'%s' value must be a decimal number."
 msgstr ""
 
-#: db/models/fields/__init__.py:748
+#: db/models/fields/__init__.py:820
 msgid "Decimal number"
 msgstr ""
 
-#: db/models/fields/__init__.py:803
+#: db/models/fields/__init__.py:877
 msgid "E-mail address"
 msgstr ""
 
-#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:326
+#: db/models/fields/__init__.py:893 db/models/fields/files.py:214
+#: db/models/fields/files.py:321
 msgid "File path"
 msgstr ""
 
-#: db/models/fields/__init__.py:841
-msgid "This value must be a float."
+#: db/models/fields/__init__.py:917
+#, python-format
+msgid "'%s' value must be a float."
 msgstr ""
 
-#: db/models/fields/__init__.py:843
+#: db/models/fields/__init__.py:919
 msgid "Floating point number"
 msgstr ""
 
-#: db/models/fields/__init__.py:902
+#: db/models/fields/__init__.py:980
 msgid "Big (8 byte) integer"
 msgstr ""
 
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:994
+msgid "IPv4 address"
+msgstr ""
+
+#: db/models/fields/__init__.py:1010
 msgid "IP address"
 msgstr ""
 
-#: db/models/fields/__init__.py:931
-msgid "This value must be either None, True or False."
+#: db/models/fields/__init__.py:1052
+#, python-format
+msgid "'%s' value must be either None, True or False."
 msgstr ""
 
-#: db/models/fields/__init__.py:933
+#: db/models/fields/__init__.py:1054
 msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: db/models/fields/__init__.py:1024
+#: db/models/fields/__init__.py:1147
 msgid "Text"
 msgstr ""
 
-#: db/models/fields/__init__.py:1040
+#: db/models/fields/__init__.py:1165
+#, python-format
+msgid ""
+"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
+msgstr ""
+
+#: db/models/fields/__init__.py:1167
+#, python-format
+msgid ""
+"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
+"time."
+msgstr ""
+
+#: db/models/fields/__init__.py:1170
 msgid "Time"
 msgstr ""
 
-#: db/models/fields/__init__.py:1044
-msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr ""
-
-#: db/models/fields/__init__.py:1120
+#: db/models/fields/__init__.py:1234
 msgid "URL"
 msgstr ""
 
-#: db/models/fields/__init__.py:1136
-msgid "XML text"
-msgstr ""
-
-#: db/models/fields/related.py:815
+#: db/models/fields/related.py:902
 #, python-format
 msgid "Model %(model)s with pk %(pk)r does not exist."
 msgstr ""
 
-#: db/models/fields/related.py:817
+#: db/models/fields/related.py:904
 msgid "Foreign Key (type determined by related field)"
 msgstr ""
 
-#: db/models/fields/related.py:941
+#: db/models/fields/related.py:1032
 msgid "One-to-one relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1003
+#: db/models/fields/related.py:1095
 msgid "Many-to-many relationship"
 msgstr ""
 
-#: db/models/fields/related.py:1023
+#: db/models/fields/related.py:1119
 msgid ""
 "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: forms/fields.py:66
+#: forms/fields.py:50
 msgid "This field is required."
 msgstr ""
 
-#: forms/fields.py:221
+#: forms/fields.py:208
 msgid "Enter a whole number."
 msgstr ""
 
-#: forms/fields.py:253 forms/fields.py:274
+#: forms/fields.py:240 forms/fields.py:261
 msgid "Enter a number."
 msgstr ""
 
-#: forms/fields.py:277
+#: forms/fields.py:264
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
 msgstr ""
 
-#: forms/fields.py:278
+#: forms/fields.py:265
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr ""
 
-#: forms/fields.py:279
+#: forms/fields.py:266
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
 msgstr ""
 
-#: forms/fields.py:342 forms/fields.py:918
+#: forms/fields.py:365 forms/fields.py:962
 msgid "Enter a valid date."
 msgstr ""
 
-#: forms/fields.py:370 forms/fields.py:919
+#: forms/fields.py:388 forms/fields.py:963
 msgid "Enter a valid time."
 msgstr ""
 
-#: forms/fields.py:396
+#: forms/fields.py:409
 msgid "Enter a valid date/time."
 msgstr ""
 
-#: forms/fields.py:460
+#: forms/fields.py:485
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
 
-#: forms/fields.py:461
+#: forms/fields.py:486
 msgid "No file was submitted."
 msgstr ""
 
-#: forms/fields.py:462
+#: forms/fields.py:487
 msgid "The submitted file is empty."
 msgstr ""
 
-#: forms/fields.py:463
+#: forms/fields.py:488
 #, python-format
 msgid ""
 "Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 
-#: forms/fields.py:464
+#: forms/fields.py:489
 msgid "Please either submit a file or check the clear checkbox, not both."
 msgstr ""
 
-#: forms/fields.py:518
+#: forms/fields.py:544
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: forms/fields.py:650 forms/fields.py:725
+#: forms/fields.py:689 forms/fields.py:769
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr ""
 
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:985
+#: forms/fields.py:770 forms/fields.py:858 forms/models.py:992
 msgid "Enter a list of values."
 msgstr ""
 
-#: forms/formsets.py:305 forms/formsets.py:307
+#: forms/formsets.py:317 forms/formsets.py:319
 msgid "Order"
 msgstr ""
 
-#: forms/formsets.py:309
+#: forms/formsets.py:321
 msgid "Delete"
 msgstr ""
 
-#: forms/models.py:556
+#: forms/models.py:564
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr ""
 
-#: forms/models.py:560
+#: forms/models.py:568
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 
-#: forms/models.py:566
+#: forms/models.py:574
 #, 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:574
+#: forms/models.py:582
 msgid "Please correct the duplicate values below."
 msgstr ""
 
-#: forms/models.py:835
+#: forms/models.py:842
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
 
-#: forms/models.py:896
+#: forms/models.py:903
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:986
+#: forms/models.py:993
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr ""
 
-#: forms/models.py:988
+#: forms/models.py:995
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr ""
 
-#: forms/widgets.py:299
+#: forms/util.py:70
+#, 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:326
 msgid "Currently"
 msgstr ""
 
-#: forms/widgets.py:300
+#: forms/widgets.py:327
 msgid "Change"
 msgstr ""
 
-#: forms/widgets.py:301
+#: forms/widgets.py:328
 msgid "Clear"
 msgstr ""
 
-#: forms/widgets.py:548
+#: forms/widgets.py:583
 msgid "Unknown"
 msgstr ""
 
-#: forms/widgets.py:548
+#: forms/widgets.py:584
 msgid "Yes"
 msgstr ""
 
-#: forms/widgets.py:548
+#: forms/widgets.py:585
 msgid "No"
 msgstr ""
 
-#: template/defaultfilters.py:777
+#: template/defaultfilters.py:785
 msgid "yes,no,maybe"
 msgstr ""
 
-#: template/defaultfilters.py:805 template/defaultfilters.py:810
+#: template/defaultfilters.py:813 template/defaultfilters.py:818
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/defaultfilters.py:812
+#: template/defaultfilters.py:820
 #, python-format
 msgid "%s KB"
 msgstr ""
 
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:822
 #, python-format
 msgid "%s MB"
 msgstr ""
 
-#: template/defaultfilters.py:816
+#: template/defaultfilters.py:824
 #, python-format
 msgid "%s GB"
 msgstr ""
 
-#: template/defaultfilters.py:818
+#: template/defaultfilters.py:826
 #, python-format
 msgid "%s TB"
 msgstr ""
 
-#: template/defaultfilters.py:819
+#: template/defaultfilters.py:827
 #, python-format
 msgid "%s PB"
 msgstr ""
 
-#: utils/dateformat.py:42
+#: utils/dateformat.py:45
 msgid "p.m."
 msgstr ""
 
-#: utils/dateformat.py:43
+#: utils/dateformat.py:46
 msgid "a.m."
 msgstr ""
 
-#: utils/dateformat.py:48
+#: utils/dateformat.py:51
 msgid "PM"
 msgstr ""
 
-#: utils/dateformat.py:49
+#: utils/dateformat.py:52
 msgid "AM"
 msgstr ""
 
-#: utils/dateformat.py:98
+#: utils/dateformat.py:101
 msgid "midnight"
 msgstr ""
 
-#: utils/dateformat.py:100
+#: utils/dateformat.py:103
 msgid "noon"
 msgstr ""
 
@@ -980,85 +1018,71 @@ msgctxt "alt. month"
 msgid "December"
 msgstr ""
 
-#: utils/text.py:136
+#: utils/text.py:65
+#, python-format
+msgctxt "String to return when truncating text"
+msgid "%(truncated_text)s..."
+msgstr ""
+
+#: utils/text.py:234
 msgid "or"
 msgstr ""
 
 #. Translators: This string is used as a separator between list elements
-#: utils/text.py:153
+#: utils/text.py:251
 msgid ", "
 msgstr ""
 
-#: utils/timesince.py:21
+#: utils/timesince.py:20
 msgid "year"
 msgid_plural "years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:22
+#: utils/timesince.py:21
 msgid "month"
 msgid_plural "months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:23
+#: utils/timesince.py:22
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:24
+#: utils/timesince.py:23
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:25
+#: utils/timesince.py:24
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:26
+#: utils/timesince.py:25
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: utils/timesince.py:45
+#: utils/timesince.py:41
 msgid "minutes"
 msgstr ""
 
-#: utils/timesince.py:50
+#: utils/timesince.py:46
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr ""
 
-#: utils/timesince.py:56
+#: utils/timesince.py:52
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ""
 
-#: utils/translation/trans_real.py:578
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
-
-#: utils/translation/trans_real.py:579
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
-
-#: utils/translation/trans_real.py:580
-msgid "TIME_FORMAT"
-msgstr "P"
-
-#: utils/translation/trans_real.py:601
-msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
-
-#: utils/translation/trans_real.py:602
-msgid "MONTH_DAY_FORMAT"
-msgstr "F j"
-
 #: views/generic/create_update.py:121
 #, python-format
 msgid "The %(verbose_name)s was created successfully."
@@ -1090,19 +1114,19 @@ msgstr ""
 msgid "No week specified"
 msgstr ""
 
-#: views/generic/dates.py:198 views/generic/dates.py:214
+#: views/generic/dates.py:198 views/generic/dates.py:215
 #, python-format
 msgid "No %(verbose_name_plural)s available"
 msgstr ""
 
-#: views/generic/dates.py:466
+#: views/generic/dates.py:467
 #, python-format
 msgid ""
 "Future %(verbose_name_plural)s not available because %(class_name)s."
 "allow_future is False."
 msgstr ""
 
-#: views/generic/dates.py:500
+#: views/generic/dates.py:501
 #, python-format
 msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
 msgstr ""
@@ -1112,16 +1136,16 @@ msgstr ""
 msgid "No %(verbose_name)s found matching the query"
 msgstr ""
 
-#: views/generic/list.py:47
+#: views/generic/list.py:45
 msgid "Page is not 'last', nor can it be converted to an int."
 msgstr ""
 
-#: views/generic/list.py:52
+#: views/generic/list.py:50
 #, python-format
 msgid "Invalid page (%(page_number)s)"
 msgstr ""
 
-#: views/generic/list.py:119
+#: views/generic/list.py:117
 #, python-format
 msgid "Empty list and '%(class_name)s.allow_empty' is False."
 msgstr ""
diff --git a/django/contrib/admin/locale/en/LC_MESSAGES/django.po b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
index 46c5d509bf..7bbb77e86f 100644
--- a/django/contrib/admin/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/admin/locale/en/LC_MESSAGES/django.po
@@ -4,80 +4,74 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-20 21:03+0100\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: actions.py:49
+#: actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr ""
 
-#: actions.py:61 options.py:1219
+#: actions.py:60 options.py:1295
 #, python-format
 msgid "Cannot delete %(name)s"
 msgstr ""
 
-#: actions.py:63 options.py:1221
+#: actions.py:62 options.py:1297
 msgid "Are you sure?"
 msgstr ""
 
-#: actions.py:85
+#: actions.py:83
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr ""
 
-#: filterspecs.py:54
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: filterspecs.py:104 filterspecs.py:139 filterspecs.py:168 filterspecs.py:258
+#: filters.py:99 filters.py:189 filters.py:229 filters.py:266 filters.py:371
 msgid "All"
 msgstr ""
 
-#: filterspecs.py:139
+#: filters.py:230
 msgid "Yes"
 msgstr ""
 
-#: filterspecs.py:139
+#: filters.py:231
 msgid "No"
 msgstr ""
 
-#: filterspecs.py:150
+#: filters.py:245
 msgid "Unknown"
 msgstr ""
 
-#: filterspecs.py:196
+#: filters.py:295
 msgid "Any date"
 msgstr ""
 
-#: filterspecs.py:197
+#: filters.py:296
 msgid "Today"
 msgstr ""
 
-#: filterspecs.py:200
+#: filters.py:301
 msgid "Past 7 days"
 msgstr ""
 
-#: filterspecs.py:203
+#: filters.py:305
 msgid "This month"
 msgstr ""
 
-#: filterspecs.py:205
+#: filters.py:309
 msgid "This year"
 msgstr ""
 
 #: forms.py:9
 msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+"Please enter the correct username and password for a staff account. Note "
+"that both fields are case-sensitive."
 msgstr ""
 
 #: forms.py:18
@@ -113,157 +107,176 @@ msgstr ""
 msgid "change message"
 msgstr ""
 
-#: models.py:28
+#: models.py:30
 msgid "log entry"
 msgstr ""
 
-#: models.py:29
+#: models.py:31
 msgid "log entries"
 msgstr ""
 
-#: options.py:147 options.py:162
+#: models.py:40
+#, python-format
+msgid "Added \"%(object)s\"."
+msgstr ""
+
+#: models.py:42
+#, python-format
+msgid "Changed \"%(object)s\" - %(changes)s"
+msgstr ""
+
+#: models.py:44
+#, python-format
+msgid "Deleted \"%(object)s.\""
+msgstr ""
+
+#: models.py:46
+msgid "LogEntry Object"
+msgstr ""
+
+#: options.py:149 options.py:165
 msgid "None"
 msgstr ""
 
-#: options.py:627
+#: options.py:671
 #, python-format
 msgid "Changed %s."
 msgstr ""
 
-#: options.py:627 options.py:637
+#: options.py:671 options.py:681
 msgid "and"
 msgstr ""
 
-#: options.py:632
+#: options.py:676
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:636
+#: options.py:680
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:641
+#: options.py:685
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr ""
 
-#: options.py:645
+#: options.py:689
 msgid "No fields changed."
 msgstr ""
 
-#: options.py:717
+#: options.py:772
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: options.py:721 options.py:761
+#: options.py:776 options.py:824
 msgid "You may edit it again below."
 msgstr ""
 
-#: options.py:731 options.py:771
+#: options.py:788 options.py:837
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: options.py:759
+#: options.py:822
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: options.py:767
+#: options.py:830
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: options.py:827 options.py:1085
+#: options.py:899 options.py:1159
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
 msgstr ""
 
-#: options.py:846
+#: options.py:918
 msgid "No action selected."
 msgstr ""
 
-#: options.py:927
+#: options.py:998
 #, python-format
 msgid "Add %s"
 msgstr ""
 
-#: options.py:953 options.py:1194
+#: options.py:1023 options.py:1267
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr ""
 
-#: options.py:1018
+#: options.py:1089
 #, python-format
 msgid "Change %s"
 msgstr ""
 
-#: options.py:1065
+#: options.py:1138
 msgid "Database error"
 msgstr ""
 
-#: options.py:1127
+#: options.py:1201
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1154
+#: options.py:1228
 #, python-format
 msgid "%(total_count)s selected"
 msgid_plural "All %(total_count)s selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: options.py:1159
+#: options.py:1233
 #, python-format
 msgid "0 of %(cnt)s selected"
 msgstr ""
 
-#: options.py:1210
+#: options.py:1283
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: options.py:1255
+#: options.py:1330
 #, python-format
 msgid "Change history: %s"
 msgstr ""
 
-#: sites.py:319 templates/admin/login.html:42
-#: templates/registration/password_reset_complete.html:14
-#: views/decorators.py:26
+#: sites.py:311 tests.py:41 templates/admin/login.html:42
+#: templates/registration/password_reset_complete.html:20
+#: views/decorators.py:23
 msgid "Log in"
 msgstr ""
 
-#: sites.py:375
+#: sites.py:376
 msgid "Site administration"
 msgstr ""
 
-#: sites.py:419
+#: sites.py:428
 #, python-format
 msgid "%s administration"
 msgstr ""
 
-#: widgets.py:75
+#: widgets.py:87
 msgid "Date:"
 msgstr ""
 
-#: widgets.py:75
+#: widgets.py:87
 msgid "Time:"
 msgstr ""
 
-#: widgets.py:140
+#: widgets.py:161
 msgid "Lookup"
 msgstr ""
 
-#: widgets.py:246
+#: widgets.py:267
 msgid "Add Another"
 msgstr ""
 
@@ -275,36 +288,36 @@ msgstr ""
 msgid "We're sorry, but the requested page could not be found."
 msgstr ""
 
-#: templates/admin/500.html:4 templates/admin/app_index.html:8
-#: templates/admin/base.html:55 templates/admin/change_form.html:19
-#: templates/admin/change_list.html:42
-#: templates/admin/delete_confirmation.html:6
-#: templates/admin/delete_selected_confirmation.html:6
-#: templates/admin/invalid_setup.html:4 templates/admin/object_history.html:6
-#: templates/admin/auth/user/change_password.html:12
-#: templates/registration/logged_out.html:4
-#: templates/registration/password_change_done.html:5
-#: templates/registration/password_change_form.html:6
-#: templates/registration/password_reset_complete.html:4
-#: templates/registration/password_reset_confirm.html:4
-#: templates/registration/password_reset_done.html:4
-#: templates/registration/password_reset_form.html:4
+#: templates/admin/500.html:7 templates/admin/app_index.html:8
+#: templates/admin/base.html:45 templates/admin/change_form.html:21
+#: templates/admin/change_list.html:43
+#: templates/admin/delete_confirmation.html:8
+#: templates/admin/delete_selected_confirmation.html:8
+#: templates/admin/invalid_setup.html:7 templates/admin/object_history.html:8
+#: templates/admin/auth/user/change_password.html:15
+#: templates/registration/logged_out.html:5
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_form.html:8
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_confirm.html:7
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_form.html:7
 msgid "Home"
 msgstr ""
 
-#: templates/admin/500.html:4
+#: templates/admin/500.html:8
 msgid "Server error"
 msgstr ""
 
-#: templates/admin/500.html:6
+#: templates/admin/500.html:12
 msgid "Server error (500)"
 msgstr ""
 
-#: templates/admin/500.html:9
+#: templates/admin/500.html:15
 msgid "Server Error <em>(500)</em>"
 msgstr ""
 
-#: templates/admin/500.html:10
+#: templates/admin/500.html:16
 msgid ""
 "There's been an error. It's been reported to the site administrators via e-"
 "mail and should be fixed shortly. Thanks for your patience."
@@ -331,7 +344,7 @@ msgstr ""
 msgid "Clear selection"
 msgstr ""
 
-#: templates/admin/app_index.html:10 templates/admin/index.html:19
+#: templates/admin/app_index.html:11 templates/admin/index.html:19
 #, python-format
 msgid "%(name)s"
 msgstr ""
@@ -346,15 +359,15 @@ msgstr ""
 msgid "Documentation"
 msgstr ""
 
-#: templates/admin/base.html:41
-#: templates/admin/auth/user/change_password.html:16
-#: templates/admin/auth/user/change_password.html:49
+#: templates/admin/base.html:35
+#: templates/admin/auth/user/change_password.html:19
+#: templates/admin/auth/user/change_password.html:53
 #: templates/registration/password_change_done.html:4
 #: templates/registration/password_change_form.html:5
 msgid "Change password"
 msgstr ""
 
-#: templates/admin/base.html:48
+#: templates/admin/base.html:36
 #: templates/registration/password_change_done.html:4
 #: templates/registration/password_change_form.html:5
 msgid "Log out"
@@ -368,44 +381,57 @@ msgstr ""
 msgid "Django administration"
 msgstr ""
 
-#: templates/admin/change_form.html:22 templates/admin/index.html:29
+#: templates/admin/change_form.html:24 templates/admin/index.html:29
 msgid "Add"
 msgstr ""
 
-#: templates/admin/change_form.html:31 templates/admin/object_history.html:10
+#: templates/admin/change_form.html:34 templates/admin/object_history.html:12
 msgid "History"
 msgstr ""
 
-#: templates/admin/change_form.html:32
+#: templates/admin/change_form.html:35
 #: templates/admin/edit_inline/stacked.html:9
-#: templates/admin/edit_inline/tabular.html:28
+#: templates/admin/edit_inline/tabular.html:30
 msgid "View on site"
 msgstr ""
 
-#: templates/admin/change_form.html:43 templates/admin/change_list.html:73
+#: templates/admin/change_form.html:46 templates/admin/change_list.html:69
 #: templates/admin/login.html:17
-#: templates/admin/auth/user/change_password.html:25
-#: templates/registration/password_change_form.html:16
+#: templates/admin/auth/user/change_password.html:29
+#: templates/registration/password_change_form.html:21
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/admin/change_list.html:64
+#: templates/admin/change_list.html:60
 #, python-format
 msgid "Add %(name)s"
 msgstr ""
 
-#: templates/admin/change_list.html:84
+#: templates/admin/change_list.html:80
 msgid "Filter"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:10
+#: templates/admin/change_list_results.html:17
+msgid "Remove from sorting"
+msgstr ""
+
+#: templates/admin/change_list_results.html:18
+#, python-format
+msgid "Sorting priority: %(priority_number)s"
+msgstr ""
+
+#: templates/admin/change_list_results.html:19
+msgid "Toggle sorting"
+msgstr ""
+
+#: templates/admin/delete_confirmation.html:12
 #: templates/admin/submit_line.html:4
 msgid "Delete"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:17
+#: templates/admin/delete_confirmation.html:19
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -413,30 +439,30 @@ msgid ""
 "following types of objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:25
+#: templates/admin/delete_confirmation.html:27
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the "
 "following protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_confirmation.html:33
+#: templates/admin/delete_confirmation.html:35
 #, 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 ""
 
-#: templates/admin/delete_confirmation.html:38
-#: templates/admin/delete_selected_confirmation.html:43
+#: templates/admin/delete_confirmation.html:40
+#: templates/admin/delete_selected_confirmation.html:45
 msgid "Yes, I'm sure"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:9
+#: templates/admin/delete_selected_confirmation.html:11
 msgid "Delete multiple objects"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:16
+#: templates/admin/delete_selected_confirmation.html:18
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would result in deleting related "
@@ -444,14 +470,14 @@ msgid ""
 "types of objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:24
+#: templates/admin/delete_selected_confirmation.html:26
 #, python-format
 msgid ""
 "Deleting the selected %(objects_name)s would require deleting the following "
 "protected related objects:"
 msgstr ""
 
-#: templates/admin/delete_selected_confirmation.html:32
+#: templates/admin/delete_selected_confirmation.html:34
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(objects_name)s? All of the "
@@ -492,7 +518,7 @@ msgstr ""
 msgid "Unknown content"
 msgstr ""
 
-#: templates/admin/invalid_setup.html:7
+#: templates/admin/invalid_setup.html:13
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
@@ -507,19 +533,19 @@ msgstr ""
 msgid "Password:"
 msgstr ""
 
-#: templates/admin/object_history.html:22
+#: templates/admin/object_history.html:24
 msgid "Date/time"
 msgstr ""
 
-#: templates/admin/object_history.html:23
+#: templates/admin/object_history.html:25
 msgid "User"
 msgstr ""
 
-#: templates/admin/object_history.html:24
+#: templates/admin/object_history.html:26
 msgid "Action"
 msgstr ""
 
-#: templates/admin/object_history.html:38
+#: templates/admin/object_history.html:40
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
@@ -533,18 +559,18 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/admin/search_form.html:8
+#: templates/admin/search_form.html:7
 msgid "Search"
 msgstr ""
 
-#: templates/admin/search_form.html:10
+#: templates/admin/search_form.html:9
 #, python-format
 msgid "%(counter)s result"
 msgid_plural "%(counter)s results"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/admin/search_form.html:10
+#: templates/admin/search_form.html:9
 #, python-format
 msgid "%(full_result_count)s total"
 msgstr ""
@@ -571,138 +597,138 @@ msgstr ""
 msgid "Enter a username and password."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:29
+#: templates/admin/auth/user/change_password.html:33
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:36
+#: templates/admin/auth/user/change_password.html:40
 msgid "Password"
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:42
-#: templates/registration/password_change_form.html:38
+#: templates/admin/auth/user/change_password.html:46
+#: templates/registration/password_change_form.html:43
 msgid "Password (again)"
 msgstr ""
 
-#: templates/admin/auth/user/change_password.html:43
+#: templates/admin/auth/user/change_password.html:47
 msgid "Enter the same password as above, for verification."
 msgstr ""
 
 #: templates/admin/edit_inline/stacked.html:67
-#: templates/admin/edit_inline/tabular.html:113
+#: templates/admin/edit_inline/tabular.html:115
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr ""
 
 #: templates/admin/edit_inline/stacked.html:70
-#: templates/admin/edit_inline/tabular.html:116
+#: templates/admin/edit_inline/tabular.html:118
 msgid "Remove"
 msgstr ""
 
-#: templates/admin/edit_inline/tabular.html:15
+#: templates/admin/edit_inline/tabular.html:17
 msgid "Delete?"
 msgstr ""
 
-#: templates/registration/logged_out.html:8
+#: templates/registration/logged_out.html:9
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
 
-#: templates/registration/logged_out.html:10
+#: templates/registration/logged_out.html:11
 msgid "Log in again"
 msgstr ""
 
-#: templates/registration/password_change_done.html:5
-#: templates/registration/password_change_form.html:6
-#: templates/registration/password_change_form.html:8
-#: templates/registration/password_change_form.html:20
+#: templates/registration/password_change_done.html:8
+#: templates/registration/password_change_form.html:9
+#: templates/registration/password_change_form.html:13
+#: templates/registration/password_change_form.html:25
 msgid "Password change"
 msgstr ""
 
-#: templates/registration/password_change_done.html:7
-#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_done.html:12
+#: templates/registration/password_change_done.html:16
 msgid "Password change successful"
 msgstr ""
 
-#: templates/registration/password_change_done.html:13
+#: templates/registration/password_change_done.html:18
 msgid "Your password was changed."
 msgstr ""
 
-#: templates/registration/password_change_form.html:22
+#: templates/registration/password_change_form.html:27
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
 msgstr ""
 
-#: templates/registration/password_change_form.html:28
+#: templates/registration/password_change_form.html:33
 msgid "Old password"
 msgstr ""
 
-#: templates/registration/password_change_form.html:33
+#: templates/registration/password_change_form.html:38
 msgid "New password"
 msgstr ""
 
-#: templates/registration/password_change_form.html:44
-#: templates/registration/password_reset_confirm.html:21
+#: templates/registration/password_change_form.html:49
+#: templates/registration/password_reset_confirm.html:27
 msgid "Change my password"
 msgstr ""
 
-#: templates/registration/password_reset_complete.html:4
-#: templates/registration/password_reset_confirm.html:6
-#: templates/registration/password_reset_done.html:4
-#: templates/registration/password_reset_form.html:4
-#: templates/registration/password_reset_form.html:6
-#: templates/registration/password_reset_form.html:10
+#: templates/registration/password_reset_complete.html:8
+#: templates/registration/password_reset_confirm.html:12
+#: templates/registration/password_reset_done.html:8
+#: templates/registration/password_reset_form.html:8
+#: templates/registration/password_reset_form.html:12
+#: templates/registration/password_reset_form.html:16
 msgid "Password reset"
 msgstr ""
 
-#: templates/registration/password_reset_complete.html:6
-#: templates/registration/password_reset_complete.html:10
+#: templates/registration/password_reset_complete.html:12
+#: templates/registration/password_reset_complete.html:16
 msgid "Password reset complete"
 msgstr ""
 
-#: templates/registration/password_reset_complete.html:12
+#: templates/registration/password_reset_complete.html:18
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:4
+#: templates/registration/password_reset_confirm.html:8
 msgid "Password reset confirmation"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:12
+#: templates/registration/password_reset_confirm.html:18
 msgid "Enter new password"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:14
+#: templates/registration/password_reset_confirm.html:20
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:18
+#: templates/registration/password_reset_confirm.html:24
 msgid "New password:"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:20
+#: templates/registration/password_reset_confirm.html:26
 msgid "Confirm password:"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:26
+#: templates/registration/password_reset_confirm.html:32
 msgid "Password reset unsuccessful"
 msgstr ""
 
-#: templates/registration/password_reset_confirm.html:28
+#: templates/registration/password_reset_confirm.html:34
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
 
-#: templates/registration/password_reset_done.html:6
-#: templates/registration/password_reset_done.html:10
+#: templates/registration/password_reset_done.html:12
+#: templates/registration/password_reset_done.html:16
 msgid "Password reset successful"
 msgstr ""
 
-#: templates/registration/password_reset_done.html:12
+#: templates/registration/password_reset_done.html:18
 msgid ""
 "We've e-mailed you instructions for setting your password to the e-mail "
 "address you submitted. You should be receiving it shortly."
@@ -732,34 +758,34 @@ msgstr ""
 msgid "The %(site_name)s team"
 msgstr ""
 
-#: templates/registration/password_reset_form.html:12
+#: templates/registration/password_reset_form.html:18
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll e-mail "
 "instructions for setting a new one."
 msgstr ""
 
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_form.html:22
 msgid "E-mail address:"
 msgstr ""
 
-#: templates/registration/password_reset_form.html:16
+#: templates/registration/password_reset_form.html:22
 msgid "Reset my password"
 msgstr ""
 
-#: templatetags/admin_list.py:290
+#: templatetags/admin_list.py:335
 msgid "All dates"
 msgstr ""
 
-#: views/main.py:27
+#: views/main.py:30
 msgid "(None)"
 msgstr ""
 
-#: views/main.py:66
+#: views/main.py:74
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: views/main.py:66
+#: views/main.py:76
 #, python-format
 msgid "Select %s to 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 ac312b420d..c70400713c 100644
--- a/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
+++ b/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po
@@ -4,140 +4,152 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:13-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: media/js/SelectFilter2.js:45
-#, perl-format
+#: static/admin/js/SelectFilter2.js:45
+#, c-format
 msgid "Available %s"
 msgstr ""
 
-#: media/js/SelectFilter2.js:52
+#: static/admin/js/SelectFilter2.js:46
+#, c-format
+msgid ""
+"This is the list of available %s. You may add some by selecting them below "
+"and then clicking the \"Add\" button."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:53
+#, c-format
+msgid "Type into the filter box to narrow down the list of available %s."
+msgstr ""
+
+#: static/admin/js/SelectFilter2.js:57
 msgid "Filter"
 msgstr ""
 
-#: media/js/SelectFilter2.js:59
-msgid "Choose all"
+#: static/admin/js/SelectFilter2.js:61
+msgid "Add all"
 msgstr ""
 
-#: media/js/SelectFilter2.js:64
+#: static/admin/js/SelectFilter2.js:67
 msgid "Add"
 msgstr ""
 
-#: media/js/SelectFilter2.js:66
+#: static/admin/js/SelectFilter2.js:69
 msgid "Remove"
 msgstr ""
 
-#: media/js/SelectFilter2.js:71
-#, perl-format
-msgid "Chosen %s"
+#: static/admin/js/SelectFilter2.js:75
+#, c-format
+msgid "Added %s"
 msgstr ""
 
-#: media/js/SelectFilter2.js:72
-msgid "Select your choice(s) and click "
+#: static/admin/js/SelectFilter2.js:76
+#, c-format
+msgid ""
+"This is the list of added %s. You may remove some by selecting them below "
+"and then clicking the \"Remove\" button."
 msgstr ""
 
-#: media/js/SelectFilter2.js:77
-msgid "Clear all"
+#: static/admin/js/SelectFilter2.js:80
+msgid "Remove all"
 msgstr ""
 
-#: media/js/actions.js:18 media/js/actions.min.js:1
+#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
 msgid_plural "%(sel)s of %(cnt)s selected"
 msgstr[0] ""
 msgstr[1] ""
 
-#: media/js/actions.js:109 media/js/actions.min.js:5
+#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5
 msgid ""
 "You have unsaved changes on individual editable fields. If you run an "
 "action, your unsaved changes will be lost."
 msgstr ""
 
-#: media/js/actions.js:121 media/js/actions.min.js:6
+#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6
 msgid ""
 "You have selected an action, but you haven't saved your changes to "
 "individual fields yet. Please click OK to save. You'll need to re-run the "
 "action."
 msgstr ""
 
-#: media/js/actions.js:123 media/js/actions.min.js:6
+#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6
 msgid ""
 "You have selected an action, and you haven't made any changes on individual "
 "fields. You're probably looking for the Go button rather than the Save "
 "button."
 msgstr ""
 
-#: media/js/calendar.js:24 media/js/dateparse.js:32
+#: static/admin/js/calendar.js:26
 msgid ""
 "January February March April May June July August September October November "
 "December"
 msgstr ""
 
-#: media/js/calendar.js:25
+#: static/admin/js/calendar.js:27
 msgid "S M T W T F S"
 msgstr ""
 
-#: media/js/collapse.js:9 media/js/collapse.js.py:21
-#: media/js/collapse.min.js:1
+#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19
+#: static/admin/js/collapse.min.js:1
 msgid "Show"
 msgstr ""
 
-#: media/js/collapse.js:16 media/js/collapse.min.js:1
+#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1
 msgid "Hide"
 msgstr ""
 
-#: media/js/dateparse.js:33
-msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
-msgstr ""
-
-#: media/js/admin/DateTimeShortcuts.js:49
-#: media/js/admin/DateTimeShortcuts.js:84
+#: static/admin/js/admin/DateTimeShortcuts.js:49
+#: static/admin/js/admin/DateTimeShortcuts.js:85
 msgid "Now"
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:53
+#: static/admin/js/admin/DateTimeShortcuts.js:53
 msgid "Clock"
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:80
+#: static/admin/js/admin/DateTimeShortcuts.js:81
 msgid "Choose a time"
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:85
+#: static/admin/js/admin/DateTimeShortcuts.js:86
 msgid "Midnight"
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:86
+#: static/admin/js/admin/DateTimeShortcuts.js:87
 msgid "6 a.m."
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:87
+#: static/admin/js/admin/DateTimeShortcuts.js:88
 msgid "Noon"
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:91
-#: media/js/admin/DateTimeShortcuts.js:188
+#: static/admin/js/admin/DateTimeShortcuts.js:92
+#: static/admin/js/admin/DateTimeShortcuts.js:204
 msgid "Cancel"
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:133
-#: media/js/admin/DateTimeShortcuts.js:182
+#: static/admin/js/admin/DateTimeShortcuts.js:144
+#: static/admin/js/admin/DateTimeShortcuts.js:197
 msgid "Today"
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:137
+#: static/admin/js/admin/DateTimeShortcuts.js:148
 msgid "Calendar"
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:180
+#: static/admin/js/admin/DateTimeShortcuts.js:195
 msgid "Yesterday"
 msgstr ""
 
-#: media/js/admin/DateTimeShortcuts.js:184
+#: static/admin/js/admin/DateTimeShortcuts.js:199
 msgid "Tomorrow"
 msgstr ""
diff --git a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
index 40df05f922..dda1655a59 100644
--- a/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/admindocs/locale/en/LC_MESSAGES/django.po
@@ -4,88 +4,105 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:13-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: views.py:63 views.py:65 views.py:67
+#: views.py:57 views.py:59 views.py:61
 msgid "tag:"
 msgstr ""
 
-#: views.py:98 views.py:100 views.py:102
+#: views.py:92 views.py:94 views.py:96
 msgid "filter:"
 msgstr ""
 
-#: views.py:162 views.py:164 views.py:166
+#: views.py:155 views.py:157 views.py:159
 msgid "view:"
 msgstr ""
 
-#: views.py:194
+#: views.py:187
 #, python-format
 msgid "App %r not found"
 msgstr ""
 
-#: views.py:201
+#: views.py:194
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
 msgstr ""
 
-#: views.py:213
+#: views.py:206
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr ""
 
-#: views.py:213 views.py:232 views.py:237 views.py:251 views.py:265
-#: views.py:270
+#: views.py:206 views.py:225 views.py:230 views.py:244 views.py:258
+#: views.py:263
 msgid "model:"
 msgstr ""
 
-#: views.py:228 views.py:260
+#: views.py:221 views.py:253
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr ""
 
-#: views.py:232 views.py:265
+#: views.py:225 views.py:258
 #, python-format
 msgid "all %s"
 msgstr ""
 
-#: views.py:237 views.py:270
+#: views.py:230 views.py:263
 #, python-format
 msgid "number of %s"
 msgstr ""
 
-#: views.py:275
+#: views.py:268
 #, python-format
 msgid "Fields on %s objects"
 msgstr ""
 
-#: views.py:365
+#: views.py:357
 #, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:3
+#: templates/admin_doc/bookmarklets.html:7 templates/admin_doc/index.html:7
+#: templates/admin_doc/missing_docutils.html:7
+#: templates/admin_doc/model_detail.html:15
+#: templates/admin_doc/model_index.html:9
+#: templates/admin_doc/template_detail.html:7
+#: templates/admin_doc/template_filter_index.html:8
+#: templates/admin_doc/template_tag_index.html:8
+#: templates/admin_doc/view_detail.html:7
+#: templates/admin_doc/view_index.html:8
 msgid "Home"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:3
+#: templates/admin_doc/bookmarklets.html:8 templates/admin_doc/index.html:8
+#: templates/admin_doc/missing_docutils.html:8
+#: templates/admin_doc/model_detail.html:16
+#: templates/admin_doc/model_index.html:10
+#: templates/admin_doc/template_detail.html:8
+#: templates/admin_doc/template_filter_index.html:9
+#: templates/admin_doc/template_tag_index.html:9
+#: templates/admin_doc/view_detail.html:8
+#: templates/admin_doc/view_index.html:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:3
+#: templates/admin_doc/bookmarklets.html:9
 msgid "Bookmarklets"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:4
+#: templates/admin_doc/bookmarklets.html:12
 msgid "Documentation bookmarklets"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:8
+#: templates/admin_doc/bookmarklets.html:16
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -96,38 +113,60 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:18
+#: templates/admin_doc/bookmarklets.html:26
 msgid "Documentation for this page"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:19
+#: templates/admin_doc/bookmarklets.html:27
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:21
+#: templates/admin_doc/bookmarklets.html:29
 msgid "Show object ID"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:22
+#: templates/admin_doc/bookmarklets.html:30
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:24
+#: templates/admin_doc/bookmarklets.html:32
 msgid "Edit this object (current window)"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:25
+#: templates/admin_doc/bookmarklets.html:33
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:27
+#: templates/admin_doc/bookmarklets.html:35
 msgid "Edit this object (new window)"
 msgstr ""
 
-#: templates/admin_doc/bookmarklets.html:28
+#: templates/admin_doc/bookmarklets.html:36
 msgid "As above, but opens the admin page in a new window."
 msgstr ""
+
+#: templates/admin_doc/model_detail.html:17
+#: templates/admin_doc/model_index.html:11
+msgid "Models"
+msgstr ""
+
+#: templates/admin_doc/template_detail.html:9
+msgid "Templates"
+msgstr ""
+
+#: templates/admin_doc/template_filter_index.html:10
+msgid "Filters"
+msgstr ""
+
+#: templates/admin_doc/template_tag_index.html:10
+msgid "Tags"
+msgstr ""
+
+#: templates/admin_doc/view_detail.html:9
+#: templates/admin_doc/view_index.html:10
+msgid "Views"
+msgstr ""
diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po
index 1bee6bd5ab..8018bf8e57 100644
--- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/auth/locale/en/LC_MESSAGES/django.po
@@ -4,27 +4,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-25 20:39+0200\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin.py:29
+#: admin.py:38
 msgid "Personal info"
 msgstr ""
 
-#: admin.py:30
+#: admin.py:39
 msgid "Permissions"
 msgstr ""
 
-#: admin.py:31
+#: admin.py:40
 msgid "Important dates"
 msgstr ""
 
-#: admin.py:32
+#: admin.py:41
 msgid "Groups"
 msgstr ""
 
@@ -37,196 +38,204 @@ msgstr ""
 msgid "Change password: %s"
 msgstr ""
 
-#: forms.py:17 forms.py:51 forms.py:69
-msgid "Username"
+#: forms.py:37
+msgid "Hash type"
 msgstr ""
 
-#: forms.py:18 forms.py:52
-msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+#: forms.py:39
+msgid "Masked hash"
 msgstr ""
 
-#: forms.py:19 forms.py:53
-msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
-msgstr ""
-
-#: forms.py:20 forms.py:70 forms.py:205
-msgid "Password"
-msgstr ""
-
-#: forms.py:21
-msgid "Password confirmation"
-msgstr ""
-
-#: forms.py:22
-msgid "Enter the same password as above, for verification."
-msgstr ""
-
-#: forms.py:34
+#: forms.py:57
 msgid "A user with that username already exists."
 msgstr ""
 
-#: forms.py:40 forms.py:175 forms.py:217
+#: forms.py:58 forms.py:229 forms.py:279
 msgid "The two password fields didn't match."
 msgstr ""
 
-#: forms.py:90
+#: forms.py:60 forms.py:97 forms.py:120
+msgid "Username"
+msgstr ""
+
+#: forms.py:61 forms.py:98
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
+msgstr ""
+
+#: forms.py:62 forms.py:99
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr ""
+
+#: forms.py:63 forms.py:100 forms.py:121 forms.py:281
+msgid "Password"
+msgstr ""
+
+#: forms.py:64
+msgid "Password confirmation"
+msgstr ""
+
+#: forms.py:65
+msgid "Enter the same password as above, for verification."
+msgstr ""
+
+#: forms.py:100
+msgid ""
+"We don't store raw passwords, so there's no way to see this user's password, "
+"but you can change the password using <a href=\"password/\">this form</a>."
+msgstr ""
+
+#: forms.py:124
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 msgstr ""
 
-#: forms.py:92
-msgid "This account is inactive."
-msgstr ""
-
-#: forms.py:99
+#: forms.py:126
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
 
-#: forms.py:111
-msgid "E-mail"
+#: forms.py:128
+msgid "This account is inactive."
 msgstr ""
 
-#: forms.py:122
+#: forms.py:170
 msgid ""
 "That e-mail address doesn't have an associated user account. Are you sure "
 "you've registered?"
 msgstr ""
 
-#: forms.py:124
+#: forms.py:172
 msgid ""
 "The user account associated with this e-mail address cannot reset the "
 "password."
 msgstr ""
 
-#: forms.py:163
+#: forms.py:175
+msgid "E-mail"
+msgstr ""
+
+#: forms.py:231
 msgid "New password"
 msgstr ""
 
-#: forms.py:164
+#: forms.py:232
 msgid "New password confirmation"
 msgstr ""
 
-#: forms.py:189
-msgid "Old password"
-msgstr ""
-
-#: forms.py:197
+#: forms.py:259
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
 
-#: forms.py:206
+#: forms.py:261
+msgid "Old password"
+msgstr ""
+
+#: forms.py:282
 msgid "Password (again)"
 msgstr ""
 
-#: models.py:94 models.py:122
+#: models.py:51 models.py:79
 msgid "name"
 msgstr ""
 
-#: models.py:96
+#: models.py:53
 msgid "codename"
 msgstr ""
 
-#: models.py:100
+#: models.py:57
 msgid "permission"
 msgstr ""
 
-#: models.py:101 models.py:123
+#: models.py:58 models.py:80
 msgid "permissions"
 msgstr ""
 
-#: models.py:126
+#: models.py:83
 msgid "group"
 msgstr ""
 
-#: models.py:127 models.py:236
+#: models.py:84 models.py:186
 msgid "groups"
 msgstr ""
 
-#: models.py:226
+#: models.py:176
 msgid "username"
 msgstr ""
 
-#: models.py:226
+#: models.py:176
 msgid ""
 "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
 msgstr ""
 
-#: models.py:227
+#: models.py:177
 msgid "first name"
 msgstr ""
 
-#: models.py:228
+#: models.py:178
 msgid "last name"
 msgstr ""
 
-#: models.py:229
+#: models.py:179
 msgid "e-mail address"
 msgstr ""
 
-#: models.py:230
+#: models.py:180
 msgid "password"
 msgstr ""
 
-#: models.py:230
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: models.py:231
+#: models.py:181
 msgid "staff status"
 msgstr ""
 
-#: models.py:231
+#: models.py:181
 msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: models.py:232
+#: models.py:182
 msgid "active"
 msgstr ""
 
-#: models.py:232
+#: models.py:182
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
 
-#: models.py:233
+#: models.py:183
 msgid "superuser status"
 msgstr ""
 
-#: models.py:233
+#: models.py:183
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
 
-#: models.py:234
+#: models.py:184
 msgid "last login"
 msgstr ""
 
-#: models.py:235
+#: models.py:185
 msgid "date joined"
 msgstr ""
 
-#: models.py:237
+#: models.py:187
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
 msgstr ""
 
-#: models.py:238
+#: models.py:188
 msgid "user permissions"
 msgstr ""
 
-#: models.py:242
+#: models.py:192
 msgid "user"
 msgstr ""
 
-#: models.py:243
+#: models.py:193
 msgid "users"
 msgstr ""
 
diff --git a/django/contrib/comments/locale/en/LC_MESSAGES/django.po b/django/contrib/comments/locale/en/LC_MESSAGES/django.po
index 7e39351e6f..d06225c6c4 100644
--- a/django/contrib/comments/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/comments/locale/en/LC_MESSAGES/django.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:14-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,30 +68,30 @@ msgstr ""
 msgid "Latest comments on %(site_name)s"
 msgstr ""
 
-#: forms.py:109
+#: forms.py:96
 msgid "Name"
 msgstr ""
 
-#: forms.py:110
+#: forms.py:97
 msgid "Email address"
 msgstr ""
 
-#: forms.py:111
+#: forms.py:98
 msgid "URL"
 msgstr ""
 
-#: forms.py:112
+#: forms.py:99
 msgid "Comment"
 msgstr ""
 
-#: forms.py:191
+#: forms.py:177
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
 msgstr[0] ""
 msgstr[1] ""
 
-#: forms.py:198
+#: forms.py:184
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
diff --git a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
index 8dc5d494a1..3fd05f2823 100644
--- a/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/contenttypes/locale/en/LC_MESSAGES/django.po
@@ -4,22 +4,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:15-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: models.py:77
+#: models.py:126
 msgid "python model class name"
 msgstr ""
 
-#: models.py:81
+#: models.py:130
 msgid "content type"
 msgstr ""
 
-#: models.py:82
+#: models.py:131
 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 4c8e123e03..2d48a433df 100644
--- a/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/flatpages/locale/en/LC_MESSAGES/django.po
@@ -4,31 +4,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:15-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin.py:8 models.py:7
+#: admin.py:10
+msgid "Advanced options"
+msgstr ""
+
+#: forms.py:6 models.py:7
 msgid "URL"
 msgstr ""
 
-#: admin.py:9
+#: forms.py:7
 msgid ""
 "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
 
-#: admin.py:11
+#: forms.py:9
 msgid ""
 "This value must contain only letters, numbers, dots, underscores, dashes, "
 "slashes or tildes."
 msgstr ""
 
-#: admin.py:22
-msgid "Advanced options"
+#: forms.py:27
+#, python-format
+msgid "Flatpage with url %(url)s already exists for site %(site)s"
 msgstr ""
 
 #: models.py:8
diff --git a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po b/django/contrib/formtools/locale/en/LC_MESSAGES/django.po
index d2b0b1c433..93fd3aa79f 100644
--- a/django/contrib/formtools/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/formtools/locale/en/LC_MESSAGES/django.po
@@ -4,15 +4,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:15-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: wizard.py:176
+#: templates/formtools/wizard/wizard_form.html:15
+msgid "first step"
+msgstr ""
+
+#: templates/formtools/wizard/wizard_form.html:16
+msgid "prev step"
+msgstr ""
+
+#: templates/formtools/wizard/wizard_form.html:18
+msgid "submit"
+msgstr ""
+
+#: wizard/legacy.py:159
 msgid ""
 "We apologize, but your form has expired. Please continue filling out the "
 "form from this page."
diff --git a/django/contrib/gis/locale/en/LC_MESSAGES/django.po b/django/contrib/gis/locale/en/LC_MESSAGES/django.po
index 3a9f4281bb..661a8ba1ce 100644
--- a/django/contrib/gis/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/gis/locale/en/LC_MESSAGES/django.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:16-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/django/contrib/humanize/locale/en/LC_MESSAGES/django.po b/django/contrib/humanize/locale/en/LC_MESSAGES/django.po
index 435aacca0c..e3fb66abb0 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: 2011-09-23 17:43+0200\n"
+"POT-Creation-Date: 2011-12-22 23:56+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,276 +13,276 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests.py:101 templatetags/humanize.py:170
+#: tests.py:102 templatetags/humanize.py:164
 msgid "today"
 msgstr ""
 
-#: tests.py:101 templatetags/humanize.py:174
+#: tests.py:102 templatetags/humanize.py:168
 msgid "yesterday"
 msgstr ""
 
-#: tests.py:101 templatetags/humanize.py:172
+#: tests.py:102 templatetags/humanize.py:166
 msgid "tomorrow"
 msgstr ""
 
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:24
 msgid "th"
 msgstr ""
 
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:24
 msgid "st"
 msgstr ""
 
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:24
 msgid "nd"
 msgstr ""
 
-#: templatetags/humanize.py:25
+#: templatetags/humanize.py:24
 msgid "rd"
 msgstr ""
 
-#: templatetags/humanize.py:57
+#: templatetags/humanize.py:53
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:58
+#: templatetags/humanize.py:54
 #, python-format
 msgid "%(value)s million"
 msgid_plural "%(value)s million"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:61
+#: templatetags/humanize.py:57
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:62
+#: templatetags/humanize.py:58
 #, python-format
 msgid "%(value)s billion"
 msgid_plural "%(value)s billion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:65
+#: templatetags/humanize.py:61
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:66
+#: templatetags/humanize.py:62
 #, python-format
 msgid "%(value)s trillion"
 msgid_plural "%(value)s trillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:69
+#: templatetags/humanize.py:65
 #, python-format
 msgid "%(value).1f quadrillion"
 msgid_plural "%(value).1f quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:70
+#: templatetags/humanize.py:66
 #, python-format
 msgid "%(value)s quadrillion"
 msgid_plural "%(value)s quadrillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:73
+#: templatetags/humanize.py:69
 #, python-format
 msgid "%(value).1f quintillion"
 msgid_plural "%(value).1f quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:74
+#: templatetags/humanize.py:70
 #, python-format
 msgid "%(value)s quintillion"
 msgid_plural "%(value)s quintillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:77
+#: templatetags/humanize.py:73
 #, python-format
 msgid "%(value).1f sextillion"
 msgid_plural "%(value).1f sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:78
+#: templatetags/humanize.py:74
 #, python-format
 msgid "%(value)s sextillion"
 msgid_plural "%(value)s sextillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:81
+#: templatetags/humanize.py:77
 #, python-format
 msgid "%(value).1f septillion"
 msgid_plural "%(value).1f septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:82
+#: templatetags/humanize.py:78
 #, python-format
 msgid "%(value)s septillion"
 msgid_plural "%(value)s septillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:85
+#: templatetags/humanize.py:81
 #, python-format
 msgid "%(value).1f octillion"
 msgid_plural "%(value).1f octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:86
+#: templatetags/humanize.py:82
 #, python-format
 msgid "%(value)s octillion"
 msgid_plural "%(value)s octillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:89
+#: templatetags/humanize.py:85
 #, python-format
 msgid "%(value).1f nonillion"
 msgid_plural "%(value).1f nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:90
+#: templatetags/humanize.py:86
 #, python-format
 msgid "%(value)s nonillion"
 msgid_plural "%(value)s nonillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:93
+#: templatetags/humanize.py:89
 #, python-format
 msgid "%(value).1f decillion"
 msgid_plural "%(value).1f decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:94
+#: templatetags/humanize.py:90
 #, python-format
 msgid "%(value)s decillion"
 msgid_plural "%(value)s decillion"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:97
+#: templatetags/humanize.py:93
 #, python-format
 msgid "%(value).1f googol"
 msgid_plural "%(value).1f googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:98
+#: templatetags/humanize.py:94
 #, python-format
 msgid "%(value)s googol"
 msgid_plural "%(value)s googol"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:143
 msgid "one"
 msgstr ""
 
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:143
 msgid "two"
 msgstr ""
 
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:143
 msgid "three"
 msgstr ""
 
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:143
 msgid "four"
 msgstr ""
 
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:143
 msgid "five"
 msgstr ""
 
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:143
 msgid "six"
 msgstr ""
 
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:143
 msgid "seven"
 msgstr ""
 
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:143
 msgid "eight"
 msgstr ""
 
-#: templatetags/humanize.py:147
+#: templatetags/humanize.py:143
 msgid "nine"
 msgstr ""
 
-#: templatetags/humanize.py:199
+#: templatetags/humanize.py:185
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s ago"
 msgstr ""
 
-#: templatetags/humanize.py:202 templatetags/humanize.py:224
+#: templatetags/humanize.py:188 templatetags/humanize.py:210
 msgid "now"
 msgstr ""
 
-#: templatetags/humanize.py:205
+#: templatetags/humanize.py:191
 #, python-format
 msgid "a second ago"
 msgid_plural "%(count)s seconds ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:210
+#: templatetags/humanize.py:196
 #, python-format
 msgid "a minute ago"
 msgid_plural "%(count)s minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:215
+#: templatetags/humanize.py:201
 #, python-format
 msgid "an hour ago"
 msgid_plural "%(count)s hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:221
+#: templatetags/humanize.py:207
 #, python-format
 msgctxt "naturaltime"
 msgid "%(delta)s from now"
 msgstr ""
 
-#: templatetags/humanize.py:227
+#: templatetags/humanize.py:213
 #, python-format
 msgid "a second from now"
 msgid_plural "%(count)s seconds from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:232
+#: templatetags/humanize.py:218
 #, python-format
 msgid "a minute from now"
 msgid_plural "%(count)s minutes from now"
 msgstr[0] ""
 msgstr[1] ""
 
-#: templatetags/humanize.py:237
+#: templatetags/humanize.py:223
 #, python-format
 msgid "an hour from now"
 msgid_plural "%(count)s hours from now"
diff --git a/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po b/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
index 798e6b0e9f..4dd44f15a9 100644
--- a/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/localflavor/locale/en/LC_MESSAGES/django.po
@@ -4,31 +4,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-28 12:44+0200\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ar/forms.py:28
+#: ar/forms.py:30
 msgid "Enter a postal code in the format NNNN or ANNNNAAA."
 msgstr ""
 
-#: ar/forms.py:50 br/forms.py:92 br/forms.py:131 pe/forms.py:24 pe/forms.py:52
+#: ar/forms.py:52 br/forms.py:95 br/forms.py:134 pe/forms.py:27 pe/forms.py:55
 msgid "This field requires only numbers."
 msgstr ""
 
-#: ar/forms.py:51
+#: ar/forms.py:53
 msgid "This field requires 7 or 8 digits."
 msgstr ""
 
-#: ar/forms.py:80
+#: ar/forms.py:82
 msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
 msgstr ""
 
-#: ar/forms.py:81
+#: ar/forms.py:83
 msgid "Invalid CUIT."
 msgstr ""
 
@@ -68,7 +69,7 @@ msgstr ""
 msgid "Vienna"
 msgstr ""
 
-#: at/forms.py:22 ch/forms.py:17 no/forms.py:13
+#: at/forms.py:22 ch/forms.py:22 no/forms.py:19
 msgid "Enter a zip code in the format XXXX."
 msgstr ""
 
@@ -76,19 +77,19 @@ msgstr ""
 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
 msgstr ""
 
-#: au/forms.py:21
+#: au/forms.py:26
 msgid "Enter a 4 digit postcode."
 msgstr ""
 
-#: au/models.py:10
+#: au/models.py:9
 msgid "Australian State"
 msgstr ""
 
-#: au/models.py:20
+#: au/models.py:19
 msgid "Australian Postcode"
 msgstr ""
 
-#: au/models.py:34
+#: au/models.py:33
 msgid "Australian Phone number"
 msgstr ""
 
@@ -148,52 +149,52 @@ msgstr ""
 msgid "Wallonia"
 msgstr ""
 
-#: be/forms.py:23
+#: be/forms.py:25
 msgid "Enter a valid postal code in the range and format 1XXX - 9XXX."
 msgstr ""
 
-#: be/forms.py:46
+#: be/forms.py:48
 msgid ""
 "Enter a valid phone number in one of the formats 0x xxx xx xx, 0xx xx xx xx, "
 "04xx xx xx xx, 0x/xxx.xx.xx, 0xx/xx.xx.xx, 04xx/xx.xx.xx, 0x.xxx.xx.xx, 0xx."
 "xx.xx.xx, 04xx.xx.xx.xx, 0xxxxxxxx or 04xxxxxxxx."
 msgstr ""
 
-#: br/forms.py:17
+#: br/forms.py:22
 msgid "Enter a zip code in the format XXXXX-XXX."
 msgstr ""
 
-#: br/forms.py:26
+#: br/forms.py:31
 msgid "Phone numbers must be in XX-XXXX-XXXX format."
 msgstr ""
 
-#: br/forms.py:54
+#: br/forms.py:58
 msgid ""
 "Select a valid brazilian state. That state is not one of the available "
 "states."
 msgstr ""
 
-#: br/forms.py:90
+#: br/forms.py:93
 msgid "Invalid CPF number."
 msgstr ""
 
-#: br/forms.py:91
+#: br/forms.py:94
 msgid "This field requires at most 11 digits or 14 characters."
 msgstr ""
 
-#: br/forms.py:130
+#: br/forms.py:133
 msgid "Invalid CNPJ number."
 msgstr ""
 
-#: br/forms.py:132
+#: br/forms.py:135
 msgid "This field requires at least 14 digits"
 msgstr ""
 
-#: ca/forms.py:25
+#: ca/forms.py:29
 msgid "Enter a postal code in the format XXX XXX."
 msgstr ""
 
-#: ca/forms.py:104
+#: ca/forms.py:110
 msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
 msgstr ""
 
@@ -301,49 +302,49 @@ msgstr ""
 msgid "Zurich"
 msgstr ""
 
-#: ch/forms.py:64
+#: ch/forms.py:68
 msgid ""
 "Enter a valid Swiss identity or passport card number in X1234567<0 or "
 "1234567890 format."
 msgstr ""
 
-#: cl/forms.py:30
+#: cl/forms.py:32
 msgid "Enter a valid Chilean RUT."
 msgstr ""
 
-#: cl/forms.py:31
+#: cl/forms.py:33
 msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
 msgstr ""
 
-#: cl/forms.py:32
+#: cl/forms.py:34
 msgid "The Chilean RUT is not valid."
 msgstr ""
 
-#: cn/forms.py:82
+#: cn/forms.py:84
 msgid "Enter a post code in the format XXXXXX."
 msgstr ""
 
-#: cn/forms.py:103
+#: cn/forms.py:105
 msgid "ID Card Number consists of 15 or 18 digits."
 msgstr ""
 
-#: cn/forms.py:104
+#: cn/forms.py:106
 msgid "Invalid ID Card Number: Wrong checksum"
 msgstr ""
 
-#: cn/forms.py:105
+#: cn/forms.py:107
 msgid "Invalid ID Card Number: Wrong birthdate"
 msgstr ""
 
-#: cn/forms.py:106
+#: cn/forms.py:108
 msgid "Invalid ID Card Number: Wrong location code"
 msgstr ""
 
-#: cn/forms.py:191
+#: cn/forms.py:193
 msgid "Enter a valid phone number."
 msgstr ""
 
-#: cn/forms.py:208
+#: cn/forms.py:210
 msgid "Enter a valid cell number."
 msgstr ""
 
@@ -403,23 +404,23 @@ msgstr ""
 msgid "Moravian-Silesian Region"
 msgstr ""
 
-#: cz/forms.py:28 sk/forms.py:30
+#: cz/forms.py:32 sk/forms.py:33
 msgid "Enter a postal code in the format XXXXX or XXX XX."
 msgstr ""
 
-#: cz/forms.py:48
+#: cz/forms.py:52
 msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
 msgstr ""
 
-#: cz/forms.py:49
+#: cz/forms.py:53
 msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
 msgstr ""
 
-#: cz/forms.py:50
+#: cz/forms.py:54
 msgid "Enter a valid birth number."
 msgstr ""
 
-#: cz/forms.py:111
+#: cz/forms.py:115
 msgid "Enter a valid IC number."
 msgstr ""
 
@@ -487,11 +488,11 @@ msgstr ""
 msgid "Thuringia"
 msgstr ""
 
-#: de/forms.py:15 fi/forms.py:13 fr/forms.py:16
+#: de/forms.py:20 fi/forms.py:18 fr/forms.py:20
 msgid "Enter a zip code in the format XXXXX."
 msgstr ""
 
-#: de/forms.py:42
+#: de/forms.py:46
 msgid ""
 "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
 "format."
@@ -761,54 +762,54 @@ msgstr ""
 msgid "Valencian Community"
 msgstr ""
 
-#: es/forms.py:20
+#: es/forms.py:26
 msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
 msgstr ""
 
-#: es/forms.py:40
+#: es/forms.py:46
 msgid ""
 "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
 "9XXXXXXXX."
 msgstr ""
 
-#: es/forms.py:67
+#: es/forms.py:73
 msgid "Please enter a valid NIF, NIE, or CIF."
 msgstr ""
 
-#: es/forms.py:68
+#: es/forms.py:74
 msgid "Please enter a valid NIF or NIE."
 msgstr ""
 
-#: es/forms.py:69
+#: es/forms.py:75
 msgid "Invalid checksum for NIF."
 msgstr ""
 
-#: es/forms.py:70
+#: es/forms.py:76
 msgid "Invalid checksum for NIE."
 msgstr ""
 
-#: es/forms.py:71
+#: es/forms.py:77
 msgid "Invalid checksum for CIF."
 msgstr ""
 
-#: es/forms.py:143
+#: es/forms.py:149
 msgid ""
 "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
 msgstr ""
 
-#: es/forms.py:144
+#: es/forms.py:150
 msgid "Invalid checksum for bank account number."
 msgstr ""
 
-#: fi/forms.py:29
+#: fi/forms.py:33
 msgid "Enter a valid Finnish social security number."
 msgstr ""
 
-#: fr/forms.py:31
+#: fr/forms.py:35
 msgid "Phone numbers must be in 0X XX XX XX XX format."
 msgstr ""
 
-#: gb/forms.py:21
+#: gb/forms.py:25
 msgid "Enter a valid postcode."
 msgstr ""
 
@@ -1092,51 +1093,51 @@ msgstr ""
 msgid "Wales"
 msgstr ""
 
-#: hr/forms.py:72
+#: hr/forms.py:75
 msgid "Enter a valid 13 digit JMBG"
 msgstr ""
 
-#: hr/forms.py:73
+#: hr/forms.py:76
 msgid "Error in date segment"
 msgstr ""
 
-#: hr/forms.py:120
+#: hr/forms.py:123
 msgid "Enter a valid 11 digit OIB"
 msgstr ""
 
-#: hr/forms.py:149 id/forms.py:107
+#: hr/forms.py:152 id/forms.py:112
 msgid "Enter a valid vehicle license plate number"
 msgstr ""
 
-#: hr/forms.py:150
+#: hr/forms.py:153
 msgid "Enter a valid location code"
 msgstr ""
 
-#: hr/forms.py:151
+#: hr/forms.py:154
 msgid "Number part cannot be zero"
 msgstr ""
 
-#: hr/forms.py:188
+#: hr/forms.py:190
 msgid "Enter a valid 5 digit postal code"
 msgstr ""
 
-#: hr/forms.py:216 id/forms.py:68 nl/forms.py:53
+#: hr/forms.py:218 id/forms.py:72 nl/forms.py:56
 msgid "Enter a valid phone number"
 msgstr ""
 
-#: hr/forms.py:217
+#: hr/forms.py:219
 msgid "Enter a valid area or mobile network code"
 msgstr ""
 
-#: hr/forms.py:218
+#: hr/forms.py:220
 msgid "The phone nubmer is too long"
 msgstr ""
 
-#: hr/forms.py:257
+#: hr/forms.py:258
 msgid "Enter a valid 19 digit JMBAG starting with 601983"
 msgstr ""
 
-#: hr/forms.py:258
+#: hr/forms.py:259
 msgid "Card issue number cannot be zero"
 msgstr ""
 
@@ -1224,11 +1225,11 @@ msgstr ""
 msgid "Zagrebačka županija"
 msgstr ""
 
-#: id/forms.py:28
+#: id/forms.py:31
 msgid "Enter a valid post code"
 msgstr ""
 
-#: id/forms.py:170
+#: id/forms.py:176
 msgid "Enter a valid NIK/KTP number"
 msgstr ""
 
@@ -1632,36 +1633,40 @@ msgstr ""
 msgid "Enter a valid ID number."
 msgstr ""
 
-#: in_/forms.py:15
+#: in_/forms.py:41
 msgid "Enter a zip code in the format XXXXXX or XXX XXX."
 msgstr ""
 
-#: in_/forms.py:37
+#: in_/forms.py:64
 msgid "Enter an Indian state or territory."
 msgstr ""
 
-#: is_/forms.py:18
+#: in_/forms.py:103
+msgid "Phone numbers must be in 02X-8X or 03X-7X or 04X-6X format."
+msgstr ""
+
+#: is_/forms.py:22
 msgid ""
 "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
 msgstr ""
 
-#: is_/forms.py:19
+#: is_/forms.py:23
 msgid "The Icelandic identification number is not valid."
 msgstr ""
 
-#: it/forms.py:15
+#: it/forms.py:21
 msgid "Enter a valid zip code."
 msgstr ""
 
-#: it/forms.py:44
+#: it/forms.py:48
 msgid "Enter a valid Social Security number."
 msgstr ""
 
-#: it/forms.py:69
+#: it/forms.py:73
 msgid "Enter a valid VAT number."
 msgstr ""
 
-#: jp/forms.py:16
+#: jp/forms.py:19
 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
 msgstr ""
 
@@ -1857,21 +1862,21 @@ msgstr ""
 msgid "Enter a valid Kuwaiti Civil ID number"
 msgstr ""
 
-#: mk/forms.py:16
+#: mk/forms.py:18
 msgid ""
 "Identity card numbers must contain either 4 to 7 digits or an uppercase "
 "letter and 7 digits."
 msgstr ""
 
-#: mk/forms.py:55
+#: mk/forms.py:57 si/forms.py:24
 msgid "This field should contain exactly 13 digits."
 msgstr ""
 
-#: mk/forms.py:56
+#: mk/forms.py:58
 msgid "The first 7 digits of the UMCN must represent a valid past date."
 msgstr ""
 
-#: mk/forms.py:57
+#: mk/forms.py:59
 msgid "The UMCN is not valid."
 msgstr ""
 
@@ -2223,139 +2228,175 @@ msgstr ""
 msgid "Unique master citizen number (13 digits)"
 msgstr ""
 
-#: mx/mx_states.py:12
-msgid "Aguascalientes"
+#: mx/forms.py:65
+msgid "Enter a valid zip code in the format XXXXX."
+msgstr ""
+
+#: mx/forms.py:108
+msgid "Enter a valid RFC."
+msgstr ""
+
+#: mx/forms.py:109
+msgid "Invalid checksum for RFC."
+msgstr ""
+
+#: mx/forms.py:189
+msgid "Enter a valid CURP."
+msgstr ""
+
+#: mx/forms.py:190
+msgid "Invalid checksum for CURP."
+msgstr ""
+
+#: mx/models.py:14
+msgid "Mexico state (three uppercase letters)"
+msgstr ""
+
+#: mx/models.py:27
+msgid "Mexico zip code"
+msgstr ""
+
+#: mx/models.py:44
+msgid "Mexican RFC"
+msgstr ""
+
+#: mx/models.py:61
+msgid "Mexican CURP"
 msgstr ""
 
 #: mx/mx_states.py:13
-msgid "Baja California"
+msgid "Aguascalientes"
 msgstr ""
 
 #: mx/mx_states.py:14
-msgid "Baja California Sur"
+msgid "Baja California"
 msgstr ""
 
 #: mx/mx_states.py:15
-msgid "Campeche"
+msgid "Baja California Sur"
 msgstr ""
 
 #: mx/mx_states.py:16
-msgid "Chihuahua"
+msgid "Campeche"
 msgstr ""
 
 #: mx/mx_states.py:17
-msgid "Chiapas"
+msgid "Chihuahua"
 msgstr ""
 
 #: mx/mx_states.py:18
-msgid "Coahuila"
+msgid "Chiapas"
 msgstr ""
 
 #: mx/mx_states.py:19
-msgid "Colima"
+msgid "Coahuila"
 msgstr ""
 
 #: mx/mx_states.py:20
-msgid "Distrito Federal"
+msgid "Colima"
 msgstr ""
 
 #: mx/mx_states.py:21
-msgid "Durango"
+msgid "Distrito Federal"
 msgstr ""
 
 #: mx/mx_states.py:22
-msgid "Guerrero"
+msgid "Durango"
 msgstr ""
 
 #: mx/mx_states.py:23
-msgid "Guanajuato"
+msgid "Guerrero"
 msgstr ""
 
 #: mx/mx_states.py:24
-msgid "Hidalgo"
+msgid "Guanajuato"
 msgstr ""
 
 #: mx/mx_states.py:25
-msgid "Jalisco"
+msgid "Hidalgo"
 msgstr ""
 
 #: mx/mx_states.py:26
-msgid "Estado de México"
+msgid "Jalisco"
 msgstr ""
 
 #: mx/mx_states.py:27
-msgid "Michoacán"
+msgid "Estado de México"
 msgstr ""
 
 #: mx/mx_states.py:28
-msgid "Morelos"
+msgid "Michoacán"
 msgstr ""
 
 #: mx/mx_states.py:29
-msgid "Nayarit"
+msgid "Morelos"
 msgstr ""
 
 #: mx/mx_states.py:30
-msgid "Nuevo León"
+msgid "Nayarit"
 msgstr ""
 
 #: mx/mx_states.py:31
-msgid "Oaxaca"
+msgid "Nuevo León"
 msgstr ""
 
 #: mx/mx_states.py:32
-msgid "Puebla"
+msgid "Oaxaca"
 msgstr ""
 
 #: mx/mx_states.py:33
-msgid "Querétaro"
+msgid "Puebla"
 msgstr ""
 
 #: mx/mx_states.py:34
-msgid "Quintana Roo"
+msgid "Querétaro"
 msgstr ""
 
 #: mx/mx_states.py:35
-msgid "Sinaloa"
+msgid "Quintana Roo"
 msgstr ""
 
 #: mx/mx_states.py:36
-msgid "San Luis Potosí"
+msgid "Sinaloa"
 msgstr ""
 
 #: mx/mx_states.py:37
-msgid "Sonora"
+msgid "San Luis Potosí"
 msgstr ""
 
 #: mx/mx_states.py:38
-msgid "Tabasco"
+msgid "Sonora"
 msgstr ""
 
 #: mx/mx_states.py:39
-msgid "Tamaulipas"
+msgid "Tabasco"
 msgstr ""
 
 #: mx/mx_states.py:40
-msgid "Tlaxcala"
+msgid "Tamaulipas"
 msgstr ""
 
 #: mx/mx_states.py:41
-msgid "Veracruz"
+msgid "Tlaxcala"
 msgstr ""
 
 #: mx/mx_states.py:42
-msgid "Yucatán"
+msgid "Veracruz"
 msgstr ""
 
 #: mx/mx_states.py:43
+msgid "Yucatán"
+msgstr ""
+
+#: mx/mx_states.py:44
 msgid "Zacatecas"
 msgstr ""
 
-#: nl/forms.py:22
+#: nl/forms.py:26
 msgid "Enter a valid postal code"
 msgstr ""
 
-#: nl/forms.py:79
+#: nl/forms.py:82
 msgid "Enter a valid SoFi number"
 msgstr ""
 
@@ -2403,52 +2444,52 @@ msgstr ""
 msgid "Zuid-Holland"
 msgstr ""
 
-#: no/forms.py:34
+#: no/forms.py:39
 msgid "Enter a valid Norwegian social security number."
 msgstr ""
 
-#: pe/forms.py:25
+#: pe/forms.py:28
 msgid "This field requires 8 digits."
 msgstr ""
 
-#: pe/forms.py:53
+#: pe/forms.py:56
 msgid "This field requires 11 digits."
 msgstr ""
 
-#: pl/forms.py:39
+#: pl/forms.py:42
 msgid "National Identification Number consists of 11 digits."
 msgstr ""
 
-#: pl/forms.py:40
+#: pl/forms.py:43
 msgid "Wrong checksum for the National Identification Number."
 msgstr ""
 
-#: pl/forms.py:76
+#: pl/forms.py:79
 msgid "National ID Card Number consists of 3 letters and 6 digits."
 msgstr ""
 
-#: pl/forms.py:77
+#: pl/forms.py:80
 msgid "Wrong checksum for the National ID Card Number."
 msgstr ""
 
-#: pl/forms.py:128
+#: pl/forms.py:131
 msgid ""
 "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
 msgstr ""
 
-#: pl/forms.py:129
+#: pl/forms.py:132
 msgid "Wrong checksum for the Tax Number (NIP)."
 msgstr ""
 
-#: pl/forms.py:168
+#: pl/forms.py:171
 msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
 msgstr ""
 
-#: pl/forms.py:169
+#: pl/forms.py:172
 msgid "Wrong checksum for the National Business Register Number (REGON)."
 msgstr ""
 
-#: pl/forms.py:209
+#: pl/forms.py:212
 msgid "Enter a postal code in the format XX-XXX."
 msgstr ""
 
@@ -2524,35 +2565,35 @@ msgstr ""
 msgid "Phone numbers must have 9 digits, or start by + or 00."
 msgstr ""
 
-#: ro/forms.py:19
+#: ro/forms.py:20
 msgid "Enter a valid CIF."
 msgstr ""
 
-#: ro/forms.py:56
+#: ro/forms.py:57
 msgid "Enter a valid CNP."
 msgstr ""
 
-#: ro/forms.py:143
+#: ro/forms.py:142
 msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
 msgstr ""
 
-#: ro/forms.py:175
+#: ro/forms.py:174
 msgid "Phone numbers must be in XXXX-XXXXXX format."
 msgstr ""
 
-#: ro/forms.py:200
+#: ro/forms.py:199
 msgid "Enter a valid postal code in the format XXXXXX"
 msgstr ""
 
-#: ru/forms.py:38
+#: ru/forms.py:37
 msgid "Enter a postal code in the format XXXXXX."
 msgstr ""
 
-#: ru/forms.py:51
+#: ru/forms.py:50
 msgid "Enter a passport number in the format XXXX XXXXXX."
 msgstr ""
 
-#: ru/forms.py:64
+#: ru/forms.py:63
 msgid "Enter a passport number in the format XX XXXXXXX."
 msgstr ""
 
@@ -2920,19 +2961,19 @@ msgstr ""
 msgid "Yamalo-Neneckiy avtonomnyy okrug"
 msgstr ""
 
-#: se/forms.py:50
+#: se/forms.py:54
 msgid "Enter a valid Swedish organisation number."
 msgstr ""
 
-#: se/forms.py:107
+#: se/forms.py:111
 msgid "Enter a valid Swedish personal identity number."
 msgstr ""
 
-#: se/forms.py:108
+#: se/forms.py:112
 msgid "Co-ordination numbers are not allowed."
 msgstr ""
 
-#: se/forms.py:150
+#: se/forms.py:154
 msgid "Enter a Swedish postal code in the format XXXXX."
 msgstr ""
 
@@ -3020,6 +3061,22 @@ msgstr ""
 msgid "Jämtland"
 msgstr ""
 
+#: si/forms.py:25
+msgid "The first 7 digits of the EMSO must represent a valid past date."
+msgstr ""
+
+#: si/forms.py:26
+msgid "The EMSO is not valid."
+msgstr ""
+
+#: si/forms.py:86
+msgid "Enter a valid tax number in form SIXXXXXXXX"
+msgstr ""
+
+#: si/forms.py:151
+msgid "Enter phone number in form +386XXXXXXXX or 0XXXXXXXX."
+msgstr ""
+
 #: sk/sk_districts.py:8
 msgid "Banska Bystrica"
 msgstr ""
@@ -3368,55 +3425,55 @@ msgstr ""
 msgid "Zilina region"
 msgstr ""
 
-#: tr/forms.py:16
+#: tr/forms.py:21
 msgid "Enter a postal code in the format XXXXX."
 msgstr ""
 
-#: tr/forms.py:37
+#: tr/forms.py:42
 msgid "Phone numbers must be in 0XXX XXX XXXX format."
 msgstr ""
 
-#: tr/forms.py:64
+#: tr/forms.py:69
 msgid "Enter a valid Turkish Identification number."
 msgstr ""
 
-#: tr/forms.py:65
+#: tr/forms.py:70
 msgid "Turkish Identification number must be 11 digits."
 msgstr ""
 
-#: us/forms.py:17
+#: us/forms.py:21
 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
 msgstr ""
 
-#: us/forms.py:26
+#: us/forms.py:30
 msgid "Phone numbers must be in XXX-XXX-XXXX format."
 msgstr ""
 
-#: us/forms.py:55
+#: us/forms.py:59
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
 msgstr ""
 
-#: us/forms.py:88
+#: us/forms.py:92
 msgid "Enter a U.S. state or territory."
 msgstr ""
 
-#: us/models.py:9
+#: us/models.py:8
 msgid "U.S. state (two uppercase letters)"
 msgstr ""
 
-#: us/models.py:18
+#: us/models.py:17
 msgid "U.S. postal code (two uppercase letters)"
 msgstr ""
 
-#: us/models.py:27
+#: us/models.py:26
 msgid "Phone number"
 msgstr ""
 
-#: uy/forms.py:28
+#: uy/forms.py:29
 msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
 msgstr ""
 
-#: uy/forms.py:30
+#: uy/forms.py:31
 msgid "Enter a valid CI number."
 msgstr ""
 
diff --git a/django/contrib/messages/locale/en/LC_MESSAGES/django.po b/django/contrib/messages/locale/en/LC_MESSAGES/django.po
index 2672b7d941..98a991984f 100644
--- a/django/contrib/messages/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/messages/locale/en/LC_MESSAGES/django.po
@@ -4,14 +4,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:20-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tests/base.py:117
+#: tests/base.py:100
 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 4619755d8c..6bdf28ad6c 100644
--- a/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/redirects/locale/en/LC_MESSAGES/django.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:20-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po b/django/contrib/sessions/locale/en/LC_MESSAGES/django.po
index ece32dec74..b8809eb334 100644
--- a/django/contrib/sessions/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/sessions/locale/en/LC_MESSAGES/django.po
@@ -4,30 +4,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:20-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: models.py:41
+#: models.py:38
 msgid "session key"
 msgstr ""
 
-#: models.py:43
+#: models.py:40
 msgid "session data"
 msgstr ""
 
-#: models.py:44
+#: models.py:41
 msgid "expire date"
 msgstr ""
 
-#: models.py:49
+#: models.py:46
 msgid "session"
 msgstr ""
 
-#: models.py:50
+#: models.py:47
 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 84a4d2fedc..92c24112c9 100644
--- a/django/contrib/sites/locale/en/LC_MESSAGES/django.po
+++ b/django/contrib/sites/locale/en/LC_MESSAGES/django.po
@@ -4,10 +4,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-15 13:20-0400\n"
+"POT-Creation-Date: 2011-12-22 23:56+0100\n"
 "PO-Revision-Date: 2010-05-13 15:35+0200\n"
 "Last-Translator: Django team\n"
 "Language-Team: English <en@li.org>\n"
+"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"