diff -ruN dj-date-formats-base/django/conf/locale/en/LC_MESSAGES/django.po dj-date-formats/django/conf/locale/en/LC_MESSAGES/django.po
--- dj-date-formats-base/django/conf/locale/en/LC_MESSAGES/django.po	2006-05-16 05:07:45.000000000 -0300
+++ dj-date-formats/django/conf/locale/en/LC_MESSAGES/django.po	2006-06-01 12:48:22.000000000 -0300
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 10:10+0200\n"
+"POT-Creation-Date: 2006-06-01 11:18-0300\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"
@@ -16,1185 +16,1174 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/comments/models.py:67 contrib/comments/models.py:166
-msgid "object ID"
+#: db/models/manipulators.py:302
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
 msgstr ""
 
-#: contrib/comments/models.py:68
-msgid "headline"
+#: db/models/fields/__init__.py:40
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:167
-msgid "comment"
+#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265
+#: db/models/fields/__init__.py:545 db/models/fields/__init__.py:556
+#: forms/__init__.py:346
+msgid "This field is required."
 msgstr ""
 
-#: contrib/comments/models.py:70
-msgid "rating #1"
+#: db/models/fields/__init__.py:337
+msgid "This value must be an integer."
 msgstr ""
 
-#: contrib/comments/models.py:71
-msgid "rating #2"
+#: db/models/fields/__init__.py:369
+msgid "This value must be either True or False."
 msgstr ""
 
-#: contrib/comments/models.py:72
-msgid "rating #3"
+#: db/models/fields/__init__.py:385
+msgid "This field cannot be null."
 msgstr ""
 
-#: contrib/comments/models.py:73
-msgid "rating #4"
+#: db/models/fields/__init__.py:471 core/validators.py:135
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
 msgstr ""
 
-#: contrib/comments/models.py:74
-msgid "rating #5"
+#: db/models/fields/__init__.py:565
+msgid "Enter a valid filename."
 msgstr ""
 
-#: contrib/comments/models.py:75
-msgid "rating #6"
+#: db/models/fields/related.py:43
+#, python-format
+msgid "Please enter a valid %s."
 msgstr ""
 
-#: contrib/comments/models.py:76
-msgid "rating #7"
+#: db/models/fields/related.py:579
+msgid "Separate multiple IDs with commas."
 msgstr ""
 
-#: contrib/comments/models.py:77
-msgid "rating #8"
+#: db/models/fields/related.py:581
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: contrib/comments/models.py:82
-msgid "is valid rating"
+#: db/models/fields/related.py:625
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] ""
+msgstr[1] ""
+
+#: conf/global_settings.py:37
+msgid "Bengali"
 msgstr ""
 
-#: contrib/comments/models.py:83 contrib/comments/models.py:169
-msgid "date/time submitted"
+#: conf/global_settings.py:38
+msgid "Czech"
 msgstr ""
 
-#: contrib/comments/models.py:84 contrib/comments/models.py:170
-msgid "is public"
+#: conf/global_settings.py:39
+msgid "Welsh"
 msgstr ""
 
-#: contrib/comments/models.py:85 contrib/admin/views/doc.py:289
-msgid "IP address"
+#: conf/global_settings.py:40
+msgid "Danish"
 msgstr ""
 
-#: contrib/comments/models.py:86
-msgid "is removed"
+#: conf/global_settings.py:41
+msgid "German"
 msgstr ""
 
-#: contrib/comments/models.py:86
-msgid ""
-"Check this box if the comment is inappropriate. A \"This comment has been "
-"removed\" message will be displayed instead."
+#: conf/global_settings.py:42
+msgid "Greek"
 msgstr ""
 
-#: contrib/comments/models.py:91
-msgid "comments"
+#: conf/global_settings.py:43
+msgid "English"
 msgstr ""
 
-#: contrib/comments/models.py:131 contrib/comments/models.py:207
-msgid "Content object"
+#: conf/global_settings.py:44
+msgid "Spanish"
 msgstr ""
 
-#: contrib/comments/models.py:159
-#, python-format
-msgid ""
-"Posted by %(user)s at %(date)s\n"
-"\n"
-"%(comment)s\n"
-"\n"
-"http://%(domain)s%(url)s"
+#: conf/global_settings.py:45
+msgid "Argentinean Spanish"
 msgstr ""
 
-#: contrib/comments/models.py:168
-msgid "person's name"
+#: conf/global_settings.py:46
+msgid "French"
 msgstr ""
 
-#: contrib/comments/models.py:171
-msgid "ip address"
+#: conf/global_settings.py:47
+msgid "Galician"
 msgstr ""
 
-#: contrib/comments/models.py:173
-msgid "approved by staff"
+#: conf/global_settings.py:48
+msgid "Hungarian"
 msgstr ""
 
-#: contrib/comments/models.py:176
-msgid "free comment"
+#: conf/global_settings.py:49
+msgid "Hebrew"
 msgstr ""
 
-#: contrib/comments/models.py:177
-msgid "free comments"
+#: conf/global_settings.py:50
+msgid "Icelandic"
 msgstr ""
 
-#: contrib/comments/models.py:233
-msgid "score"
+#: conf/global_settings.py:51
+msgid "Italian"
 msgstr ""
 
-#: contrib/comments/models.py:234
-msgid "score date"
+#: conf/global_settings.py:52
+msgid "Japanese"
 msgstr ""
 
-#: contrib/comments/models.py:237
-msgid "karma score"
+#: conf/global_settings.py:53
+msgid "Dutch"
 msgstr ""
 
-#: contrib/comments/models.py:238
-msgid "karma scores"
+#: conf/global_settings.py:54
+msgid "Norwegian"
 msgstr ""
 
-#: contrib/comments/models.py:242
-#, python-format
-msgid "%(score)d rating by %(user)s"
+#: conf/global_settings.py:55
+msgid "Brazilian"
 msgstr ""
 
-#: contrib/comments/models.py:258
-#, python-format
-msgid ""
-"This comment was flagged by %(user)s:\n"
-"\n"
-"%(text)s"
+#: conf/global_settings.py:56
+msgid "Romanian"
 msgstr ""
 
-#: contrib/comments/models.py:265
-msgid "flag date"
+#: conf/global_settings.py:57
+msgid "Russian"
 msgstr ""
 
-#: contrib/comments/models.py:268
-msgid "user flag"
+#: conf/global_settings.py:58
+msgid "Slovak"
 msgstr ""
 
-#: contrib/comments/models.py:269
-msgid "user flags"
+#: conf/global_settings.py:59
+msgid "Slovenian"
 msgstr ""
 
-#: contrib/comments/models.py:273
-#, python-format
-msgid "Flag by %r"
+#: conf/global_settings.py:60
+msgid "Serbian"
 msgstr ""
 
-#: contrib/comments/models.py:278
-msgid "deletion date"
+#: conf/global_settings.py:61
+msgid "Swedish"
 msgstr ""
 
