diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
new file mode 100644
index 0000000000..8c743dfa49
Binary files /dev/null and b/django/conf/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
new file mode 100644
index 0000000000..4895b57c86
--- /dev/null
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -0,0 +1,770 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-10-18 15:03+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: models/core.py:5
+msgid "domain name"
+msgstr ""
+
+#: models/core.py:6
+msgid "display name"
+msgstr ""
+
+#: models/core.py:8
+msgid "site"
+msgstr ""
+
+#: models/core.py:9
+msgid "sites"
+msgstr ""
+
+#: models/core.py:22
+msgid "label"
+msgstr ""
+
+#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19
+msgid "name"
+msgstr ""
+
+#: models/core.py:25
+msgid "package"
+msgstr ""
+
+#: models/core.py:26
+msgid "packages"
+msgstr ""
+
+#: models/core.py:36
+msgid "python module name"
+msgstr ""
+
+#: models/core.py:38
+msgid "content type"
+msgstr ""
+
+#: models/core.py:39
+msgid "content types"
+msgstr ""
+
+#: models/core.py:62
+msgid "redirect from"
+msgstr ""
+
+#: models/core.py:63
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+
+#: models/core.py:64
+msgid "redirect to"
+msgstr ""
+
+#: models/core.py:65
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+
+#: models/core.py:67
+msgid "redirect"
+msgstr ""
+
+#: models/core.py:68
+msgid "redirects"
+msgstr ""
+
+#: models/core.py:81
+msgid "URL"
+msgstr ""
+
+#: models/core.py:82
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+
+#: models/core.py:83
+msgid "title"
+msgstr ""
+
+#: models/core.py:84
+msgid "content"
+msgstr ""
+
+#: models/core.py:85
+msgid "enable comments"
+msgstr ""
+
+#: models/core.py:86
+msgid "template name"
+msgstr ""
+
+#: models/core.py:87
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
+
+#: models/core.py:88
+msgid "registration required"
+msgstr ""
+
+#: models/core.py:88
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+
+#: models/core.py:92
+msgid "flat page"
+msgstr ""
+
+#: models/core.py:93
+msgid "flat pages"
+msgstr ""
+
+#: models/core.py:114
+msgid "session key"
+msgstr ""
+
+#: models/core.py:115
+msgid "session data"
+msgstr ""
+
+#: models/core.py:116
+msgid "expire date"
+msgstr ""
+
+#: models/core.py:118
+msgid "session"
+msgstr ""
+
+#: models/core.py:119
+msgid "sessions"
+msgstr ""
+
+#: models/auth.py:8
+msgid "codename"
+msgstr ""
+
+#: models/auth.py:10
+msgid "Permission"
+msgstr ""
+
+#: models/auth.py:11 models/auth.py:58
+msgid "Permissions"
+msgstr ""
+
+#: models/auth.py:22
+msgid "Group"
+msgstr ""
+
+#: models/auth.py:23 models/auth.py:60
+msgid "Groups"
+msgstr ""
+
+#: models/auth.py:33
+msgid "username"
+msgstr ""
+
+#: models/auth.py:34
+msgid "first name"
+msgstr ""
+
+#: models/auth.py:35
+msgid "last name"
+msgstr ""
+
+#: models/auth.py:36
+msgid "e-mail address"
+msgstr ""
+
+#: models/auth.py:37
+msgid "password"
+msgstr ""
+
+#: models/auth.py:37
+msgid "Use an MD5 hash -- not the raw password."
+msgstr ""
+
+#: models/auth.py:38
+msgid "staff status"
+msgstr ""
+
+#: models/auth.py:38
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+
+#: models/auth.py:39
+msgid "active"
+msgstr ""
+
+#: models/auth.py:40
+msgid "superuser status"
+msgstr ""
+
+#: models/auth.py:41
+msgid "last login"
+msgstr ""
+
+#: models/auth.py:42
+msgid "date joined"
+msgstr ""
+
+#: models/auth.py:44
+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/auth.py:47 conf/admin_templates/admin_object_history.html:18
+msgid "User"
+msgstr ""
+
+#: models/auth.py:48
+msgid "Users"
+msgstr ""
+
+#: models/auth.py:57
+msgid "Personal info"
+msgstr ""
+
+#: models/auth.py:59
+msgid "Important dates"
+msgstr ""
+
+#: models/auth.py:182 models/auth.py:188
+msgid "Message"
+msgstr ""
+
+#: models/auth.py:189
+msgid "Messages"
+msgstr ""
+
+#: models/auth.py:192
+msgid "action time"
+msgstr ""
+
+#: models/auth.py:195
+msgid "object id"
+msgstr ""
+
+#: models/auth.py:196
+msgid "object repr"
+msgstr ""
+
+#: models/auth.py:197
+msgid "action flag"
+msgstr ""
+
+#: models/auth.py:201
+msgid "log entry"
+msgstr ""
+
+#: models/auth.py:202
+msgid "log entries"
+msgstr ""
+
+#: conf/admin_templates/base_site.html:3
+msgid "Django site admin"
+msgstr ""
+
+#: conf/admin_templates/base_site.html:6
+msgid "Django administration"
+msgstr ""
+
+#: conf/admin_templates/admin_object_history.html:4
+#: conf/admin_templates/base.html:28
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_reset_form.html:3
+#: conf/admin_templates/registration/logged_out.html:3
+#: conf/admin_templates/registration/password_reset_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+msgid "Home"
+msgstr ""
+
+#: conf/admin_templates/admin_object_history.html:4
+msgid "History"
+msgstr ""
+
+#: conf/admin_templates/admin_object_history.html:17
+msgid "Date/time"
+msgstr ""
+
+#: conf/admin_templates/admin_object_history.html:19
+msgid "Action"
+msgstr ""
+
+#: conf/admin_templates/admin_object_history.html:35
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+
+#: conf/admin_templates/500.html:5
+msgid "Server error (500)"
+msgstr ""
+
+#: conf/admin_templates/500.html:8
+msgid "Server Error <em>(500)</em>"
+msgstr ""
+
+#: conf/admin_templates/500.html:9
+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."
+msgstr ""
+
+#: conf/admin_templates/delete_confirmation_generic.html:6
+#, python-format
+msgid ""
+"Deleting the %(object_name)s  '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+
+#: conf/admin_templates/delete_confirmation_generic.html:13
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+
+#: conf/admin_templates/delete_confirmation_generic.html:17
+msgid "Yes, I'm sure"
+msgstr ""
+
+#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7
+msgid "Page not found"
+msgstr ""
+
+#: conf/admin_templates/404.html:9
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+
+#: conf/admin_templates/index.html:26
+msgid "Add"
+msgstr ""
+
+#: conf/admin_templates/index.html:32
+msgid "Change"
+msgstr ""
+
+#: conf/admin_templates/index.html:42
+msgid "You don't have permission to edit anything."
+msgstr ""
+
+#: conf/admin_templates/index.html:50
+msgid "Recent Actions"
+msgstr ""
+
+#: conf/admin_templates/index.html:51
+msgid "My Actions"
+msgstr ""
+
+#: conf/admin_templates/index.html:55
+msgid "None available"
+msgstr ""
+
+#: conf/admin_templates/login.html:14
+msgid "Username:"
+msgstr ""
+
+#: conf/admin_templates/login.html:17
+msgid "Password:"
+msgstr ""
+
+#: conf/admin_templates/login.html:19
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr ""
+
+#: conf/admin_templates/login.html:23
+msgid "Log in"
+msgstr ""
+
+#: conf/admin_templates/base.html:22
+msgid "Welcome,"
+msgstr ""
+
+#: conf/admin_templates/base.html:22
+msgid "Change password"
+msgstr ""
+
+#: conf/admin_templates/base.html:22
+msgid "Log out"
+msgstr ""
+
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+#: conf/admin_templates/registration/password_change_form.html:5
+#: conf/admin_templates/registration/password_change_form.html:9
+msgid "Password change"
+msgstr ""
+
+#: conf/admin_templates/registration/password_change_done.html:5
+#: conf/admin_templates/registration/password_change_done.html:9
+msgid "Password change successful"
+msgstr ""
+
+#: conf/admin_templates/registration/password_change_done.html:11
+msgid "Your password was changed."
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_form.html:3
+#: conf/admin_templates/registration/password_reset_form.html:5
+#: conf/admin_templates/registration/password_reset_form.html:9
+#: conf/admin_templates/registration/password_reset_done.html:3
+msgid "Password reset"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_form.html:11
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_form.html:15
+msgid "E-mail address:"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_form.html:15
+msgid "Reset my password"
+msgstr ""
+
+#: conf/admin_templates/registration/logged_out.html:7
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr ""
+
+#: conf/admin_templates/registration/logged_out.html:9
+msgid "Log in again"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_done.html:5
+#: conf/admin_templates/registration/password_reset_done.html:9
+msgid "Password reset successful"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_done.html:11
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+
+#: conf/admin_templates/registration/password_change_form.html:11
+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 ""
+
+#: conf/admin_templates/registration/password_change_form.html:16
+msgid "Old password:"
+msgstr ""
+
+#: conf/admin_templates/registration/password_change_form.html:18
+msgid "New password:"
+msgstr ""
+
+#: conf/admin_templates/registration/password_change_form.html:20
+msgid "Confirm password:"
+msgstr ""
+
+#: conf/admin_templates/registration/password_change_form.html:22
+msgid "Change my password"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_email.html:1
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_email.html:2
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_email.html:4
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_email.html:6
+msgid "Feel free to change this password by going to this page:"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_email.html:10
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_email.html:12
+msgid "Thanks for using our site!"
+msgstr ""
+
+#: conf/admin_templates/registration/password_reset_email.html:14
+#, python-format
+msgid "The %(site_name)s team"
+msgstr ""
+
+#: core/validators.py:57
+msgid "This value must contain only letters, numbers and underscores."
+msgstr ""
+
+#: core/validators.py:61
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr ""
+
+#: core/validators.py:65
+msgid "Uppercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:69
+msgid "Lowercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:76
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: core/validators.py:88
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr ""
+
+#: core/validators.py:95
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#: core/validators.py:99
+msgid "Empty values are not allowed here."
+msgstr ""
+
+#: core/validators.py:103
+msgid "Non-numeric characters aren't allowed here."
+msgstr ""
+
+#: core/validators.py:107
+msgid "This value can't be comprised solely of digits."
+msgstr ""
+
+#: core/validators.py:112
+msgid "Enter a whole number."
+msgstr ""
+
+#: core/validators.py:116
+msgid "Only alphabetical characters are allowed here."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr ""
+
+#: core/validators.py:124
+msgid "Enter a valid time in HH:MM format."
+msgstr ""
+
+#: core/validators.py:128
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr ""
+
+#: core/validators.py:132
+msgid "Enter a valid e-mail address."
+msgstr ""
+
+#: core/validators.py:144
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: core/validators.py:151
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr ""
+
+#: core/validators.py:155
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+
+#: core/validators.py:163
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr ""
+
+#: core/validators.py:167
+msgid "A valid URL is required."
+msgstr ""
+
+#: core/validators.py:181
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+
+#: core/validators.py:188
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr ""
+
+#: core/validators.py:198
+#, python-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+#: core/validators.py:200
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr ""
+
+#: core/validators.py:206
+msgid "Enter a valid U.S. state abbreviation."
+msgstr ""
+
+#: core/validators.py:221
+#, 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] ""
+
+#: core/validators.py:228
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr ""
+
+#: core/validators.py:247
+msgid "Please enter something for at least one field."
+msgstr ""
+
+#: core/validators.py:256 core/validators.py:267
+msgid "Please enter both fields or leave them both empty."
+msgstr ""
+
+#: core/validators.py:274
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr ""
+
+#: core/validators.py:286
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr ""
+
+#: core/validators.py:305
+msgid "Duplicate values are not allowed."
+msgstr ""
+
+#: core/validators.py:328
+#, python-format
+msgid "This value must be a power of %s."
+msgstr ""
+
+#: core/validators.py:339
+msgid "Please enter a valid decimal number."
+msgstr ""
+
+#: core/validators.py:341
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:344
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:354
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr ""
+
+#: core/validators.py:355
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr ""
+
+#: core/validators.py:368
+msgid "The format for this field is wrong."
+msgstr ""
+
+#: core/validators.py:383
+msgid "This field is invalid."
+msgstr ""
+
+#: core/validators.py:418
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr ""
+
+#: core/validators.py:421
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+
+#: core/validators.py:454
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:458
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:463
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:472
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:477
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/meta/fields.py:95
+msgid " Separate multiple IDs with commas."
+msgstr ""
+
+#: core/meta/fields.py:98
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
diff --git a/docs/translation.txt b/docs/translation.txt
index 6339ab44dc..2adb1a2283 100644
--- a/docs/translation.txt
+++ b/docs/translation.txt
@@ -277,6 +277,11 @@ the charset definition in the file (it's in the Content-Type: line).
 The language code for storage is in locale format - so it is pt_BR for
 Brazilian or de_AT for Austrian German.
 
+If you don't have the gettext utilities installed, make-messages.py will create
+empty files. If that is the case, either install the gettext utilities, or
+just copy the conf/locale/en/LC_MESSAGES/django.po and start with that - it's just
+an empty translation file.
+
 Every message in the message file is of the same format. One line is the msgid.
 This is the actual string in the source - you don't change it. The other line
 is msgstr - this is the translation. It starts out empty. You change it.