diff --git a/rest_framework/locale/en_US/LC_MESSAGES/django.po b/rest_framework/locale/en_US/LC_MESSAGES/django.po
index 569020739..7c5a6c02b 100644
--- a/rest_framework/locale/en_US/LC_MESSAGES/django.po
+++ b/rest_framework/locale/en_US/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-02 11:10+0000\n"
+"POT-Creation-Date: 2015-01-07 11:40+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,282 +17,267 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: rest_framework/authtoken/serializers.py:20
+#: authtoken/serializers.py:20
 msgid "User account is disabled."
 msgstr ""
 
-#: rest_framework/authtoken/serializers.py:23
+#: authtoken/serializers.py:23
 msgid "Unable to log in with provided credentials."
 msgstr ""
 
-#: rest_framework/authtoken/serializers.py:26
+#: authtoken/serializers.py:26
 msgid "Must include \"username\" and \"password\""
 msgstr ""
 
-#: rest_framework/exceptions.py:39
+#: exceptions.py:38
 msgid "A server error occurred."
 msgstr ""
 
-#: rest_framework/exceptions.py:74
+#: exceptions.py:73
 msgid "Malformed request."
 msgstr ""
 
-#: rest_framework/exceptions.py:79
+#: exceptions.py:78
 msgid "Incorrect authentication credentials."
 msgstr ""
 
-#: rest_framework/exceptions.py:84
+#: exceptions.py:83
 msgid "Authentication credentials were not provided."
 msgstr ""
 
-#: rest_framework/exceptions.py:89
+#: exceptions.py:88
 msgid "You do not have permission to perform this action."
 msgstr ""
 
-#: rest_framework/exceptions.py:94
+#: exceptions.py:93
 msgid "Not found."
 msgstr ""
 
-#: rest_framework/exceptions.py:99
-#, python-format
-msgid "Method '%s' not allowed."
+#: exceptions.py:98
+msgid "Method {method} not allowed."
 msgstr ""
 
-#: rest_framework/exceptions.py:110
+#: exceptions.py:109
 msgid "Could not satisfy the request Accept header."
 msgstr ""
 
-#: rest_framework/exceptions.py:122
-#, python-format
-msgid "Unsupported media type '%s' in request."
+#: exceptions.py:121
+msgid "Unsupported media type '{media_type}' in request."
 msgstr ""
 
-#: rest_framework/exceptions.py:133
+#: exceptions.py:134
 msgid "Request was throttled."
 msgstr ""
 
-#: rest_framework/exceptions.py:135
-#, python-format
-msgid "Expected available in %(wait)d second."
-msgid_plural "Expected available in %(wait)d seconds."
-msgstr[0] ""
-msgstr[1] ""
-
-#: rest_framework/fields.py:152 rest_framework/relations.py:131
-#: rest_framework/relations.py:155 rest_framework/validators.py:77
-#: rest_framework/validators.py:155
+#: fields.py:152 relations.py:131 relations.py:155 validators.py:77
+#: validators.py:155
 msgid "This field is required."
 msgstr ""
 
-#: rest_framework/fields.py:153
+#: fields.py:153
 msgid "This field may not be null."
 msgstr ""
 
-#: rest_framework/fields.py:480 rest_framework/fields.py:508
+#: fields.py:480 fields.py:508
 msgid "`{input}` is not a valid boolean."
 msgstr ""
 
-#: rest_framework/fields.py:543
+#: fields.py:543
 msgid "This field may not be blank."
 msgstr ""
 
-#: rest_framework/fields.py:544 rest_framework/fields.py:1252
+#: fields.py:544 fields.py:1252
 msgid "Ensure this field has no more than {max_length} characters."
 msgstr ""
 
-#: rest_framework/fields.py:545
+#: fields.py:545
 msgid "Ensure this field has at least {min_length} characters."
 msgstr ""
 
-#: rest_framework/fields.py:587
+#: fields.py:587
 msgid "Enter a valid email address."
 msgstr ""
 
-#: rest_framework/fields.py:604
+#: fields.py:604
 msgid "This value does not match the required pattern."
 msgstr ""
 
-#: rest_framework/fields.py:615
+#: fields.py:615
 msgid ""
 "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 
-#: rest_framework/fields.py:627
+#: fields.py:627
 msgid "Enter a valid URL."
 msgstr ""
 
-#: rest_framework/fields.py:640
+#: fields.py:640
 msgid "A valid integer is required."
 msgstr ""
 
-#: rest_framework/fields.py:641 rest_framework/fields.py:675
-#: rest_framework/fields.py:708
+#: fields.py:641 fields.py:675 fields.py:708
 msgid "Ensure this value is less than or equal to {max_value}."
 msgstr ""
 
-#: rest_framework/fields.py:642 rest_framework/fields.py:676
-#: rest_framework/fields.py:709
+#: fields.py:642 fields.py:676 fields.py:709
 msgid "Ensure this value is greater than or equal to {min_value}."
 msgstr ""
 
-#: rest_framework/fields.py:643 rest_framework/fields.py:677
-#: rest_framework/fields.py:713
+#: fields.py:643 fields.py:677 fields.py:713
 msgid "String value too large."
 msgstr ""
 
-#: rest_framework/fields.py:674 rest_framework/fields.py:707
+#: fields.py:674 fields.py:707
 msgid "A valid number is required."
 msgstr ""
 
-#: rest_framework/fields.py:710
+#: fields.py:710
 msgid "Ensure that there are no more than {max_digits} digits in total."
 msgstr ""
 