-#: contrib/comments/models.py:280
-msgid "moderator deletion"
+#: conf/global_settings.py:62
+msgid "Ukrainian"
 msgstr ""
 
-#: contrib/comments/models.py:281
-msgid "moderator deletions"
+#: conf/global_settings.py:63
+msgid "Simplified Chinese"
 msgstr ""
 
-#: contrib/comments/models.py:285
+#: conf/global_settings.py:64
+msgid "Traditional Chinese"
+msgstr ""
+
+#: forms/__init__.py:380
 #, python-format
-msgid "Moderator deletion by %r"
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] ""
+msgstr[1] ""
+
+#: forms/__init__.py:385
+msgid "Line breaks are not allowed here."
 msgstr ""
 
-#: contrib/comments/views/karma.py:19
-msgid "Anonymous users cannot vote"
+#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: contrib/comments/views/karma.py:23
-msgid "Invalid comment ID"
+#: forms/__init__.py:645
+msgid "The submitted file is empty."
 msgstr ""
 
-#: contrib/comments/views/karma.py:25
-msgid "No voting for yourself"
+#: forms/__init__.py:699
+msgid "Enter a whole number between -32,768 and 32,767."
 msgstr ""
 
-#: contrib/comments/views/comments.py:28
-msgid ""
-"This rating is required because you've entered at least one other rating."
+#: forms/__init__.py:708
+msgid "Enter a positive number."
 msgstr ""
 
-#: contrib/comments/views/comments.py:112
-#, python-format
-msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comment:\n"
-"\n"
-"%(text)s"
-msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s "
-"comments:\n"
-"\n"
-"%(text)s"
-msgstr[0] ""
-msgstr[1] ""
+#: forms/__init__.py:717
+msgid "Enter a whole number between 0 and 32,767."
+msgstr ""
 
-#: contrib/comments/views/comments.py:117
-#, python-format
+#: core/validators.py:63
+msgid "This value must contain only letters, numbers and underscores."
+msgstr ""
+
+#: core/validators.py:67
 msgid ""
-"This comment was posted by a sketchy user:\n"
-"\n"
-"%(text)s"
+"This value must contain only letters, numbers, underscores, dashes or "
+"slashes."
 msgstr ""
 
-#: contrib/comments/views/comments.py:189
-#: contrib/comments/views/comments.py:280
-msgid "Only POSTs are allowed"
+#: core/validators.py:75
+msgid "Uppercase letters are not allowed here."
 msgstr ""
 
-#: contrib/comments/views/comments.py:193
-#: contrib/comments/views/comments.py:284
-msgid "One or more of the required fields wasn't submitted"
+#: core/validators.py:79
+msgid "Lowercase letters are not allowed here."
 msgstr ""
 
-#: contrib/comments/views/comments.py:197
-#: contrib/comments/views/comments.py:286
-msgid "Somebody tampered with the comment form (security violation)"
+#: core/validators.py:86
+msgid "Enter only digits separated by commas."
 msgstr ""
 
-#: contrib/comments/views/comments.py:207
-#: contrib/comments/views/comments.py:292
-msgid ""
-"The comment form had an invalid 'target' parameter -- the object ID was "
-"invalid"
+#: core/validators.py:98
+msgid "Enter valid e-mail addresses separated by commas."
 msgstr ""
 
-#: contrib/comments/views/comments.py:257
-#: contrib/comments/views/comments.py:321
-msgid "The comment form didn't provide either 'preview' or 'post'"
+#: core/validators.py:102
+msgid "Please enter a valid IP address."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/login.html:17
-msgid "Username:"
+#: core/validators.py:106
+msgid "Empty values are not allowed here."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/admin/templates/admin/login.html:20
-msgid "Password:"
+#: core/validators.py:110
+msgid "Non-numeric characters aren't allowed here."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:6
-msgid "Forgotten your password?"
+#: core/validators.py:114
+msgid "This value can't be comprised solely of digits."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:8
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Log out"
+#: core/validators.py:119
+msgid "Enter a whole number."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
+#: core/validators.py:123
+msgid "Only alphabetical characters are allowed here."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
+#: core/validators.py:127
+msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
+#: core/validators.py:131
+msgid "Enter a valid time in HH:MM format."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
+#: core/validators.py:139
+msgid "Enter a valid e-mail address."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:27
-#: contrib/comments/templates/comments/freeform.html:5
-msgid "Comment:"
+#: core/validators.py:151
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
 msgstr ""
 
-#: contrib/comments/templates/comments/form.html:32
-#: contrib/comments/templates/comments/freeform.html:9
-msgid "Preview comment"
+#: core/validators.py:158
+#, python-format
+msgid "The URL %s does not point to a valid image."
 msgstr ""
 
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
+#: core/validators.py:162
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
 
-#: contrib/admin/filterspecs.py:40
+#: core/validators.py:170
 #, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
+msgid "The URL %s does not point to a valid QuickTime video."
 msgstr ""
 
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143
-msgid "All"
+#: core/validators.py:174
+msgid "A valid URL is required."
 msgstr ""
 
-#: contrib/admin/filterspecs.py:109
-msgid "Any date"
+#: core/validators.py:188
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:110
-msgid "Today"
+#: core/validators.py:195
+#, python-format
+msgid "Badly formed XML: %s"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:113
-msgid "Past 7 days"
+#: core/validators.py:205
+#, python-format
+msgid "Invalid URL: %s"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:115
-msgid "This month"
+#: core/validators.py:209 core/validators.py:211
+#, python-format
+msgid "The URL %s is a broken link."
 msgstr ""
 
-#: contrib/admin/filterspecs.py:117
-msgid "This year"
+#: core/validators.py:217
+msgid "Enter a valid U.S. state abbreviation."
 msgstr ""
 
-#: contrib/admin/filterspecs.py:143
-msgid "Yes"
-msgstr ""
+#: core/validators.py:232
+#, 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] ""
 
-#: contrib/admin/filterspecs.py:143
-msgid "No"
+#: core/validators.py:239
+#, python-format
+msgid "This field must match the '%s' field."
 msgstr ""
 
-#: contrib/admin/filterspecs.py:150
-msgid "Unknown"
+#: core/validators.py:258
+msgid "Please enter something for at least one field."
 msgstr ""
 
-#: contrib/admin/models.py:16
-msgid "action time"
+#: core/validators.py:267 core/validators.py:278
+msgid "Please enter both fields or leave them both empty."
 msgstr ""
 
-#: contrib/admin/models.py:19
-msgid "object id"
+#: core/validators.py:285
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""
 
-#: contrib/admin/models.py:20
-msgid "object repr"
+#: core/validators.py:297
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 
-#: contrib/admin/models.py:21
-msgid "action flag"
+#: core/validators.py:316
+msgid "Duplicate values are not allowed."
 msgstr ""
 
-#: contrib/admin/models.py:22
-msgid "change message"
+#: core/validators.py:339
+#, python-format
+msgid "This value must be a power of %s."
 msgstr ""
 
