diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.mo b/django/contrib/auth/locale/en/LC_MESSAGES/django.mo index eac39ae891..365af68d0d 100644 Binary files a/django/contrib/auth/locale/en/LC_MESSAGES/django.mo and b/django/contrib/auth/locale/en/LC_MESSAGES/django.mo differ diff --git a/django/contrib/auth/locale/en/LC_MESSAGES/django.po b/django/contrib/auth/locale/en/LC_MESSAGES/django.po index 8018bf8e57..58bbbc6f04 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: 2011-12-22 23:56+0100\n" +"POT-Creation-Date: 2012-03-05 02:25+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,229 +13,243 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:38 +#: admin.py:41 msgid "Personal info" msgstr "" -#: admin.py:39 +#: admin.py:42 msgid "Permissions" msgstr "" -#: admin.py:40 +#: admin.py:44 msgid "Important dates" msgstr "" -#: admin.py:41 -msgid "Groups" -msgstr "" - -#: admin.py:116 +#: admin.py:125 msgid "Password changed successfully." msgstr "" -#: admin.py:126 +#: admin.py:135 #, python-format msgid "Change password: %s" msgstr "" -#: forms.py:37 -msgid "Hash type" -msgstr "" - -#: forms.py:39 -msgid "Masked hash" -msgstr "" - -#: forms.py:57 +#: forms.py:58 msgid "A user with that username already exists." msgstr "" -#: forms.py:58 forms.py:229 forms.py:279 +#: forms.py:59 forms.py:247 forms.py:304 msgid "The two password fields didn't match." msgstr "" -#: forms.py:60 forms.py:97 forms.py:120 +#: forms.py:61 forms.py:106 forms.py:135 msgid "Username" msgstr "" -#: forms.py:61 forms.py:98 +#: forms.py:63 forms.py:107 msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only." msgstr "" -#: forms.py:62 forms.py:99 +#: forms.py:66 forms.py:110 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "" -#: forms.py:63 forms.py:100 forms.py:121 forms.py:281 +#: forms.py:68 forms.py:112 forms.py:136 forms.py:306 msgid "Password" msgstr "" -#: forms.py:64 +#: forms.py:70 msgid "Password confirmation" msgstr "" -#: forms.py:65 +#: forms.py:72 msgid "Enter the same password as above, for verification." msgstr "" -#: forms.py:100 +#: forms.py:113 msgid "" -"We don't store raw passwords, so there's no way to see this user's password, " -"but you can change the password using this form." +"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:124 +#: forms.py:139 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -#: forms.py:126 +#: forms.py:141 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -#: forms.py:128 +#: forms.py:143 msgid "This account is inactive." msgstr "" -#: forms.py:170 +#: forms.py:187 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -#: forms.py:172 +#: forms.py:189 msgid "" "The user account associated with this e-mail address cannot reset the " "password." msgstr "" -#: forms.py:175 +#: forms.py:192 msgid "E-mail" msgstr "" -#: forms.py:231 +#: forms.py:249 msgid "New password" msgstr "" -#: forms.py:232 +#: forms.py:251 msgid "New password confirmation" msgstr "" -#: forms.py:259 +#: forms.py:280 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -#: forms.py:261 +#: forms.py:283 msgid "Old password" msgstr "" -#: forms.py:282 +#: forms.py:308 msgid "Password (again)" msgstr "" -#: models.py:51 models.py:79 +#: hashers.py:218 hashers.py:269 hashers.py:298 hashers.py:326 hashers.py:355 +#: hashers.py:389 +msgid "algorithm" +msgstr "" + +#: hashers.py:219 +msgid "iterations" +msgstr "" + +#: hashers.py:220 hashers.py:271 hashers.py:299 hashers.py:327 hashers.py:390 +msgid "salt" +msgstr "" + +#: hashers.py:221 hashers.py:300 hashers.py:328 hashers.py:356 hashers.py:391 +msgid "hash" +msgstr "" + +#: hashers.py:270 +msgid "work factor" +msgstr "" + +#: hashers.py:272 +msgid "checksum" +msgstr "" + +#: models.py:66 models.py:113 msgid "name" msgstr "" -#: models.py:53 +#: models.py:68 msgid "codename" msgstr "" -#: models.py:57 +#: models.py:72 msgid "permission" msgstr "" -#: models.py:58 models.py:80 +#: models.py:73 models.py:115 msgid "permissions" msgstr "" -#: models.py:83 +#: models.py:120 msgid "group" msgstr "" -#: models.py:84 models.py:186 +#: models.py:121 models.py:250 msgid "groups" msgstr "" -#: models.py:176 +#: models.py:232 msgid "username" msgstr "" -#: models.py:176 +#: models.py:233 msgid "" "Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters" msgstr "" -#: models.py:177 +#: models.py:235 msgid "first name" msgstr "" -#: models.py:178 +#: models.py:236 msgid "last name" msgstr "" -#: models.py:179 +#: models.py:237 msgid "e-mail address" msgstr "" -#: models.py:180 +#: models.py:238 msgid "password" msgstr "" -#: models.py:181 +#: models.py:239 msgid "staff status" msgstr "" -#: models.py:181 +#: models.py:240 msgid "Designates whether the user can log into this admin site." msgstr "" -#: models.py:182 +#: models.py:242 msgid "active" msgstr "" -#: models.py:182 +#: models.py:243 msgid "" "Designates whether this user should be treated as active. Unselect this " "instead of deleting accounts." msgstr "" -#: models.py:183 +#: models.py:245 msgid "superuser status" msgstr "" -#: models.py:183 +#: models.py:246 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -#: models.py:184 +#: models.py:248 msgid "last login" msgstr "" -#: models.py:185 +#: models.py:249 msgid "date joined" msgstr "" -#: models.py:187 +#: models.py:251 msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." +"The groups this user belongs to. A user will get all permissions granted to " +"each of his/her group." msgstr "" -#: models.py:188 +#: models.py:255 msgid "user permissions" msgstr "" -#: models.py:192 +#: models.py:260 msgid "user" msgstr "" -#: models.py:193 +#: models.py:261 msgid "users" msgstr ""