Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated the English language PO files to match the strings in the fin…

…al release.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8907 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 43f901e581c7ab5707038eaff0bc90c59cc29be1 1 parent aea3408
@malcolmt malcolmt authored
View
BIN  django/conf/locale/en/LC_MESSAGES/django.mo
Binary file not shown
View
2,447 django/conf/locale/en/LC_MESSAGES/django.po
@@ -1,13 +1,10 @@
-# 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.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-29 10:57-0600\n"
+"POT-Creation-Date: 2008-09-02 22:36-0700\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"
@@ -15,183 +12,199 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:44
msgid "Arabic"
msgstr ""
-#: conf/global_settings.py:40
+#: conf/global_settings.py:45
msgid "Bengali"
msgstr ""
-#: conf/global_settings.py:41
+#: conf/global_settings.py:46
msgid "Bulgarian"
msgstr ""
-#: conf/global_settings.py:42
+#: conf/global_settings.py:47
msgid "Catalan"
msgstr ""
-#: conf/global_settings.py:43
+#: conf/global_settings.py:48
msgid "Czech"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:49
msgid "Welsh"
msgstr ""
-#: conf/global_settings.py:45
+#: conf/global_settings.py:50
msgid "Danish"
msgstr ""
-#: conf/global_settings.py:46
+#: conf/global_settings.py:51
msgid "German"
msgstr ""
-#: conf/global_settings.py:47
+#: conf/global_settings.py:52
msgid "Greek"
msgstr ""
-#: conf/global_settings.py:48
+#: conf/global_settings.py:53
msgid "English"
msgstr ""
-#: conf/global_settings.py:49
+#: conf/global_settings.py:54
msgid "Spanish"
msgstr ""
-#: conf/global_settings.py:50
+#: conf/global_settings.py:55
+msgid "Estonian"
+msgstr ""
+
+#: conf/global_settings.py:56
msgid "Argentinean Spanish"
msgstr ""
-#: conf/global_settings.py:51
+#: conf/global_settings.py:57
+msgid "Basque"
+msgstr ""
+
+#: conf/global_settings.py:58
msgid "Persian"
msgstr ""
-#: conf/global_settings.py:52
+#: conf/global_settings.py:59
msgid "Finnish"
msgstr ""
-#: conf/global_settings.py:53
+#: conf/global_settings.py:60
msgid "French"
msgstr ""
-#: conf/global_settings.py:54
-msgid "Gaeilge"
+#: conf/global_settings.py:61
+msgid "Irish"
msgstr ""
-#: conf/global_settings.py:55
+#: conf/global_settings.py:62
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:56
+#: conf/global_settings.py:63
msgid "Hungarian"
msgstr ""
-#: conf/global_settings.py:57
+#: conf/global_settings.py:64
msgid "Hebrew"
msgstr ""
-#: conf/global_settings.py:58
+#: conf/global_settings.py:65
msgid "Croatian"
msgstr ""
-#: conf/global_settings.py:59
+#: conf/global_settings.py:66
msgid "Icelandic"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:67
msgid "Italian"
msgstr ""
-#: conf/global_settings.py:61
+#: conf/global_settings.py:68
msgid "Japanese"
msgstr ""
-#: conf/global_settings.py:62
+#: conf/global_settings.py:69
+msgid "Georgian"
+msgstr ""
+
+#: conf/global_settings.py:70
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:63
+#: conf/global_settings.py:71
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:72
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:73
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:66
+#: conf/global_settings.py:74
+msgid "Lithuanian"
+msgstr ""
+
+#: conf/global_settings.py:75
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:67
+#: conf/global_settings.py:76
msgid "Dutch"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:77
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:78
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:79
msgid "Portugese"
msgstr ""
-#: conf/global_settings.py:71
-msgid "Brazilian"
+#: conf/global_settings.py:80
+msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:72
+#: conf/global_settings.py:81
msgid "Romanian"
msgstr ""
-#: conf/global_settings.py:73
+#: conf/global_settings.py:82
msgid "Russian"
msgstr ""
-#: conf/global_settings.py:74
+#: conf/global_settings.py:83
msgid "Slovak"
msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:84
msgid "Slovenian"
msgstr ""
-#: conf/global_settings.py:76
+#: conf/global_settings.py:85
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:77
+#: conf/global_settings.py:86
msgid "Swedish"
msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:87
msgid "Tamil"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:88
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:89
msgid "Turkish"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:90
msgid "Ukrainian"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:91
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:92
msgid "Traditional Chinese"
msgstr ""
@@ -227,49 +240,209 @@ msgstr ""
msgid "This year"
msgstr ""
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
-#: oldforms/__init__.py:592
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
msgid "Yes"
msgstr ""
-#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
-#: oldforms/__init__.py:592
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:391
msgid "No"
msgstr ""
-#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
-#: oldforms/__init__.py:592
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:391
msgid "Unknown"
msgstr ""
-#: contrib/admin/models.py:18
+#: contrib/admin/models.py:19
msgid "action time"
msgstr ""
-#: contrib/admin/models.py:21
+#: contrib/admin/models.py:22
msgid "object id"
msgstr ""
-#: contrib/admin/models.py:22
+#: contrib/admin/models.py:23
msgid "object repr"
msgstr ""
-#: contrib/admin/models.py:23
+#: contrib/admin/models.py:24
msgid "action flag"
msgstr ""
-#: contrib/admin/models.py:24
+#: contrib/admin/models.py:25
msgid "change message"
msgstr ""
-#: contrib/admin/models.py:27
+#: contrib/admin/models.py:28
msgid "log entry"
msgstr ""
-#: contrib/admin/models.py:28
+#: contrib/admin/models.py:29
msgid "log entries"
msgstr ""
+#: contrib/admin/options.py:60 contrib/admin/options.py:121
+msgid "None"
+msgstr ""
+
+#: contrib/admin/options.py:338
+#, python-format
+msgid "Changed %s."
+msgstr ""
+
+#: contrib/admin/options.py:338 contrib/admin/options.py:348
+#: forms/models.py:275
+msgid "and"
+msgstr ""
+
+#: contrib/admin/options.py:343
+#, python-format
+msgid "Added %(name)s \"%(object)s\"."
+msgstr ""
+
+#: contrib/admin/options.py:347
+#, python-format
+msgid "Changed %(list)s for %(name)s \"%(object)s\"."
+msgstr ""
+
+#: contrib/admin/options.py:352
+#, python-format
+msgid "Deleted %(name)s \"%(object)s\"."
+msgstr ""
+
+#: contrib/admin/options.py:356
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/options.py:417 contrib/auth/admin.py:51
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/options.py:421 contrib/admin/options.py:454
+#: contrib/auth/admin.py:59
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/options.py:431 contrib/admin/options.py:464
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/options.py:452
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/options.py:460
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/options.py:536
+#, python-format
+msgid "Add %s"
+msgstr ""
+
+#: contrib/admin/options.py:614
+#, python-format
+msgid "Change %s"
+msgstr ""
+
+#: contrib/admin/options.py:646
+msgid "Database error"
+msgstr ""
+
+#: contrib/admin/options.py:696
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/options.py:703
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/options.py:732
+#, python-format
+msgid "Change history: %s"
+msgstr ""
+
+#: contrib/admin/sites.py:16 contrib/admin/views/decorators.py:14
+#: contrib/auth/forms.py:80
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+
+#: contrib/admin/sites.py:227 contrib/admin/views/decorators.py:40
+msgid "Please log in again, because your session has expired."
+msgstr ""
+
+#: contrib/admin/sites.py:234 contrib/admin/views/decorators.py:47
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+
+#: contrib/admin/sites.py:250 contrib/admin/sites.py:256
+#: contrib/admin/views/decorators.py:66
+msgid "Usernames cannot contain the '@' character."
+msgstr ""
+
+#: contrib/admin/sites.py:253 contrib/admin/views/decorators.py:62
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+
+#: contrib/admin/sites.py:313
+msgid "Site administration"
+msgstr ""
+
+#: contrib/admin/sites.py:326 contrib/admin/templates/admin/login.html:26
+#: contrib/admin/templates/registration/password_reset_complete.html:14
+#: contrib/admin/views/decorators.py:20
+msgid "Log in"
+msgstr ""
+
+#: contrib/admin/sites.py:373
+#, python-format
+msgid "%s administration"
+msgstr ""
+
+#: contrib/admin/util.py:138
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/util.py:143
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/widgets.py:70
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/widgets.py:70
+msgid "Time:"
+msgstr ""
+
+#: contrib/admin/widgets.py:94
+msgid "Currently:"
+msgstr ""
+
+#: contrib/admin/widgets.py:94
+msgid "Change:"
+msgstr ""
+
+#: contrib/admin/widgets.py:121
+msgid "Lookup"
+msgstr ""
+
+#: contrib/admin/widgets.py:228
+msgid "Add Another"
+msgstr ""
+
#: contrib/admin/templates/admin/404.html:4
#: contrib/admin/templates/admin/404.html:8
msgid "Page not found"
@@ -280,19 +453,22 @@ msgid "We're sorry, but the requested page could not be found."
msgstr ""
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:37
-#: contrib/admin/templates/admin/change_form.html:12
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/app_index.html:8
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/admin/templates/admin/change_form.html:17
+#: contrib/admin/templates/admin/change_list.html:8
+#: contrib/admin/templates/admin/delete_confirmation.html:6
#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:4
-#: contrib/admin/templates/admin/auth/user/change_password.html:11
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/admin/object_history.html:6
+#: contrib/admin/templates/admin/auth/user/change_password.html:10
#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/registration/password_reset_complete.html:4
+#: contrib/admin/templates/registration/password_reset_confirm.html:4
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Home"
msgstr ""
@@ -314,23 +490,34 @@ msgid ""
"mail and should be fixed shortly. Thanks for your patience."
msgstr ""
-#: contrib/admin/templates/admin/base.html:26
+#: contrib/admin/templates/admin/app_index.html:10
+#: contrib/admin/templates/admin/index.html:19
+#, python-format
+msgid "%(name)s"
+msgstr ""
+
+#: contrib/admin/templates/admin/base.html:25
msgid "Welcome,"
msgstr ""
-#: contrib/admin/templates/admin/base.html:28
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr ""
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:45
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/admin/auth/user/change_password.html:13
+#: contrib/admin/templates/admin/auth/user/change_password.html:46
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Change password"
msgstr ""
-#: contrib/admin/templates/admin/base.html:30
-#: contrib/comments/templates/comments/form.html:6
+#: contrib/admin/templates/admin/base.html:25
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
msgstr ""
@@ -342,46 +529,44 @@ msgstr ""
msgid "Django administration"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/admin/index.html:28
+#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/index.html:29
msgid "Add"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/change_form.html:27
+#: contrib/admin/templates/admin/object_history.html:10
msgid "History"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:21
+#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/edit_inline/stacked.html:13
+#: contrib/admin/templates/admin/edit_inline/tabular.html:25
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:31
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:38
+#: contrib/admin/templates/admin/auth/user/change_password.html:22
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:49
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:52
-msgid "Order:"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_list.html:11
+#: contrib/admin/templates/admin/change_list.html:16
#, python-format
msgid "Add %(name)s"
msgstr ""
-#: contrib/admin/templates/admin/delete_confirmation.html:8
-#: contrib/admin/templates/admin/submit_line.html:3
+#: contrib/admin/templates/admin/change_list.html:26
+msgid "Filter"
+msgstr ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:10
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:246
msgid "Delete"
msgstr ""
-#: contrib/admin/templates/admin/delete_confirmation.html:13
+#: contrib/admin/templates/admin/delete_confirmation.html:16
#, python-format
msgid ""
"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -389,14 +574,14 @@ msgid ""
"following types of objects:"
msgstr ""
-#: contrib/admin/templates/admin/delete_confirmation.html:20
+#: contrib/admin/templates/admin/delete_confirmation.html:23
#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
"All of the following related items will be deleted:"
msgstr ""
-#: contrib/admin/templates/admin/delete_confirmation.html:25
+#: contrib/admin/templates/admin/delete_confirmation.html:28
msgid "Yes, I'm sure"
msgstr ""
@@ -405,80 +590,64 @@ msgstr ""
msgid " By %(filter_title)s "
msgstr ""
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:17
-#, python-format
-msgid "Models available in the %(name)s application."
-msgstr ""
-
#: contrib/admin/templates/admin/index.html:18
#, python-format
-msgid "%(name)s"
+msgid "Models available in the %(name)s application."
msgstr ""
-#: contrib/admin/templates/admin/index.html:34
+#: contrib/admin/templates/admin/index.html:35
msgid "Change"
msgstr ""
-#: contrib/admin/templates/admin/index.html:44
+#: contrib/admin/templates/admin/index.html:45
msgid "You don't have permission to edit anything."
msgstr ""
-#: contrib/admin/templates/admin/index.html:52
+#: contrib/admin/templates/admin/index.html:53
msgid "Recent Actions"
msgstr ""
-#: contrib/admin/templates/admin/index.html:53
+#: contrib/admin/templates/admin/index.html:54
msgid "My Actions"
msgstr ""
-#: contrib/admin/templates/admin/index.html:57
+#: contrib/admin/templates/admin/index.html:58
msgid "None available"
msgstr ""
-#: contrib/admin/templates/admin/invalid_setup.html:8
+#: contrib/admin/templates/admin/invalid_setup.html:7
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 ""
-#: contrib/admin/templates/admin/login.html:17
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:19
msgid "Username:"
msgstr ""
-#: contrib/admin/templates/admin/login.html:20
-#: contrib/comments/templates/comments/form.html:8
+#: contrib/admin/templates/admin/login.html:22
msgid "Password:"
msgstr ""
-#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:25
-msgid "Log in"
-msgstr ""
-
-#: contrib/admin/templates/admin/object_history.html:17
+#: contrib/admin/templates/admin/object_history.html:22
msgid "Date/time"
msgstr ""
-#: contrib/admin/templates/admin/object_history.html:18
+#: contrib/admin/templates/admin/object_history.html:23
msgid "User"
msgstr ""
-#: contrib/admin/templates/admin/object_history.html:19
+#: contrib/admin/templates/admin/object_history.html:24
msgid "Action"
msgstr ""
-#: contrib/admin/templates/admin/object_history.html:25
-msgid "DATE_WITH_TIME_FULL"
+#: contrib/admin/templates/admin/object_history.html:30
+#: utils/translation/trans_real.py:404
+msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: contrib/admin/templates/admin/object_history.html:35
+#: contrib/admin/templates/admin/object_history.html:38
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
@@ -504,20 +673,20 @@ msgstr[1] ""
msgid "%(full_result_count)s total"
msgstr ""
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Save"
msgstr ""
#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
+msgid "Save as new"
msgstr ""
#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
+msgid "Save and add another"
msgstr ""
#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
+msgid "Save and continue editing"
msgstr ""
#: contrib/admin/templates/admin/auth/user/add_form.html:6
@@ -526,83 +695,35 @@ msgid ""
"options."
msgstr ""
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
+#: contrib/admin/templates/admin/auth/user/add_form.html:13
+#: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59
msgid "Username"
msgstr ""
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/add_form.html:20
#: contrib/admin/templates/admin/auth/user/change_password.html:33
+#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:184
msgid "Password"
msgstr ""
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:38
+#: contrib/admin/templates/admin/auth/user/add_form.html:26
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/auth/forms.py:185
msgid "Password (again)"
msgstr ""
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
+#: contrib/admin/templates/admin/auth/user/add_form.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:40
msgid "Enter the same password as above, for verification."
msgstr ""
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:26
#, python-format
msgid "Enter a new password for the user <strong>%(username)s</strong>."
msgstr ""
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-msgid "Documentation bookmarklets"
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:8
-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"
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:18
-msgid "Documentation for this page"
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:21
-msgid "Show object ID"
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:24
-msgid "Edit this object (current window)"
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:27
-msgid "Edit this object (new window)"
-msgstr ""
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "As above, but opens the admin page in a new window."
+#: contrib/admin/templates/admin/edit_inline/tabular.html:15
+msgid "Delete?"
msgstr ""
#: contrib/admin/templates/registration/logged_out.html:8
@@ -613,44 +734,49 @@ msgstr ""
msgid "Log in again"
msgstr ""
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_form.html:5
-#: contrib/admin/templates/registration/password_change_form.html:9
+#: 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 ""
-#: contrib/admin/templates/registration/password_change_done.html:5
-#: contrib/admin/templates/registration/password_change_done.html:9
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
msgstr ""
-#: contrib/admin/templates/registration/password_change_done.html:11
+#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
msgstr ""
-#: contrib/admin/templates/registration/password_change_form.html:11
+#: 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."
msgstr ""
-#: contrib/admin/templates/registration/password_change_form.html:16
+#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
msgstr ""
-#: contrib/admin/templates/registration/password_change_form.html:18
+#: contrib/admin/templates/registration/password_change_form.html:19
+#: contrib/admin/templates/registration/password_reset_confirm.html:18
msgid "New password:"
msgstr ""
-#: contrib/admin/templates/registration/password_change_form.html:20
+#: contrib/admin/templates/registration/password_change_form.html:21
+#: contrib/admin/templates/registration/password_reset_confirm.html:20
msgid "Confirm password:"
msgstr ""
-#: contrib/admin/templates/registration/password_change_form.html:22
+#: contrib/admin/templates/registration/password_change_form.html:23
+#: contrib/admin/templates/registration/password_reset_confirm.html:21
msgid "Change my password"
msgstr ""
+#: contrib/admin/templates/registration/password_reset_complete.html:4
+#: contrib/admin/templates/registration/password_reset_confirm.html:6
#: contrib/admin/templates/registration/password_reset_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/password_reset_form.html:6
@@ -658,6 +784,39 @@ msgstr ""
msgid "Password reset"
msgstr ""
+#: contrib/admin/templates/registration/password_reset_complete.html:6
+#: contrib/admin/templates/registration/password_reset_complete.html:10
+msgid "Password reset complete"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_complete.html:12
+msgid "Your password has been set. You may go ahead and log in now."
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:4
+msgid "Password reset confirmation"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:12
+msgid "Enter new password"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:14
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:26
+msgid "Password reset unsuccessful"
+msgstr ""
+
+#: contrib/admin/templates/registration/password_reset_confirm.html:28
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used. Please request a new password reset."
+msgstr ""
+
#: contrib/admin/templates/registration/password_reset_done.html:6
#: contrib/admin/templates/registration/password_reset_done.html:10
msgid "Password reset successful"
@@ -665,8 +824,8 @@ msgstr ""
#: contrib/admin/templates/registration/password_reset_done.html:12
msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
+"We've e-mailed you instructions for setting your password to the e-mail "
+"address you submitted. You should be receiving it shortly."
msgstr ""
#: contrib/admin/templates/registration/password_reset_email.html:2
@@ -679,31 +838,26 @@ msgid "for your user account at %(site_name)s"
msgstr ""
#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
-msgid "Your new password is: %(new_password)s"
+msgid "Please go to the following page and choose a new password:"
msgstr ""
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr ""
-
-#: contrib/admin/templates/registration/password_reset_email.html:11
+#: contrib/admin/templates/registration/password_reset_email.html:9
msgid "Your username, in case you've forgotten:"
msgstr ""
-#: contrib/admin/templates/registration/password_reset_email.html:13
+#: contrib/admin/templates/registration/password_reset_email.html:11
msgid "Thanks for using our site!"
msgstr ""
-#: contrib/admin/templates/registration/password_reset_email.html:15
+#: contrib/admin/templates/registration/password_reset_email.html:13
#, python-format
msgid "The %(site_name)s team"
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."
+"Forgotten your password? Enter your e-mail address below, and we'll e-mail "
+"instructions for setting a new one."
msgstr ""
#: contrib/admin/templates/registration/password_reset_form.html:16
@@ -714,795 +868,585 @@ msgstr ""
msgid "Reset my password"
msgstr ""
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr ""
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr ""
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr ""
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr ""
-
-#: contrib/admin/templatetags/admin_list.py:257
+#: contrib/admin/templatetags/admin_list.py:288
msgid "All dates"
msgstr ""
-#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
+#: contrib/admin/views/main.py:69
#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
-
-#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
-#: contrib/admin/views/main.py:356
-msgid "You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr ""
-
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
+msgid "Select %s"
msgstr ""
-#: contrib/admin/views/auth.py:65
+#: contrib/admin/views/main.py:69
#, python-format
-msgid "Change password: %s"
-msgstr ""
-
-#: contrib/admin/views/decorators.py:11 contrib/auth/forms.py:60
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-
-#: contrib/admin/views/decorators.py:63
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-
-#: contrib/admin/views/decorators.py:70
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
+msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/decorators.py:84
-msgid "Usernames cannot contain the '@' character."
+#: contrib/admin/views/template.py:36 contrib/sites/models.py:38
+msgid "site"
msgstr ""
-#: contrib/admin/views/decorators.py:86
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
+#: contrib/admin/views/template.py:38
+msgid "template"
msgstr ""
-#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
-#: contrib/admin/views/doc.py:52
+#: contrib/admindocs/views.py:57 contrib/admindocs/views.py:59
+#: contrib/admindocs/views.py:61
msgid "tag:"
msgstr ""
-#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
-#: contrib/admin/views/doc.py:83
+#: contrib/admindocs/views.py:90 contrib/admindocs/views.py:92
+#: contrib/admindocs/views.py:94
msgid "filter:"
msgstr ""
-#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
-#: contrib/admin/views/doc.py:141
+#: contrib/admindocs/views.py:154 contrib/admindocs/views.py:156
+#: contrib/admindocs/views.py:158
msgid "view:"
msgstr ""
-#: contrib/admin/views/doc.py:166
+#: contrib/admindocs/views.py:186
#, python-format
msgid "App %r not found"
msgstr ""
-#: contrib/admin/views/doc.py:173
+#: contrib/admindocs/views.py:193
#, python-format
-msgid "Model %(name)r not found in app %(label)r"
+msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr ""
-#: contrib/admin/views/doc.py:185
+#: contrib/admindocs/views.py:205
#, python-format
-msgid "the related `%(label)s.%(type)s` object"
+msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr ""
-#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
-#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:205 contrib/admindocs/views.py:227
+#: contrib/admindocs/views.py:241 contrib/admindocs/views.py:246
msgid "model:"
msgstr ""
-#: contrib/admin/views/doc.py:216
+#: contrib/admindocs/views.py:236
#, python-format
-msgid "related `%(label)s.%(name)s` objects"
+msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr ""
-#: contrib/admin/views/doc.py:221
+#: contrib/admindocs/views.py:241
#, python-format
msgid "all %s"
msgstr ""
-#: contrib/admin/views/doc.py:226
+#: contrib/admindocs/views.py:246
#, python-format
msgid "number of %s"
msgstr ""
-#: contrib/admin/views/doc.py:231
+#: contrib/admindocs/views.py:251
#, python-format
msgid "Fields on %s objects"
msgstr ""
-#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
-#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
-#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
+#: contrib/admindocs/views.py:314 contrib/admindocs/views.py:325
+#: contrib/admindocs/views.py:327 contrib/admindocs/views.py:333
+#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:336
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:294
+#: contrib/admindocs/views.py:315
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
+#: contrib/admindocs/views.py:316 contrib/admindocs/views.py:335
#, python-format
msgid "String (up to %(max_length)s)"
msgstr ""
-#: contrib/admin/views/doc.py:296
+#: contrib/admindocs/views.py:317
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:297
+#: contrib/admindocs/views.py:318
msgid "Date (without time)"
msgstr ""
-#: contrib/admin/views/doc.py:298
+#: contrib/admindocs/views.py:319
msgid "Date (with time)"
msgstr ""
-#: contrib/admin/views/doc.py:299
+#: contrib/admindocs/views.py:320
msgid "Decimal number"
msgstr ""
-#: contrib/admin/views/doc.py:300
+#: contrib/admindocs/views.py:321
msgid "E-mail address"
msgstr ""
-#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
-#: contrib/admin/views/doc.py:305
+#: contrib/admindocs/views.py:322 contrib/admindocs/views.py:323
+#: contrib/admindocs/views.py:326
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:303
+#: contrib/admindocs/views.py:324
msgid "Floating point number"
msgstr ""
-#: contrib/admin/views/doc.py:307 contrib/comments/models.py:85
+#: contrib/admindocs/views.py:328 contrib/comments/models.py:58
msgid "IP address"
msgstr ""
-#: contrib/admin/views/doc.py:309
+#: contrib/admindocs/views.py:330
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:310
+#: contrib/admindocs/views.py:331
msgid "Relation to parent model"
msgstr ""
-#: contrib/admin/views/doc.py:311
+#: contrib/admindocs/views.py:332
msgid "Phone number"
msgstr ""
-#: contrib/admin/views/doc.py:316
+#: contrib/admindocs/views.py:337
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:317
+#: contrib/admindocs/views.py:338
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7
+#: contrib/admindocs/views.py:339 contrib/comments/forms.py:22
+#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr ""
-#: contrib/admin/views/doc.py:319
+#: contrib/admindocs/views.py:340
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:320
+#: contrib/admindocs/views.py:341
msgid "XML text"
msgstr ""
-#: contrib/admin/views/doc.py:346
+#: contrib/admindocs/views.py:367
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr ""
-#: contrib/admin/views/main.py:233
-msgid "Site administration"
-msgstr ""
-
-#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
-#, python-format
-msgid "You may add another %s below."
-msgstr ""
-
-#: contrib/admin/views/main.py:298
-#, python-format
-msgid "Add %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Added %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
-#: contrib/admin/views/main.py:348 core/validators.py:283
-#: db/models/manipulators.py:309
-msgid "and"
-msgstr ""
-
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Changed %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:348
-#, python-format
-msgid "Deleted %s."
-msgstr ""
-
-#: contrib/admin/views/main.py:351
-msgid "No fields changed."
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
msgstr ""
-#: contrib/admin/views/main.py:354
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:4
+msgid "Documentation bookmarklets"
msgstr ""
-#: contrib/admin/views/main.py:362
-#, python-format
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:8
msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-
-#: contrib/admin/views/main.py:400
-#, python-format
-msgid "Change %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:487
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr ""
-
-#: contrib/admin/views/main.py:492
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr ""
-
-#: contrib/admin/views/main.py:524
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
-
-#: contrib/admin/views/main.py:527
-msgid "Are you sure?"
-msgstr ""
-
-#: contrib/admin/views/main.py:549
-#, python-format
-msgid "Change history: %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s"
-msgstr ""
-
-#: contrib/admin/views/main.py:583
-#, python-format
-msgid "Select %s to change"
+"\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 ""
-#: contrib/admin/views/main.py:784
-msgid "Database error"
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:18
+msgid "Documentation for this page"
msgstr ""
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:138
-msgid "The two password fields didn't match."
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:19
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
msgstr ""
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:21
+msgid "Show object ID"
msgstr ""
-#: contrib/auth/forms.py:53
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:22
msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
msgstr ""
-#: contrib/auth/forms.py:84
-msgid ""
-"That e-mail address doesn't have an associated user account. Are you sure "
-"you've registered?"
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:24
+msgid "Edit this object (current window)"
msgstr ""
-#: contrib/auth/forms.py:107
-#, python-format
-msgid "Password reset on %s"
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:25
+msgid "Jumps to the admin page for pages that represent a single object."
msgstr ""
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:27
+msgid "Edit this object (new window)"
msgstr ""
-#: contrib/auth/forms.py:124
-msgid "Your old password was entered incorrectly. Please enter it again."
+#: contrib/admindocs/templates/admin_doc/bookmarklets.html:28
+msgid "As above, but opens the admin page in a new window."
msgstr ""
-#: contrib/auth/models.py:73 contrib/auth/models.py:93
-msgid "name"
+#: contrib/auth/admin.py:21
+msgid "Personal info"
msgstr ""
-#: contrib/auth/models.py:75
-msgid "codename"
+#: contrib/auth/admin.py:22
+msgid "Permissions"
msgstr ""
-#: contrib/auth/models.py:78
-msgid "permission"
+#: contrib/auth/admin.py:23
+msgid "Important dates"
msgstr ""
-#: contrib/auth/models.py:79 contrib/auth/models.py:94
-msgid "permissions"
+#: contrib/auth/admin.py:24
+msgid "Groups"
msgstr ""
-#: contrib/auth/models.py:97
-msgid "group"
+#: contrib/auth/admin.py:64
+msgid "Add user"
msgstr ""
-#: contrib/auth/models.py:98 contrib/auth/models.py:141
-msgid "groups"
+#: contrib/auth/admin.py:90
+msgid "Password changed successfully."
msgstr ""
-#: contrib/auth/models.py:131
-msgid "username"
+#: contrib/auth/admin.py:96
+#, python-format
+msgid "Change password: %s"
msgstr ""
-#: contrib/auth/models.py:131
+#: contrib/auth/forms.py:15 contrib/auth/forms.py:48
+#: contrib/auth/models.py:136
msgid ""
"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
"digits and underscores)."
msgstr ""
-#: contrib/auth/models.py:132
-msgid "first name"
-msgstr ""
-
-#: contrib/auth/models.py:133
-msgid "last name"
-msgstr ""
-
-#: contrib/auth/models.py:134
-msgid "e-mail address"
-msgstr ""
-
-#: contrib/auth/models.py:135
-msgid "password"
-msgstr ""
-
-#: contrib/auth/models.py:135
-msgid ""
-"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
-"password form</a>."
-msgstr ""
-
-#: contrib/auth/models.py:136
-msgid "staff status"
+#: contrib/auth/forms.py:16 contrib/auth/forms.py:49
+msgid "This value must contain only letters, numbers and underscores."
msgstr ""
-#: contrib/auth/models.py:136
-msgid "Designates whether the user can log into this admin site."
+#: contrib/auth/forms.py:18
+msgid "Password confirmation"
msgstr ""
-#: contrib/auth/models.py:137
-msgid "active"
+#: contrib/auth/forms.py:30
+msgid "A user with that username already exists."
msgstr ""
-#: contrib/auth/models.py:137
-msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
-"instead of deleting accounts."
+#: contrib/auth/forms.py:36 contrib/auth/forms.py:154
+#: contrib/auth/forms.py:196
+msgid "The two password fields didn't match."
msgstr ""
-#: contrib/auth/models.py:138
-msgid "superuser status"
+#: contrib/auth/forms.py:82
+msgid "This account is inactive."
msgstr ""
-#: contrib/auth/models.py:138
+#: contrib/auth/forms.py:87
msgid ""
-"Designates that this user has all permissions without explicitly assigning "
-"them."
-msgstr ""
-
-#: contrib/auth/models.py:139
-msgid "last login"
+"Your Web browser doesn't appear to have cookies enabled. Cookies are "
+"required for logging in."
msgstr ""
-#: contrib/auth/models.py:140
-msgid "date joined"
+#: contrib/auth/forms.py:100
+msgid "E-mail"
msgstr ""
-#: contrib/auth/models.py:142
+#: contrib/auth/forms.py:109
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/auth/models.py:143
-msgid "user permissions"
-msgstr ""
-
-#: contrib/auth/models.py:147
-msgid "user"
-msgstr ""
-
-#: contrib/auth/models.py:148
-msgid "users"
-msgstr ""
-
-#: contrib/auth/models.py:154
-msgid "Personal info"
-msgstr ""
-
-#: contrib/auth/models.py:155
-msgid "Permissions"
-msgstr ""
-
-#: contrib/auth/models.py:156
-msgid "Important dates"
-msgstr ""
-
-#: contrib/auth/models.py:157
-msgid "Groups"
-msgstr ""
-
-#: contrib/auth/models.py:316
-msgid "message"
-msgstr ""
-
-#: contrib/auth/views.py:47
-msgid "Logged out"
-msgstr ""
-
-#: contrib/comments/models.py:67 contrib/comments/models.py:169
-msgid "object ID"
-msgstr ""
-
-#: contrib/comments/models.py:68
-msgid "headline"
-msgstr ""
-
-#: contrib/comments/models.py:69 contrib/comments/models.py:90
-#: contrib/comments/models.py:170
-msgid "comment"
-msgstr ""
-
-#: contrib/comments/models.py:70
-msgid "rating #1"
-msgstr ""
-
-#: contrib/comments/models.py:71
-msgid "rating #2"
-msgstr ""
-
-#: contrib/comments/models.py:72
-msgid "rating #3"
-msgstr ""
-
-#: contrib/comments/models.py:73
-msgid "rating #4"
-msgstr ""
-
-#: contrib/comments/models.py:74
-msgid "rating #5"
-msgstr ""
-
-#: contrib/comments/models.py:75
-msgid "rating #6"
+"That e-mail address doesn't have an associated user account. Are you sure "
+"you've registered?"
msgstr ""
-#: contrib/comments/models.py:76
-msgid "rating #7"
+#: contrib/auth/forms.py:134
+#, python-format
+msgid "Password reset on %s"
msgstr ""
-#: contrib/comments/models.py:77
-msgid "rating #8"
+#: contrib/auth/forms.py:142
+msgid "New password"
msgstr ""
-#: contrib/comments/models.py:82
-msgid "is valid rating"
+#: contrib/auth/forms.py:143
+msgid "New password confirmation"
msgstr ""
-#: contrib/comments/models.py:83 contrib/comments/models.py:172
-msgid "date/time submitted"
+#: contrib/auth/forms.py:168
+msgid "Old password"
msgstr ""
-#: contrib/comments/models.py:84 contrib/comments/models.py:173
-msgid "is public"
+#: contrib/auth/forms.py:176
+msgid "Your old password was entered incorrectly. Please enter it again."
msgstr ""
-#: contrib/comments/models.py:86
-msgid "is removed"
+#: contrib/auth/models.py:72 contrib/auth/models.py:95
+msgid "name"
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."
+#: contrib/auth/models.py:74
+msgid "codename"
msgstr ""
-#: contrib/comments/models.py:91
-msgid "comments"
+#: contrib/auth/models.py:77
+msgid "permission"
msgstr ""
-#: contrib/comments/models.py:134 contrib/comments/models.py:213
-msgid "Content object"
+#: contrib/auth/models.py:78 contrib/auth/models.py:96
+msgid "permissions"
msgstr ""
-#: contrib/comments/models.py:162
-#, python-format
-msgid ""
-"Posted by %(user)s at %(date)s\n"
-"\n"
-"%(comment)s\n"
-"\n"
-"http://%(domain)s%(url)s"
+#: contrib/auth/models.py:99
+msgid "group"
msgstr ""
-#: contrib/comments/models.py:171
-msgid "person's name"
+#: contrib/auth/models.py:100 contrib/auth/models.py:146
+msgid "groups"
msgstr ""
-#: contrib/comments/models.py:174
-msgid "ip address"
+#: contrib/auth/models.py:136
+msgid "username"
msgstr ""
-#: contrib/comments/models.py:176
-msgid "approved by staff"
+#: contrib/auth/models.py:137
+msgid "first name"
msgstr ""
-#: contrib/comments/models.py:179
-msgid "free comment"
+#: contrib/auth/models.py:138
+msgid "last name"
msgstr ""
-#: contrib/comments/models.py:180
-msgid "free comments"
+#: contrib/auth/models.py:139
+msgid "e-mail address"
msgstr ""
-#: contrib/comments/models.py:239
-msgid "score"
+#: contrib/auth/models.py:140
+msgid "password"
msgstr ""
-#: contrib/comments/models.py:240
-msgid "score date"
+#: contrib/auth/models.py:140
+msgid ""
+"Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
+"password form</a>."
msgstr ""
-#: contrib/comments/models.py:243
-msgid "karma score"
+#: contrib/auth/models.py:141
+msgid "staff status"
msgstr ""
-#: contrib/comments/models.py:244
-msgid "karma scores"
+#: contrib/auth/models.py:141
+msgid "Designates whether the user can log into this admin site."
msgstr ""
-#: contrib/comments/models.py:248
-#, python-format
-msgid "%(score)d rating by %(user)s"
+#: contrib/auth/models.py:142
+msgid "active"
msgstr ""
-#: contrib/comments/models.py:264
-#, python-format
+#: contrib/auth/models.py:142
msgid ""
-"This comment was flagged by %(user)s:\n"
-"\n"
-"%(text)s"
+"Designates whether this user should be treated as active. Unselect this "
+"instead of deleting accounts."
msgstr ""
-#: contrib/comments/models.py:271
-msgid "flag date"
+#: contrib/auth/models.py:143
+msgid "superuser status"
msgstr ""
-#: contrib/comments/models.py:274
-msgid "user flag"
+#: contrib/auth/models.py:143
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
msgstr ""
-#: contrib/comments/models.py:275
-msgid "user flags"
+#: contrib/auth/models.py:144
+msgid "last login"
msgstr ""
-#: contrib/comments/models.py:279
-#, python-format
-msgid "Flag by %r"
+#: contrib/auth/models.py:145
+msgid "date joined"
msgstr ""
-#: contrib/comments/models.py:284
-msgid "deletion date"
+#: contrib/auth/models.py:147
+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/comments/models.py:286
-msgid "moderator deletion"
+#: contrib/auth/models.py:148
+msgid "user permissions"
msgstr ""
-#: contrib/comments/models.py:287
-msgid "moderator deletions"
+#: contrib/auth/models.py:152
+msgid "user"
msgstr ""
-#: contrib/comments/models.py:291
-#, python-format
-msgid "Moderator deletion by %r"
+#: contrib/auth/models.py:153
+msgid "users"
msgstr ""
-#: contrib/comments/templates/comments/form.html:8
-msgid "Forgotten your password?"
+#: contrib/auth/models.py:308
+msgid "message"
msgstr ""
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
+#: contrib/auth/views.py:50
+msgid "Logged out"
msgstr ""
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
+#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
+msgid "Enter a valid e-mail address."
msgstr ""
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
+#: contrib/comments/admin.py:11
+msgid "Content"
msgstr ""
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
+#: contrib/comments/admin.py:14
+msgid "Metadata"
msgstr ""
-#: contrib/comments/templates/comments/form.html:28
-#: contrib/comments/templates/comments/freeform.html:5
-msgid "Comment:"
+#: contrib/comments/forms.py:20
+msgid "Name"
msgstr ""
-#: contrib/comments/templates/comments/form.html:35
-#: contrib/comments/templates/comments/freeform.html:10
-msgid "Preview comment"
+#: contrib/comments/forms.py:21
+msgid "Email address"
msgstr ""
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
+#: contrib/comments/forms.py:23
+msgid "Comment"
msgstr ""
-#: contrib/comments/views/comments.py:28
+#: contrib/comments/forms.py:26
msgid ""
-"This rating is required because you've entered at least one other rating."
+"If you enter anything in this field your comment will be treated as spam"
msgstr ""
-#: contrib/comments/views/comments.py:112
+#: contrib/comments/forms.py:126
#, 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"
+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/comments/views/comments.py:117
-#, python-format
-msgid ""
-"This comment was posted by a sketchy user:\n"
-"\n"
-"%(text)s"
+#: contrib/comments/models.py:23
+msgid "object ID"
+msgstr ""
+
+#: contrib/comments/models.py:50
+msgid "user's name"
+msgstr ""
+
+#: contrib/comments/models.py:51
+msgid "user's email address"
+msgstr ""
+
+#: contrib/comments/models.py:52
+msgid "user's URL"
msgstr ""
-#: contrib/comments/views/comments.py:190
-#: contrib/comments/views/comments.py:283
-msgid "Only POSTs are allowed"
+#: contrib/comments/models.py:54
+msgid "comment"
msgstr ""
-#: contrib/comments/views/comments.py:194
-#: contrib/comments/views/comments.py:287
-msgid "One or more of the required fields wasn't submitted"
+#: contrib/comments/models.py:57
+msgid "date/time submitted"
msgstr ""
-#: contrib/comments/views/comments.py:198
-#: contrib/comments/views/comments.py:289
-msgid "Somebody tampered with the comment form (security violation)"
+#: contrib/comments/models.py:59
+msgid "is public"
msgstr ""
-#: contrib/comments/views/comments.py:208
-#: contrib/comments/views/comments.py:295
+#: contrib/comments/models.py:60
msgid ""
-"The comment form had an invalid 'target' parameter -- the object ID was "
-"invalid"
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr ""
+
+#: contrib/comments/models.py:62
+msgid "is removed"
msgstr ""
-#: contrib/comments/views/comments.py:259
-#: contrib/comments/views/comments.py:324
-msgid "The comment form didn't provide either 'preview' or 'post'"
+#: contrib/comments/models.py:63
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
msgstr ""
-#: contrib/comments/views/karma.py:21
-msgid "Anonymous users cannot vote"
+#: contrib/comments/models.py:115
+msgid ""
+"This comment was posted by an authenticated user and thus the name is read-"
+"only."
msgstr ""
-#: contrib/comments/views/karma.py:25
-msgid "Invalid comment ID"
+#: contrib/comments/models.py:124
+msgid ""
+"This comment was posted by an authenticated user and thus the email is read-"
+"only."
msgstr ""
-#: contrib/comments/views/karma.py:27
-msgid "No voting for yourself"
+#: contrib/comments/models.py:149
+#, python-format
+msgid ""
+"Posted by %(user)s at %(date)s\n"
+"\n"
+"%(comment)s\n"
+"\n"
+"http://%(domain)s%(url)s"
msgstr ""
-#: contrib/contenttypes/models.py:37
+#: contrib/contenttypes/models.py:67
msgid "python model class name"
msgstr ""
-#: contrib/contenttypes/models.py:40
+#: contrib/contenttypes/models.py:71
msgid "content type"
msgstr ""
-#: contrib/contenttypes/models.py:41
+#: contrib/contenttypes/models.py:72
msgid "content types"
msgstr ""
-#: contrib/flatpages/models.py:8
+#: contrib/flatpages/admin.py:9
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
-#: contrib/flatpages/models.py:9
+#: contrib/flatpages/admin.py:11
+msgid ""
+"This value must contain only letters, numbers, underscores, dashes or "
+"slashes."
+msgstr ""
+
+#: contrib/flatpages/admin.py:22
+msgid "Advanced options"
+msgstr ""
+
+#: contrib/flatpages/models.py:8
msgid "title"
msgstr ""
-#: contrib/flatpages/models.py:10
+#: contrib/flatpages/models.py:9
msgid "content"
msgstr ""
-#: contrib/flatpages/models.py:11
+#: contrib/flatpages/models.py:10
msgid "enable comments"
msgstr ""
-#: contrib/flatpages/models.py:12
+#: contrib/flatpages/models.py:11
msgid "template name"
msgstr ""
-#: contrib/flatpages/models.py:13
+#: contrib/flatpages/models.py:12
msgid ""
"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
"will use 'flatpages/default.html'."
msgstr ""
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:13
msgid "registration required"
msgstr ""
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:13
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
@@ -1514,152 +1458,216 @@ msgstr ""
msgid "flat pages"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/formtools/wizard.py:130
+msgid ""
+"We apologize, but your form has expired. Please continue filling out the "
+"form from this page."
+msgstr ""
+
+#: contrib/gis/forms/fields.py:14
+msgid "No geometry value provided."
+msgstr ""
+
+#: contrib/gis/forms/fields.py:15
+msgid "Invalid geometry value."
+msgstr ""
+
+#: contrib/gis/forms/fields.py:16
+msgid "Invalid geometry type."
+msgstr ""
+
+#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "st"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "nd"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "rd"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:52
+#: contrib/humanize/templatetags/humanize.py:51
#, python-format
msgid "%(value).1f million"
msgid_plural "%(value).1f million"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:55
+#: contrib/humanize/templatetags/humanize.py:54
#, python-format
msgid "%(value).1f billion"
msgid_plural "%(value).1f billion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:58
+#: contrib/humanize/templatetags/humanize.py:57
#, python-format
msgid "%(value).1f trillion"
msgid_plural "%(value).1f trillion"
msgstr[0] ""
msgstr[1] ""
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "one"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "two"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "three"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "four"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "five"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "six"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "seven"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "eight"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "nine"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:94
+#: contrib/humanize/templatetags/humanize.py:93
msgid "today"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:96
+#: contrib/humanize/templatetags/humanize.py:95
msgid "tomorrow"
msgstr ""
-#: contrib/humanize/templatetags/humanize.py:98
+#: contrib/humanize/templatetags/humanize.py:97
msgid "yesterday"
msgstr ""
-#: contrib/localflavor/ar/forms.py:30 contrib/localflavor/ar/forms.py:38
+#: contrib/localflavor/ar/forms.py:27
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
msgstr ""
-#: contrib/localflavor/ar/forms.py:61 contrib/localflavor/br/forms.py:103
-#: contrib/localflavor/pe/forms.py:34 contrib/localflavor/pe/forms.py:57
+#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
+#: contrib/localflavor/pe/forms.py:51
msgid "This field requires only numbers."
msgstr ""
-#: contrib/localflavor/ar/forms.py:64
+#: contrib/localflavor/ar/forms.py:50
msgid "This field requires 7 or 8 digits."
msgstr ""
-#: contrib/localflavor/ar/forms.py:75
+#: contrib/localflavor/ar/forms.py:79
msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
msgstr ""
-#: contrib/localflavor/ar/forms.py:88
+#: contrib/localflavor/ar/forms.py:80
msgid "Invalid CUIT."
msgstr ""
-#: contrib/localflavor/au/forms.py:18
+#: contrib/localflavor/at/at_states.py:5
+msgid "Burgenland"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:6
+msgid "Carinthia"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:7
+msgid "Lower Austria"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:8
+msgid "Upper Austria"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:9
+msgid "Salzburg"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:10
+msgid "Styria"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:11
+msgid "Tyrol"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:12
+msgid "Vorarlberg"
+msgstr ""
+
+#: contrib/localflavor/at/at_states.py:13
+msgid "Vienna"
+msgstr ""
+
+#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16
+#: contrib/localflavor/no/forms.py:12
+msgid "Enter a zip code in the format XXXX."
+msgstr ""
+
+#: contrib/localflavor/at/forms.py:48
+msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
+msgstr ""
+
+#: contrib/localflavor/au/forms.py:16
msgid "Enter a 4 digit post code."
msgstr ""
-#: contrib/localflavor/br/forms.py:23
+#: contrib/localflavor/br/forms.py:21
msgid "Enter a zip code in the format XXXXX-XXX."
msgstr ""
-#: contrib/localflavor/br/forms.py:35
+#: contrib/localflavor/br/forms.py:30
msgid "Phone numbers must be in XX-XXXX-XXXX format."
msgstr ""
-#: contrib/localflavor/br/forms.py:68
+#: contrib/localflavor/br/forms.py:58
msgid ""
"Select a valid brazilian state. That state is not one of the available "
"states."