-#: contrib/admin/models.py:25
-msgid "log entry"
+#: core/validators.py:350
+msgid "Please enter a valid decimal number."
 msgstr ""
 
-#: contrib/admin/models.py:26
-msgid "log entries"
-msgstr ""
+#: core/validators.py:352
+#, 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] ""
 
-#: contrib/admin/templatetags/admin_list.py:228
-msgid "All dates"
-msgstr ""
+#: core/validators.py:355
+#, 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] ""
 
-#: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36
-#: contrib/auth/forms.py:41
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
+#: core/validators.py:365
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:23
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
+#: core/validators.py:366
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:61
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
+#: core/validators.py:379
+msgid "The format for this field is wrong."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:68
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
+#: core/validators.py:394
+msgid "This field is invalid."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:82
-msgid "Usernames cannot contain the '@' character."
+#: core/validators.py:429
+#, python-format
+msgid "Could not retrieve anything from %s."
 msgstr ""
 
-#: contrib/admin/views/decorators.py:84
+#: core/validators.py:432
 #, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 
-#: contrib/admin/views/main.py:226
-msgid "Site administration"
+#: core/validators.py:465
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
 msgstr ""
 
-#: contrib/admin/views/main.py:260
+#: core/validators.py:469
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
 msgstr ""
 
-#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
-msgid "You may edit it again below."
+#: core/validators.py:474
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
 msgstr ""
 
-#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
+#: core/validators.py:479
 #, python-format
-msgid "You may add another %s below."
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
 msgstr ""
 
-#: contrib/admin/views/main.py:290
+#: core/validators.py:483
 #, python-format
-msgid "Add %s"
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
 msgstr ""
 
-#: contrib/admin/views/main.py:336
+#: core/validators.py:488
 #, python-format
-msgid "Added %s."
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
 msgstr ""
 
-#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
-#: contrib/admin/views/main.py:340
-msgid "and"
-msgstr ""
+#: utils/translation.py:363
+msgid "DATE_FORMAT"
+msgstr "N j, Y"
 
-#: contrib/admin/views/main.py:338
-#, python-format
-msgid "Changed %s."
-msgstr ""
+#: utils/translation.py:364
+msgid "DATETIME_FORMAT"
+msgstr "N j, Y, P"
 
-#: contrib/admin/views/main.py:340
-#, python-format
-msgid "Deleted %s."
-msgstr ""
+#: utils/translation.py:365
+msgid "TIME_FORMAT"
+msgstr "P"
 
-#: contrib/admin/views/main.py:343
-msgid "No fields changed."
+#: utils/translation.py:381
+msgid "YEAR_MONTH_FORMAT"
+msgstr "F Y"
+
+#: utils/translation.py:382
+msgid "MONTH_DAY_FORMAT"
+msgstr "F j"
+
+#: utils/dates.py:6
+msgid "Monday"
 msgstr ""
 
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
+#: utils/dates.py:6
+msgid "Tuesday"
 msgstr ""
 
-#: contrib/admin/views/main.py:354
-#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+#: utils/dates.py:6
+msgid "Wednesday"
 msgstr ""
 
-#: contrib/admin/views/main.py:392
-#, python-format
-msgid "Change %s"
+#: utils/dates.py:6
+msgid "Thursday"
 msgstr ""
 
-#: contrib/admin/views/main.py:470
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#: utils/dates.py:6
+msgid "Friday"
 msgstr ""
 
-#: contrib/admin/views/main.py:475
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
+#: utils/dates.py:7
+msgid "Saturday"
 msgstr ""
 
-#: contrib/admin/views/main.py:508
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+#: utils/dates.py:7
+msgid "Sunday"
 msgstr ""
 
-#: contrib/admin/views/main.py:511
-msgid "Are you sure?"
+#: utils/dates.py:14
+msgid "January"
 msgstr ""
 
-#: contrib/admin/views/main.py:533
-#, python-format
-msgid "Change history: %s"
+#: utils/dates.py:14
+msgid "February"
 msgstr ""
 
-#: contrib/admin/views/main.py:565
-#, python-format
-msgid "Select %s"
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
 msgstr ""
 
-#: contrib/admin/views/main.py:565
-#, python-format
-msgid "Select %s to change"
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
 msgstr ""
 
-#: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286
-#: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297
-msgid "Integer"
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
 msgstr ""
 
-#: contrib/admin/views/doc.py:278
-msgid "Boolean (Either True or False)"
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
 msgstr ""
 
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296
-#, python-format
-msgid "String (up to %(maxlength)s)"
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
 msgstr ""
 
-#: contrib/admin/views/doc.py:280
-msgid "Comma-separated integers"
+#: utils/dates.py:15
+msgid "August"
 msgstr ""
 
-#: contrib/admin/views/doc.py:281
-msgid "Date (without time)"
+#: utils/dates.py:15
+msgid "September"
 msgstr ""
 
-#: contrib/admin/views/doc.py:282
-msgid "Date (with time)"
+#: utils/dates.py:15
+msgid "October"
 msgstr ""
 
-#: contrib/admin/views/doc.py:283
-msgid "E-mail address"
+#: utils/dates.py:15
+msgid "November"
 msgstr ""
 
-#: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287
-msgid "File path"
+#: utils/dates.py:16
+msgid "December"
 msgstr ""
 
-#: contrib/admin/views/doc.py:285
-msgid "Decimal number"
+#: utils/dates.py:19
+msgid "jan"
 msgstr ""
 
-#: contrib/admin/views/doc.py:291
-msgid "Boolean (Either True, False or None)"
+#: utils/dates.py:19
+msgid "feb"
 msgstr ""
 
-#: contrib/admin/views/doc.py:292
-msgid "Relation to parent model"
+#: utils/dates.py:19
+msgid "mar"
 msgstr ""
 
-#: contrib/admin/views/doc.py:293
-msgid "Phone number"
+#: utils/dates.py:19
+msgid "apr"
 msgstr ""
 
-#: contrib/admin/views/doc.py:298
-msgid "Text"
+#: utils/dates.py:19
+msgid "may"
 msgstr ""
 
-#: contrib/admin/views/doc.py:299
-msgid "Time"
+#: utils/dates.py:19
+msgid "jun"
 msgstr ""
 
-#: contrib/admin/views/doc.py:300 contrib/flatpages/models.py:7
-msgid "URL"
+#: utils/dates.py:20
+msgid "jul"
 msgstr ""
 
-#: contrib/admin/views/doc.py:301
-msgid "U.S. state (two uppercase letters)"
+#: utils/dates.py:20
+msgid "aug"
 msgstr ""
 