-#: rest_framework/fields.py:711
+#: fields.py:711
 msgid "Ensure that there are no more than {max_decimal_places} decimal places."
 msgstr ""
 
-#: rest_framework/fields.py:712
+#: fields.py:712
 msgid ""
 "Ensure that there are no more than {max_whole_digits} digits before the "
 "decimal point."
 msgstr ""
 
-#: rest_framework/fields.py:796
+#: fields.py:796
 msgid "Datetime has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: rest_framework/fields.py:797
+#: fields.py:797
 msgid "Expected a datetime but got a date."
 msgstr ""
 
-#: rest_framework/fields.py:861
+#: fields.py:861
 msgid "Date has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: rest_framework/fields.py:862
+#: fields.py:862
 msgid "Expected a date but got a datetime."
 msgstr ""
 
-#: rest_framework/fields.py:919
+#: fields.py:919
 msgid "Time has wrong format. Use one of these formats instead: {format}."
 msgstr ""
 
-#: rest_framework/fields.py:975 rest_framework/fields.py:1019
+#: fields.py:975 fields.py:1019
 msgid "`{input}` is not a valid choice."
 msgstr ""
 
-#: rest_framework/fields.py:1020 rest_framework/fields.py:1121
-#: rest_framework/serializers.py:476
+#: fields.py:1020 fields.py:1121 serializers.py:476
 msgid "Expected a list of items but got type `{input_type}`."
 msgstr ""
 
-#: rest_framework/fields.py:1050
+#: fields.py:1050
 msgid "No file was submitted."
 msgstr ""
 
-#: rest_framework/fields.py:1051
+#: fields.py:1051
 msgid "The submitted data was not a file. Check the encoding type on the form."
 msgstr ""
 
-#: rest_framework/fields.py:1052
+#: fields.py:1052
 msgid "No filename could be determined."
 msgstr ""
 
-#: rest_framework/fields.py:1053
+#: fields.py:1053
 msgid "The submitted file is empty."
 msgstr ""
 
-#: rest_framework/fields.py:1054
+#: fields.py:1054
 msgid ""
 "Ensure this filename has at most {max_length} characters (it has {length})."
 msgstr ""
 
-#: rest_framework/fields.py:1096
+#: fields.py:1096
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
 msgstr ""
 
-#: rest_framework/generics.py:122
+#: generics.py:123
 msgid ""
 "Choose a valid page number. Page numbers must be a whole number, or must be "
 "the string 'last'."
 msgstr ""
 
-#: rest_framework/generics.py:126
-#, python-format
-msgid "Invalid page (%(page_number)s): %(message)s"
+#: generics.py:129
+msgid "Invalid page ({page_number}): {message}"
 msgstr ""
 
-#: rest_framework/relations.py:132
+#: relations.py:132
 msgid "Invalid pk '{pk_value}' - object does not exist."
 msgstr ""
 
-#: rest_framework/relations.py:133
+#: relations.py:133
 msgid "Incorrect type. Expected pk value, received {data_type}."
 msgstr ""
 
-#: rest_framework/relations.py:156
+#: relations.py:156
 msgid "Invalid hyperlink - No URL match"
 msgstr ""
 
-#: rest_framework/relations.py:157
+#: relations.py:157
 msgid "Invalid hyperlink - Incorrect URL match."
 msgstr ""
 
-#: rest_framework/relations.py:158
+#: relations.py:158
 msgid "Invalid hyperlink - Object does not exist."
 msgstr ""
 
-#: rest_framework/relations.py:159
+#: relations.py:159
 msgid "Incorrect type. Expected URL string, received {data_type}."
 msgstr ""
 
-#: rest_framework/relations.py:294
+#: relations.py:294
 msgid "Object with {slug_name}={value} does not exist."
 msgstr ""
 
-#: rest_framework/relations.py:295
+#: relations.py:295
 msgid "Invalid value."
 msgstr ""
 
-#: rest_framework/serializers.py:299
+#: serializers.py:299
 msgid "Invalid data. Expected a dictionary, but got {datatype}."
 msgstr ""
 
-#: rest_framework/validators.py:22
+#: validators.py:22
 msgid "This field must be unique."
 msgstr ""
 
-#: rest_framework/validators.py:76
+#: validators.py:76
 msgid "The fields {field_names} must make a unique set."
 msgstr ""
 
-#: rest_framework/validators.py:219
+#: validators.py:219
 msgid "This field must be unique for the \"{date_field}\" date."
 msgstr ""
 
-#: rest_framework/validators.py:234
+#: validators.py:234
 msgid "This field must be unique for the \"{date_field}\" month."
 msgstr ""
 
-#: rest_framework/validators.py:247
+#: validators.py:247
 msgid "This field must be unique for the \"{date_field}\" year."
 msgstr ""
 
-#: rest_framework/versioning.py:39
+#: versioning.py:39
 msgid "Invalid version in 'Accept' header."
 msgstr ""
 
-#: rest_framework/versioning.py:70 rest_framework/versioning.py:112
+#: versioning.py:70 versioning.py:112
 msgid "Invalid version in URL path."
 msgstr ""
 
-#: rest_framework/versioning.py:138
+#: versioning.py:138
 msgid "Invalid version in hostname."
 msgstr ""
 
-#: rest_framework/versioning.py:160
+#: versioning.py:160
 msgid "Invalid version in query parameter."
 msgstr ""