From 55aae4b86319cb95f6fab6dddbb1bd94e7f1994c Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Sat, 15 Dec 2012 23:27:55 +0100 Subject: [PATCH] Updated translation catalog for contrib.auth --- .../auth/locale/en/LC_MESSAGES/django.po | 163 +++++++++--------- 1 file changed, 82 insertions(+), 81 deletions(-) diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po index 9b0cab8372..224dc4ac22 100644 --- a/django/contrib/auth/locale/en/LC_MESSAGES/django.po +++ b/django/contrib/auth/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-15 10:56+0200\n" +"POT-Creation-Date: 2012-12-15 23:27+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -34,102 +34,103 @@ msgstr "" msgid "Change password: %s" msgstr "" -#: forms.py:31 tests/forms.py:249 tests/forms.py:254 +#: forms.py:31 tests/forms.py:251 tests/forms.py:256 tests/forms.py:384 msgid "No password set." msgstr "" -#: forms.py:37 tests/forms.py:259 tests/forms.py:265 +#: forms.py:37 tests/forms.py:261 tests/forms.py:267 msgid "Invalid password format or unknown hashing algorithm." msgstr "" -#: forms.py:65 +#: forms.py:67 msgid "A user with that username already exists." msgstr "" -#: forms.py:66 forms.py:257 forms.py:317 +#: forms.py:68 forms.py:269 forms.py:329 msgid "The two password fields didn't match." msgstr "" -#: forms.py:68 forms.py:113 +#: forms.py:70 forms.py:115 msgid "Username" msgstr "" -#: forms.py:70 forms.py:114 +#: forms.py:72 forms.py:116 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" -#: forms.py:73 forms.py:117 +#: forms.py:75 forms.py:119 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" -#: forms.py:75 forms.py:119 forms.py:140 forms.py:319 +#: forms.py:77 forms.py:121 forms.py:148 forms.py:331 msgid "Password" msgstr "" -#: forms.py:77 +#: forms.py:79 msgid "Password confirmation" msgstr "" -#: forms.py:79 +#: forms.py:81 msgid "Enter the same password as above, for verification." msgstr "" -#: forms.py:120 +#: forms.py:122 msgid "" "Raw passwords are not stored, so there is no way to see this user's " "password, but you can change the password using this " "form." msgstr "" -#: forms.py:143 +#: forms.py:151 +#, python-format msgid "" -"Please enter a correct username and password. Note that both fields are case-" -"sensitive." +"Please enter a correct %(username)s and password. Note that both fields may " +"be case-sensitive." msgstr "" -#: forms.py:145 +#: forms.py:153 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -#: forms.py:147 +#: forms.py:155 msgid "This account is inactive." msgstr "" -#: forms.py:196 +#: forms.py:206 msgid "" "That email address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:198 tests/forms.py:347 +#: forms.py:208 tests/forms.py:374 msgid "" "The user account associated with this email address cannot reset the " "password." msgstr "" -#: forms.py:201 +#: forms.py:211 msgid "Email" msgstr "" -#: forms.py:259 +#: forms.py:271 msgid "New password" msgstr "" -#: forms.py:261 +#: forms.py:273 msgid "New password confirmation" msgstr "" -#: forms.py:290 +#: forms.py:302 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:293 +#: forms.py:305 msgid "Old password" msgstr "" -#: forms.py:321 +#: forms.py:333 msgid "Password (again)" msgstr "" @@ -178,94 +179,94 @@ msgstr "" msgid "group" msgstr "" -#: models.py:129 models.py:317 +#: models.py:129 models.py:301 msgid "groups" msgstr "" -#: models.py:232 +#: models.py:200 msgid "password" msgstr "" -#: models.py:233 +#: models.py:201 msgid "last login" msgstr "" #: models.py:298 -msgid "username" -msgstr "" - -#: models.py:299 -msgid "" -"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" -msgstr "" - -#: models.py:302 -msgid "Enter a valid username." -msgstr "" - -#: models.py:304 -msgid "first name" -msgstr "" - -#: models.py:305 -msgid "last name" -msgstr "" - -#: models.py:306 -msgid "email address" -msgstr "" - -#: models.py:307 -msgid "staff status" -msgstr "" - -#: models.py:308 -msgid "Designates whether the user can log into this admin site." -msgstr "" - -#: models.py:310 -msgid "active" -msgstr "" - -#: models.py:311 -msgid "" -"Designates whether this user should be treated as active. Unselect this " -"instead of deleting accounts." -msgstr "" - -#: models.py:313 msgid "superuser status" msgstr "" -#: models.py:314 +#: models.py:299 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:316 -msgid "date joined" -msgstr "" - -#: models.py:318 +#: models.py:302 msgid "" "The groups this user belongs to. A user will get all permissions granted to " "each of his/her group." msgstr "" -#: models.py:322 +#: models.py:306 msgid "user permissions" msgstr "" -#: models.py:331 +#: models.py:377 +msgid "username" +msgstr "" + +#: models.py:378 +msgid "" +"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" +msgstr "" + +#: models.py:381 +msgid "Enter a valid username." +msgstr "" + +#: models.py:383 +msgid "first name" +msgstr "" + +#: models.py:384 +msgid "last name" +msgstr "" + +#: models.py:385 +msgid "email address" +msgstr "" + +#: models.py:386 +msgid "staff status" +msgstr "" + +#: models.py:387 +msgid "Designates whether the user can log into this admin site." +msgstr "" + +#: models.py:389 +msgid "active" +msgstr "" + +#: models.py:390 +msgid "" +"Designates whether this user should be treated as active. Unselect this " +"instead of deleting accounts." +msgstr "" + +#: models.py:392 +msgid "date joined" +msgstr "" + +#: models.py:400 msgid "user" msgstr "" -#: models.py:332 +#: models.py:401 msgid "users" msgstr "" -#: views.py:97 +#: views.py:94 msgid "Logged out" msgstr ""