-#: contrib/admin/views/doc.py:302
-msgid "XML text"
+#: utils/dates.py:20
+msgid "sep"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Documentation"
+#: utils/dates.py:20
+msgid "oct"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_index.html:5
-msgid "Change password"
+#: utils/dates.py:20
+msgid "nov"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/base.html:28
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Home"
+#: utils/dates.py:20
+msgid "dec"
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "History"
+#: utils/dates.py:27
+msgid "Jan."
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
+#: utils/dates.py:27
+msgid "Feb."
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:19
-msgid "User"
+#: utils/dates.py:28
+msgid "Aug."
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
+#: utils/dates.py:28
+msgid "Sept."
 msgstr ""
 
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "N j, Y, P"
-
-#: contrib/admin/templates/admin/object_history.html:36
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
+#: utils/dates.py:28
+msgid "Oct."
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
+#: utils/dates.py:28
+msgid "Nov."
 msgstr ""
 
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
+#: utils/dates.py:28
+msgid "Dec."
 msgstr ""
 
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr ""
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
 
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr ""
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
 
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr ""
+#: utils/timesince.py:14
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: contrib/admin/templates/admin/500.html:10
-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 ""
+#: utils/timesince.py:15
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr ""
+#: utils/timesince.py:16
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr ""
+#: utils/timesince.py:17
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: contrib/admin/templates/admin/index.html:17
-#, python-format
-msgid "Models available in the %(name)s application."
+#: contrib/contenttypes/models.py:25
+msgid "python model class name"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:28
-#: contrib/admin/templates/admin/change_form.html:15
-msgid "Add"
+#: contrib/contenttypes/models.py:28
+msgid "content type"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:34
-msgid "Change"
+#: contrib/contenttypes/models.py:29
+msgid "content types"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:44
-msgid "You don't have permission to edit anything."
+#: contrib/auth/models.py:13 contrib/auth/models.py:26
+msgid "name"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:52
-msgid "Recent Actions"
+#: contrib/auth/models.py:15
+msgid "codename"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:53
-msgid "My Actions"
+#: contrib/auth/models.py:17
+msgid "permission"
 msgstr ""
 
-#: contrib/admin/templates/admin/index.html:57
-msgid "None available"
+#: contrib/auth/models.py:18 contrib/auth/models.py:27
+msgid "permissions"
 msgstr ""
 
-#: contrib/admin/templates/admin/change_list.html:11
-#, python-format
-msgid "Add %(name)s"
+#: contrib/auth/models.py:29
+msgid "group"
 msgstr ""
 
-#: contrib/admin/templates/admin/login.html:22
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+#: contrib/auth/models.py:30 contrib/auth/models.py:65
+msgid "groups"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
+#: contrib/auth/models.py:55
+msgid "username"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
+#: contrib/auth/models.py:56
+msgid "first name"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, 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:"
+#: contrib/auth/models.py:57
+msgid "last name"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:21
-#, 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:"
+#: contrib/auth/models.py:58
+msgid "e-mail address"
 msgstr ""
 
-#: contrib/admin/templates/admin/delete_confirmation.html:26
-msgid "Yes, I'm sure"
+#: contrib/auth/models.py:59
+msgid "password"
 msgstr ""
 
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
+#: contrib/auth/models.py:59
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
+#: contrib/auth/models.py:60
+msgid "staff status"
 msgstr ""
 
-#: contrib/admin/templates/admin/change_form.html:21
-msgid "View on site"
+#: contrib/auth/models.py:60
+msgid "Designates whether the user can log into this admin site."
 msgstr ""
 
-#: contrib/admin/templates/admin/change_form.html:30
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Ordering"
+#: contrib/auth/models.py:61
+msgid "active"
 msgstr ""
 
-#: contrib/admin/templates/admin/change_form.html:51
-msgid "Order:"
+#: contrib/auth/models.py:62
+msgid "superuser status"
 msgstr ""
 
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
+#: contrib/auth/models.py:63
+msgid "last login"
 msgstr ""
 
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
+#: contrib/auth/models.py:64
+msgid "date joined"
 msgstr ""
 
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
+#: contrib/auth/models.py:66
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
 msgstr ""
 
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
+#: contrib/auth/models.py:67
+msgid "user permissions"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
-msgid "Password change"
+#: contrib/auth/models.py:70
+msgid "user"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
+#: contrib/auth/models.py:71
+msgid "users"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
+#: contrib/auth/models.py:76
+msgid "Personal info"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/registration/password_reset_form.html:10
-#: contrib/admin/templates/registration/password_reset_done.html:4
-msgid "Password reset"
+#: contrib/auth/models.py:77
+msgid "Permissions"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
+#: contrib/auth/models.py:78
+msgid "Important dates"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
+#: contrib/auth/models.py:79
+msgid "Groups"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
+#: contrib/auth/models.py:219
+msgid "message"
 msgstr ""
 
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
+#: contrib/auth/forms.py:30
+msgid ""
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
 msgstr ""
 
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
+#: contrib/auth/forms.py:36 contrib/auth/forms.py:41
+#: contrib/admin/views/decorators.py:9
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
+#: contrib/redirects/models.py:7
+msgid "redirect from"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_done.html:12
+#: contrib/redirects/models.py:8
 msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
 
-#: contrib/admin/templates/registration/password_change_form.html:12
-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."
+#: contrib/redirects/models.py:9
+msgid "redirect to"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
+#: contrib/redirects/models.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
 msgstr ""
 
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
+#: contrib/redirects/models.py:12
+msgid "redirect"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
+#: contrib/redirects/models.py:13
+msgid "redirects"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
+#: contrib/comments/models.py:67 contrib/comments/models.py:166
+msgid "object ID"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
+#: contrib/comments/models.py:68
+msgid "headline"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_email.html:3
-#, python-format
-msgid "for your user account at %(site_name)s"
+#: contrib/comments/models.py:69 contrib/comments/models.py:90
+#: contrib/comments/models.py:167
+msgid "comment"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
-msgid "Your new password is: %(new_password)s"
+#: contrib/comments/models.py:70
+msgid "rating #1"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
+#: contrib/comments/models.py:71
+msgid "rating #2"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_email.html:11
-msgid "Your username, in case you've forgotten:"
+#: contrib/comments/models.py:72
+msgid "rating #3"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
+#: contrib/comments/models.py:73
+msgid "rating #4"
 msgstr ""
 
-#: contrib/admin/templates/registration/password_reset_email.html:15
-#, python-format
-msgid "The %(site_name)s team"
+#: contrib/comments/models.py:74
+msgid "rating #5"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
+#: contrib/comments/models.py:75
+msgid "rating #6"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
+#: contrib/comments/models.py:76
+msgid "rating #7"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
-msgid ""
-"\n"
-"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site.  Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").</p>\n"
+#: contrib/comments/models.py:77
+msgid "rating #8"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
+#: contrib/comments/models.py:82
+msgid "is valid rating"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
+#: contrib/comments/models.py:83 contrib/comments/models.py:169
+msgid "date/time submitted"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
+#: contrib/comments/models.py:84 contrib/comments/models.py:170
+msgid "is public"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
+#: contrib/comments/models.py:85 contrib/admin/views/doc.py:292
+msgid "IP address"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
+#: contrib/comments/models.py:86
+msgid "is removed"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
+#: contrib/comments/models.py:86
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
+#: contrib/comments/models.py:91
+msgid "comments"
 msgstr ""
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
+#: contrib/comments/models.py:131 contrib/comments/models.py:207
+msgid "Content object"
 msgstr ""
 
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
+#: contrib/comments/models.py:159
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
 msgstr ""
 
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
+#: contrib/comments/models.py:168
+msgid "person's name"
 msgstr ""
 
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
+#: contrib/comments/models.py:171
+msgid "ip address"
 msgstr ""
 
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
+#: contrib/comments/models.py:173
+msgid "approved by staff"
 msgstr ""
 
-#: contrib/redirects/models.py:7
-msgid "redirect from"
+#: contrib/comments/models.py:176
+msgid "free comment"
 msgstr ""
 
-#: contrib/redirects/models.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
+#: contrib/comments/models.py:177
+msgid "free comments"
 msgstr ""
 
-#: contrib/redirects/models.py:9
-msgid "redirect to"
+#: contrib/comments/models.py:233
+msgid "score"
 msgstr ""
 
-#: contrib/redirects/models.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
+#: contrib/comments/models.py:234
+msgid "score date"
 msgstr ""
 
-#: contrib/redirects/models.py:12
-msgid "redirect"
+#: contrib/comments/models.py:237
+msgid "karma score"
 msgstr ""
 
-#: contrib/redirects/models.py:13
-msgid "redirects"
+#: contrib/comments/models.py:238
+msgid "karma scores"
 msgstr ""
 
-#: contrib/flatpages/models.py:8
+#: contrib/comments/models.py:242
+#, python-format
+msgid "%(score)d rating by %(user)s"
+msgstr ""
+
+#: contrib/comments/models.py:258
+#, python-format
 msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+"This comment was flagged by %(user)s:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/flatpages/models.py:9
-msgid "title"
+#: contrib/comments/models.py:265
+msgid "flag date"
 msgstr ""
 
-#: contrib/flatpages/models.py:10
-msgid "content"
+#: contrib/comments/models.py:268
+msgid "user flag"
 msgstr ""
 
-#: contrib/flatpages/models.py:11
-msgid "enable comments"
+#: contrib/comments/models.py:269
+msgid "user flags"
 msgstr ""
 
-#: contrib/flatpages/models.py:12
-msgid "template name"
+#: contrib/comments/models.py:273
+#, python-format
+msgid "Flag by %r"
 msgstr ""
 
-#: contrib/flatpages/models.py:13
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
+#: contrib/comments/models.py:278
+msgid "deletion date"
 msgstr ""
 
-#: contrib/flatpages/models.py:14
-msgid "registration required"
+#: contrib/comments/models.py:280
+msgid "moderator deletion"
 msgstr ""
 
-#: contrib/flatpages/models.py:14
-msgid "If this is checked, only logged-in users will be able to view the page."
+#: contrib/comments/models.py:281
+msgid "moderator deletions"
 msgstr ""
 
-#: contrib/flatpages/models.py:18
-msgid "flat page"
+#: contrib/comments/models.py:285
+#, python-format
+msgid "Moderator deletion by %r"
 msgstr ""
 
-#: contrib/flatpages/models.py:19
-msgid "flat pages"
+#: contrib/comments/views/karma.py:19
+msgid "Anonymous users cannot vote"
 msgstr ""
 
-#: contrib/auth/models.py:13 contrib/auth/models.py:26
-msgid "name"
+#: contrib/comments/views/karma.py:23
+msgid "Invalid comment ID"
 msgstr ""
 
-#: contrib/auth/models.py:15
-msgid "codename"
+#: contrib/comments/views/karma.py:25
+msgid "No voting for yourself"
 msgstr ""
 
-#: contrib/auth/models.py:17
-msgid "permission"
+#: contrib/comments/views/comments.py:28
+msgid ""
+"This rating is required because you've entered at least one other rating."
 msgstr ""
 
-#: contrib/auth/models.py:18 contrib/auth/models.py:27
-msgid "permissions"
+#: contrib/comments/views/comments.py:112
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/comments/views/comments.py:117
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
 msgstr ""
 
-#: contrib/auth/models.py:29
-msgid "group"
+#: contrib/comments/views/comments.py:189
+#: contrib/comments/views/comments.py:280
+msgid "Only POSTs are allowed"
 msgstr ""
 
-#: contrib/auth/models.py:30 contrib/auth/models.py:65
-msgid "groups"
+#: contrib/comments/views/comments.py:193
+#: contrib/comments/views/comments.py:284
+msgid "One or more of the required fields wasn't submitted"
 msgstr ""
 
-#: contrib/auth/models.py:55
-msgid "username"
+#: contrib/comments/views/comments.py:197
+#: contrib/comments/views/comments.py:286
+msgid "Somebody tampered with the comment form (security violation)"
 msgstr ""
 
-#: contrib/auth/models.py:56
-msgid "first name"
+#: contrib/comments/views/comments.py:207
+#: contrib/comments/views/comments.py:292
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr ""
 
-#: contrib/auth/models.py:57
-msgid "last name"
+#: contrib/comments/views/comments.py:257
+#: contrib/comments/views/comments.py:321
+msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/auth/models.py:58
-msgid "e-mail address"
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
 msgstr ""
 
-#: contrib/auth/models.py:59
-msgid "password"
+#: contrib/comments/templates/comments/freeform.html:5
+#: contrib/comments/templates/comments/form.html:27
+msgid "Comment:"
 msgstr ""
 
-#: contrib/auth/models.py:59
-msgid "Use '[algo]$[salt]$[hexdigest]'"
+#: contrib/comments/templates/comments/freeform.html:9
+#: contrib/comments/templates/comments/form.html:32
+msgid "Preview comment"
 msgstr ""
 
-#: contrib/auth/models.py:60
-msgid "staff status"
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:17
+msgid "Username:"
 msgstr ""
 
-#: contrib/auth/models.py:60
-msgid "Designates whether the user can log into this admin site."
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/login.html:20
+msgid "Password:"
 msgstr ""
 
-#: contrib/auth/models.py:61
-msgid "active"
+#: contrib/comments/templates/comments/form.html:6
+msgid "Forgotten your password?"
 msgstr ""
 
-#: contrib/auth/models.py:62
-msgid "superuser status"
+#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
 msgstr ""
 
-#: contrib/auth/models.py:63
-msgid "last login"
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
 msgstr ""
 
-#: contrib/auth/models.py:64
-msgid "date joined"
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
 msgstr ""
 
-#: contrib/auth/models.py:66
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
 msgstr ""
 
-#: contrib/auth/models.py:67
-msgid "user permissions"
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
 msgstr ""
 
-#: contrib/auth/models.py:70
-msgid "user"
+#: contrib/flatpages/models.py:7 contrib/admin/views/doc.py:303
+msgid "URL"
 msgstr ""
 
-#: contrib/auth/models.py:71
-msgid "users"
+#: contrib/flatpages/models.py:8
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
 
-#: contrib/auth/models.py:76
-msgid "Personal info"
+#: contrib/flatpages/models.py:9
+msgid "title"
 msgstr ""
 
-#: contrib/auth/models.py:77
-msgid "Permissions"
+#: contrib/flatpages/models.py:10
+msgid "content"
 msgstr ""
 
-#: contrib/auth/models.py:78
-msgid "Important dates"
+#: contrib/flatpages/models.py:11
+msgid "enable comments"
 msgstr ""
 
-#: contrib/auth/models.py:79
-msgid "Groups"
+#: contrib/flatpages/models.py:12
+msgid "template name"
 msgstr ""
 
-#: contrib/auth/models.py:219
-msgid "message"
+#: contrib/flatpages/models.py:13
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
 msgstr ""
 
-#: contrib/auth/forms.py:30
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
+#: contrib/flatpages/models.py:14
+msgid "registration required"
 msgstr ""
 
-#: contrib/contenttypes/models.py:25
-msgid "python model class name"
+#: contrib/flatpages/models.py:14
+msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr ""
 
-#: contrib/contenttypes/models.py:28
-msgid "content type"
+#: contrib/flatpages/models.py:18
+msgid "flat page"
 msgstr ""
 
-#: contrib/contenttypes/models.py:29
-msgid "content types"
+#: contrib/flatpages/models.py:19
+msgid "flat pages"
 msgstr ""
 
 #: contrib/sessions/models.py:35
@@ -1233,647 +1222,683 @@
 msgid "sites"
 msgstr ""
 
-#: utils/translation.py:360
-msgid "DATE_FORMAT"
-msgstr "N j, Y"
+#: contrib/admin/filterspecs.py:40
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
 
-#: utils/translation.py:361
-msgid "DATETIME_FORMAT"
-msgstr "N j, Y, P"
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
+msgid "All"
+msgstr ""
 
-#: utils/translation.py:362
-msgid "TIME_FORMAT"
-msgstr "P"
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr ""
 
-#: utils/dates.py:6
-msgid "Monday"
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
 msgstr ""
 
-#: utils/dates.py:6
-msgid "Tuesday"
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
 msgstr ""
 
-#: utils/dates.py:6
-msgid "Wednesday"
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
 msgstr ""
 
-#: utils/dates.py:6
-msgid "Thursday"
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
 msgstr ""
 
-#: utils/dates.py:6
-msgid "Friday"
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
 msgstr ""
 
-#: utils/dates.py:7
-msgid "Saturday"
+#: contrib/admin/filterspecs.py:143
+msgid "No"
 msgstr ""
 
-#: utils/dates.py:7
-msgid "Sunday"
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
 msgstr ""
 
-#: utils/dates.py:14
-msgid "January"
+#: contrib/admin/models.py:16
+msgid "action time"
 msgstr ""
 
-#: utils/dates.py:14
-msgid "February"
+#: contrib/admin/models.py:19
+msgid "object id"
 msgstr ""
 
-#: utils/dates.py:14 utils/dates.py:27
-msgid "March"
+#: contrib/admin/models.py:20
+msgid "object repr"
 msgstr ""
 
-#: utils/dates.py:14 utils/dates.py:27
-msgid "April"
+#: contrib/admin/models.py:21
+msgid "action flag"
 msgstr ""
 
-#: utils/dates.py:14 utils/dates.py:27
-msgid "May"
+#: contrib/admin/models.py:22
+msgid "change message"
 msgstr ""
 
-#: utils/dates.py:14 utils/dates.py:27
-msgid "June"
+#: contrib/admin/models.py:25
+msgid "log entry"
 msgstr ""
 
-#: utils/dates.py:15 utils/dates.py:27
-msgid "July"
+#: contrib/admin/models.py:26
+msgid "log entries"
 msgstr ""
 
-#: utils/dates.py:15
-msgid "August"
+#: contrib/admin/templatetags/admin_list.py:228
+msgid "All dates"
 msgstr ""
 
-#: utils/dates.py:15
-msgid "September"
+#: contrib/admin/views/decorators.py:23
+#: contrib/admin/templates/admin/login.html:25
+msgid "Log in"
 msgstr ""
 
-#: utils/dates.py:15
-msgid "October"
+#: contrib/admin/views/decorators.py:61
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
 msgstr ""
 
-#: utils/dates.py:15
-msgid "November"
+#: contrib/admin/views/decorators.py:68
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
 msgstr ""
 
-#: utils/dates.py:16
-msgid "December"
+#: contrib/admin/views/decorators.py:82
+msgid "Usernames cannot contain the '@' character."
 msgstr ""
 
-#: utils/dates.py:19
-msgid "jan"
+#: contrib/admin/views/decorators.py:84
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: utils/dates.py:19
-msgid "feb"
+#: contrib/admin/views/main.py:226
+msgid "Site administration"
 msgstr ""
 
-#: utils/dates.py:19
-msgid "mar"
+#: contrib/admin/views/main.py:260
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: utils/dates.py:19
-msgid "apr"
+#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
+msgid "You may edit it again below."
 msgstr ""
 
-#: utils/dates.py:19
-msgid "may"
+#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
+#, python-format
+msgid "You may add another %s below."
 msgstr ""
 
-#: utils/dates.py:19
-msgid "jun"
+#: contrib/admin/views/main.py:290
+#, python-format
+msgid "Add %s"
 msgstr ""
 
-#: utils/dates.py:20
-msgid "jul"
+#: contrib/admin/views/main.py:336
+#, python-format
+msgid "Added %s."
 msgstr ""
 
-#: utils/dates.py:20
-msgid "aug"
+#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
+#: contrib/admin/views/main.py:340
+msgid "and"
 msgstr ""
 
-#: utils/dates.py:20
-msgid "sep"
+#: contrib/admin/views/main.py:338
+#, python-format
+msgid "Changed %s."
 msgstr ""
 
-#: utils/dates.py:20
-msgid "oct"
+#: contrib/admin/views/main.py:340
+#, python-format
+msgid "Deleted %s."
 msgstr ""
 
-#: utils/dates.py:20
-msgid "nov"
+#: contrib/admin/views/main.py:343
+msgid "No fields changed."
 msgstr ""
 
-#: utils/dates.py:20
-msgid "dec"
+#: contrib/admin/views/main.py:346
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: utils/dates.py:27
-msgid "Jan."
+#: contrib/admin/views/main.py:354
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: utils/dates.py:27
-msgid "Feb."
+#: contrib/admin/views/main.py:392
+#, python-format
+msgid "Change %s"
 msgstr ""
 
-#: utils/dates.py:28
-msgid "Aug."
+#: contrib/admin/views/main.py:470
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: utils/dates.py:28
-msgid "Sept."
+#: contrib/admin/views/main.py:475
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: utils/dates.py:28
-msgid "Oct."
+#: contrib/admin/views/main.py:508
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:511
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:533
+#, python-format
+msgid "Change history: %s"
 msgstr ""
 
-#: utils/dates.py:28
-msgid "Nov."
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "Select %s"
 msgstr ""
 
-#: utils/dates.py:28
-msgid "Dec."
+#: contrib/admin/views/main.py:567
+#, python-format
+msgid "Select %s to change"
 msgstr ""
 
-#: utils/timesince.py:12
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: utils/timesince.py:13
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+#: contrib/admin/views/main.py:741
+msgid "Database error"
+msgstr ""
 
-#: utils/timesince.py:14
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:289
+#: contrib/admin/views/doc.py:291 contrib/admin/views/doc.py:297
+#: contrib/admin/views/doc.py:298 contrib/admin/views/doc.py:300
+msgid "Integer"
+msgstr ""
 
-#: utils/timesince.py:15
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+#: contrib/admin/views/doc.py:280
+msgid "Boolean (Either True or False)"
+msgstr ""
 
-#: utils/timesince.py:16
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+#: contrib/admin/views/doc.py:281 contrib/admin/views/doc.py:299
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr ""
 
-#: utils/timesince.py:17
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: contrib/admin/views/doc.py:282
+msgid "Comma-separated integers"
+msgstr ""
 
-#: conf/global_settings.py:37
-msgid "Bengali"
+#: contrib/admin/views/doc.py:283
+msgid "Date (without time)"
 msgstr ""
 
-#: conf/global_settings.py:38
-msgid "Czech"
+#: contrib/admin/views/doc.py:284
+msgid "Date (with time)"
 msgstr ""
 
-#: conf/global_settings.py:39
-msgid "Welsh"
+#: contrib/admin/views/doc.py:285
+msgid "E-mail address"
 msgstr ""
 
-#: conf/global_settings.py:40
-msgid "Danish"
+#: contrib/admin/views/doc.py:286 contrib/admin/views/doc.py:287
+#: contrib/admin/views/doc.py:290
+msgid "File path"
 msgstr ""
 
-#: conf/global_settings.py:41
-msgid "German"
+#: contrib/admin/views/doc.py:288
+msgid "Decimal number"
 msgstr ""
 
-#: conf/global_settings.py:42
-msgid "Greek"
+#: contrib/admin/views/doc.py:294
+msgid "Boolean (Either True, False or None)"
 msgstr ""
 
-#: conf/global_settings.py:43
-msgid "English"
+#: contrib/admin/views/doc.py:295
+msgid "Relation to parent model"
 msgstr ""
 
-#: conf/global_settings.py:44
-msgid "Spanish"
+#: contrib/admin/views/doc.py:296
+msgid "Phone number"
 msgstr ""
 
-#: conf/global_settings.py:45
-msgid "French"
+#: contrib/admin/views/doc.py:301
+msgid "Text"
 msgstr ""
 
-#: conf/global_settings.py:46
-msgid "Galician"
+#: contrib/admin/views/doc.py:302
+msgid "Time"
 msgstr ""
 
-#: conf/global_settings.py:47
-msgid "Hungarian"
+#: contrib/admin/views/doc.py:304
+msgid "U.S. state (two uppercase letters)"
 msgstr ""
 
-#: conf/global_settings.py:48
-msgid "Hebrew"
+#: contrib/admin/views/doc.py:305
+msgid "XML text"
 msgstr ""
 
-#: conf/global_settings.py:49
-msgid "Icelandic"
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
 msgstr ""
 
-#: conf/global_settings.py:50
-msgid "Italian"
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
 msgstr ""
 
-#: conf/global_settings.py:51
-msgid "Japanese"
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
 msgstr ""
 
-#: conf/global_settings.py:52
-msgid "Dutch"
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
 msgstr ""
 
-#: conf/global_settings.py:53
-msgid "Norwegian"
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
 msgstr ""
 
-#: conf/global_settings.py:54
-msgid "Brazilian"
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/change_form.html:10
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
 msgstr ""
 
-#: conf/global_settings.py:55
-msgid "Romanian"
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_list.html:6
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: contrib/admin/templates/admin/change_form.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Home"
 msgstr ""
 
-#: conf/global_settings.py:56
-msgid "Russian"
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "History"
 msgstr ""
 
-#: conf/global_settings.py:57
-msgid "Slovak"
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
 msgstr ""
 
-#: conf/global_settings.py:58
-msgid "Slovenian"
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "User"
 msgstr ""
 
-#: conf/global_settings.py:59
-msgid "Serbian"
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
 msgstr ""
 
-#: conf/global_settings.py:60
-msgid "Swedish"
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "N j, Y, P"
+
+#: contrib/admin/templates/admin/object_history.html:36
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
 msgstr ""
 
-#: conf/global_settings.py:61
-msgid "Ukrainian"
+#: contrib/admin/templates/admin/change_list.html:11
+#, python-format
+msgid "Add %(name)s"
 msgstr ""
 
-#: conf/global_settings.py:62
-msgid "Simplified Chinese"
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(title)s "
 msgstr ""
 
-#: conf/global_settings.py:63
-msgid "Traditional Chinese"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
 msgstr ""
 
-#: core/validators.py:60
-msgid "This value must contain only letters, numbers and underscores."
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
 msgstr ""
 
-#: core/validators.py:64
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
-"slashes."
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
 msgstr ""
 
-#: core/validators.py:72
-msgid "Uppercase letters are not allowed here."
+#: contrib/admin/templates/admin/500.html:10
+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 ""
 
-#: core/validators.py:76
-msgid "Lowercase letters are not allowed here."
+#: contrib/admin/templates/admin/invalid_setup.html:8
+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 "
+"the appropriate user."
 msgstr ""
 
-#: core/validators.py:83
-msgid "Enter only digits separated by commas."
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
 msgstr ""
 
-#: core/validators.py:95
-msgid "Enter valid e-mail addresses separated by commas."
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
 msgstr ""
 
-#: core/validators.py:99
-msgid "Please enter a valid IP address."
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
 msgstr ""
 
-#: core/validators.py:103
-msgid "Empty values are not allowed here."
+#: contrib/admin/templates/admin/login.html:22
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr ""
 
-#: core/validators.py:107
-msgid "Non-numeric characters aren't allowed here."
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
 msgstr ""
 
-#: core/validators.py:111
-msgid "This value can't be comprised solely of digits."
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
 msgstr ""
 
-#: core/validators.py:116
-msgid "Enter a whole number."
+#: contrib/admin/templates/admin/index.html:17
+#, python-format
+msgid "Models available in the %(name)s application."
 msgstr ""
 
-#: core/validators.py:120
-msgid "Only alphabetical characters are allowed here."
+#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:15
+msgid "Add"
 msgstr ""
 
-#: core/validators.py:124
-msgid "Enter a valid date in YYYY-MM-DD format."
+#: contrib/admin/templates/admin/index.html:34
+msgid "Change"
 msgstr ""
 
-#: core/validators.py:128
-msgid "Enter a valid time in HH:MM format."
+#: contrib/admin/templates/admin/index.html:44
+msgid "You don't have permission to edit anything."
 msgstr ""
 
-#: core/validators.py:132 db/models/fields/__init__.py:468
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+#: contrib/admin/templates/admin/index.html:52
+msgid "Recent Actions"
 msgstr ""
 
-#: core/validators.py:136
-msgid "Enter a valid e-mail address."
+#: contrib/admin/templates/admin/index.html:53
+msgid "My Actions"
 msgstr ""
 
-#: core/validators.py:148
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
+#: contrib/admin/templates/admin/index.html:57
+msgid "None available"
 msgstr ""
 
-#: core/validators.py:155
-#, python-format
-msgid "The URL %s does not point to a valid image."
+#: contrib/admin/templates/admin/change_form.html:21
+msgid "View on site"
 msgstr ""
 
-#: core/validators.py:159
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+#: contrib/admin/templates/admin/change_form.html:30
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Ordering"
 msgstr ""
 
-#: core/validators.py:167
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
+#: contrib/admin/templates/admin/change_form.html:51
+msgid "Order:"
 msgstr ""
 
-#: core/validators.py:171
-msgid "A valid URL is required."
+#: contrib/admin/templates/admin/delete_confirmation.html:9
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
 msgstr ""
 
-#: core/validators.py:185
+#: contrib/admin/templates/admin/delete_confirmation.html:14
 #, python-format
 msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
+"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 ""
 
-#: core/validators.py:192
+#: contrib/admin/templates/admin/delete_confirmation.html:21
 #, python-format
-msgid "Badly formed XML: %s"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
 msgstr ""
 
-#: core/validators.py:202
-#, python-format
-msgid "Invalid URL: %s"
+#: contrib/admin/templates/admin/delete_confirmation.html:26
+msgid "Yes, I'm sure"
 msgstr ""
 
-#: core/validators.py:206 core/validators.py:208
-#, python-format
-msgid "The URL %s is a broken link."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
 msgstr ""
 
-#: core/validators.py:214
-msgid "Enter a valid U.S. state abbreviation."
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
 msgstr ""
 
-#: core/validators.py:229
-#, 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:236
-#, python-format
-msgid "This field must match the '%s' field."
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
 msgstr ""
 
-#: core/validators.py:255
-msgid "Please enter something for at least one field."
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
 msgstr ""
 
-#: core/validators.py:264 core/validators.py:275
-msgid "Please enter both fields or leave them both empty."
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
 msgstr ""
 
-#: core/validators.py:282
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_change_form.html:6
+#: contrib/admin/templates/registration/password_change_form.html:10
+msgid "Password change"
 msgstr ""
 
-#: core/validators.py:294
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
 msgstr ""
 
-#: core/validators.py:313
-msgid "Duplicate values are not allowed."
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
 msgstr ""
 
-#: core/validators.py:336
-#, python-format
-msgid "This value must be a power of %s."
+#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
+#: contrib/admin/templates/registration/password_reset_done.html:4
+msgid "Password reset"
 msgstr ""
 
-#: core/validators.py:347
-msgid "Please enter a valid decimal number."
+#: contrib/admin/templates/registration/password_reset_form.html:12
+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 ""
 
-#: core/validators.py:349
-#, 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:352
-#, 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:362
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
 msgstr ""
 
-#: core/validators.py:363
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
 msgstr ""
 
-#: core/validators.py:376
-msgid "The format for this field is wrong."
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
 msgstr ""
 
-#: core/validators.py:391
-msgid "This field is invalid."
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
 msgstr ""
 
-#: core/validators.py:426
-#, python-format
-msgid "Could not retrieve anything from %s."
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
 msgstr ""
 
-#: core/validators.py:429
-#, python-format
+#: contrib/admin/templates/registration/password_reset_done.html:12
 msgid ""
-"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
 msgstr ""
 
-#: core/validators.py:462
-#, python-format
+#: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
-"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
-"\"%(start)s\".)"
+"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 ""
 
-#: core/validators.py:466
-#, python-format
-msgid ""
-"Some text starting on line %(line)s is not allowed in that context. (Line "
-"starts with \"%(start)s\".)"
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
 msgstr ""
 
-#: core/validators.py:471
-#, python-format
-msgid ""
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
-"(start)s\".)"
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
 msgstr ""
 
-#: core/validators.py:476
-#, python-format
-msgid ""
-"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
-"(start)s\".)"
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
 msgstr ""
 
-#: core/validators.py:480
-#, python-format
-msgid ""
-"A tag on line %(line)s is missing one or more required attributes. (Line "
-"starts with \"%(start)s\".)"
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
 msgstr ""
 
-#: core/validators.py:485
-#, python-format
-msgid ""
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-"starts with \"%(start)s\".)"
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
 
-#: db/models/manipulators.py:302
+#: contrib/admin/templates/registration/password_reset_email.html:3
 #, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgid "for your user account at %(site_name)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:40
+#: contrib/admin/templates/registration/password_reset_email.html:5
 #, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr ""
-
-#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553
-#: forms/__init__.py:346
-msgid "This field is required."
+msgid "Your new password is: %(new_password)s"
 msgstr ""
 
-#: db/models/fields/__init__.py:337
-msgid "This value must be an integer."
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
 msgstr ""
 
-#: db/models/fields/__init__.py:369
-msgid "This value must be either True or False."
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
 msgstr ""
 
-#: db/models/fields/__init__.py:385
-msgid "This field cannot be null."
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
 msgstr ""
 
-#: db/models/fields/__init__.py:562
-msgid "Enter a valid filename."
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
 msgstr ""
 
-#: db/models/fields/related.py:43
-#, python-format
-msgid "Please enter a valid %s."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
 msgstr ""
 
-#: db/models/fields/related.py:579
-msgid "Separate multiple IDs with commas."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
 msgstr ""
 
-#: db/models/fields/related.py:581
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
 msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
 msgstr ""
 
-#: db/models/fields/related.py:625
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural ""
-"Please enter valid %(self)s IDs. The values %(value)r are invalid."
-msgstr[0] ""
-msgstr[1] ""
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr ""
 
-#: forms/__init__.py:380
-#, python-format
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] ""
-msgstr[1] ""
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
 
-#: forms/__init__.py:385
-msgid "Line breaks are not allowed here."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
 msgstr ""
 
-#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
 msgstr ""
 
-#: forms/__init__.py:645
-msgid "The submitted file is empty."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
 msgstr ""
 
-#: forms/__init__.py:699
-msgid "Enter a whole number between -32,768 and 32,767."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 
-#: forms/__init__.py:708
-msgid "Enter a positive number."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
 msgstr ""
 
-#: forms/__init__.py:717
-msgid "Enter a whole number between 0 and 32,767."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
 msgstr ""
 
-#: template/defaultfilters.py:379
+#: template/defaultfilters.py:383
 msgid "yes,no,maybe"
 msgstr ""