Commits

Steffen Hoffmann  committed fcd2064

Another message extraction and catalog update for AccountManagerPlugin.

While this has been done again by following suggestions from Jun Omae,
I did announce his new Japanese translations for AccountManagerPlugin
a bit too early. Actually I haven't got them by now, sorry for the noise.

  • Participants
  • Parent commits 6329ca0

Comments (0)

Files changed (4)

File acct_mgr/locale/de/LC_MESSAGES/acct_mgr.po

 msgstr ""
 "Project-Id-Version: TracAccountManager 0.3\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2010-11-16 14:30+0100\n"
+"POT-Creation-Date: 2010-11-17 00:22+0100\n"
 "PO-Revision-Date: 2010-09-25 00:04+0200\n"
 "Last-Translator: Steffen Hoffmann <hoff.st@web.de>\n"
 "Language-Team: German de_DE <trac-dev@googlegroups.com>\n"
 msgstr "Ungültiger Schlüsseltyp (%s) für Kennwortspeicherreihenfolge"
 
 #: acct_mgr/admin.py:115 acct_mgr/admin.py:117 acct_mgr/notification.py:170
-#: acct_mgr/templates/admin_users.html:14
+#: acct_mgr/templates/admin_users.html:11
 msgid "Accounts"
 msgstr "Nutzerkonten"
 
 "Die angegebene E-Mail-Adresse wird bereits verwendet. Bitte geben Sie "
 "eine andere an."
 
-#: acct_mgr/web_ui.py:206 acct_mgr/templates/admin_users.html:82
-#: acct_mgr/templates/prefs_account.html:44
+#: acct_mgr/web_ui.py:206 acct_mgr/templates/admin_users.html:79
+#: acct_mgr/templates/prefs_account.html:42
 msgid "Account"
 msgstr "Nutzerkonto"
 
 msgid "Password is incorrect."
 msgstr "Das Kennwort is ungültig."
 
-#: acct_mgr/web_ui.py:403 acct_mgr/templates/register.html:14
+#: acct_mgr/web_ui.py:403 acct_mgr/templates/register.html:11
 msgid "Register"
 msgstr "Registrieren"
 
 msgid "Your permissions have been limited until you %(link)s."
 msgstr "Ihre Berechtigungen sind eingeschränkt worden, bis Sie %(link)s."
 
-#. TRANSLATOR: ... verify your new email address
+#. TRANSLATOR: An email has been sent to %(email)s
+#. with a token to ... (the link label for following message)
 #: acct_mgr/web_ui.py:652
-#, python-format
-msgid "An email has been sent to %(email)s with a token to "
-msgstr ""
-"Eine E-Mail-Nachricht mit einem Bestätigungscode wurde an %(email)s "
-"gesendet, um "
-
-#: acct_mgr/web_ui.py:653
 msgid "verify your new email address"
 msgstr "Ihre neue E-Mail-Adresse zu bestätigen"
 
-#: acct_mgr/web_ui.py:664
+#. TRANSLATOR: ... verify your new email address
+#: acct_mgr/web_ui.py:655
+#, python-format
+msgid ""
+"An email has been sent to %(email)s with a token to\n"
+"                %(link)s."
+msgstr ""
+"Eine E-Mail-Nachricht mit einem Bestätigungscode wurde an %(email)s "
+"gesendet, um %(link)s."
+
+#: acct_mgr/web_ui.py:668
 msgid "Please log in to finish email verification procedure."
 msgstr ""
 "Bitte melden Sie sich an, um den Bestätigungsvorgang für Ihre E-Mail-"
 "Adresse abzuschliessen."
 
-#: acct_mgr/web_ui.py:668
+#: acct_mgr/web_ui.py:672
 msgid "Your email is already verified."
 msgstr "Ihre E-Mail-Adresse ist bereits bestätigt."
 
-#: acct_mgr/web_ui.py:676
+#: acct_mgr/web_ui.py:680
 #, python-format
 msgid "A notification email has been resent to <%s>."
 msgstr "Eine E-Mail-Benachrichtigung ist an <%s> gesendet worden."
 
-#: acct_mgr/web_ui.py:682
+#: acct_mgr/web_ui.py:686
 msgid "Thank you for verifying your email address."
 msgstr "Vielen Dank, dass Sie Ihre E-Mail-Adresse bestätigt haben."
 
-#: acct_mgr/web_ui.py:685
+#: acct_mgr/web_ui.py:689
 msgid "Invalid verification token"
 msgstr "Ungültiger Bestätigungscode"
 
-#: acct_mgr/templates/admin_accountsconfig.html:14
-#: acct_mgr/templates/admin_accountsconfig.html:18
+#: acct_mgr/templates/admin_accountsconfig.html:11
+#: acct_mgr/templates/admin_accountsconfig.html:15
 msgid "Accounts: Configuration"
 msgstr "Nutzerkonten: Einstellungen"
 
-#: acct_mgr/templates/admin_accountsconfig.html:44
+#: acct_mgr/templates/admin_accountsconfig.html:40
 msgid "Persistent Sessions"
 msgstr "Dauerhafte Anmeldungen"
 
-#: acct_mgr/templates/admin_accountsconfig.html:47
+#: acct_mgr/templates/admin_accountsconfig.html:43
 msgid ""
 "Allow the user to be remembered across sessions without needing to\n"
 "          re-authenticate."
 msgstr "Erlaube das Wiedererkennen des Nutzers ohne Neuanmeldung."
 
-#: acct_mgr/templates/admin_accountsconfig.html:51
+#: acct_mgr/templates/admin_accountsconfig.html:47
 msgid ""
 "This is, user checks a \"Remember Me\"\n"
 "          [1:checkbox] and, next time he visits the site,\n"
 "          he'll be remembered and automatically authenticated."
 msgstr ""
-"D. h., der Nutzer aktiviert ein [1:Ankreuzfeld] \"Angemeldet bleiben\""
-" und wird beim nächsten Besuch wiedererkannt und automatisch angemeldet."
+"D. h., der Nutzer aktiviert ein [1:Ankreuzfeld] \"Angemeldet bleiben\" "
+"und wird beim nächsten Besuch wiedererkannt und automatisch angemeldet."
 
-#: acct_mgr/templates/admin_accountsconfig.html:58
+#: acct_mgr/templates/admin_accountsconfig.html:54
 msgid "Password Reset"
 msgstr "Kennwort zurücksetzen"
 
-#: acct_mgr/templates/admin_accountsconfig.html:61
+#: acct_mgr/templates/admin_accountsconfig.html:57
 msgid "Force users to change passwords after a password reset."
 msgstr "Zwinge Nutzer nach Zurücksetzen des Kennworts zur Kennwortänderung."
 
-#: acct_mgr/templates/admin_accountsconfig.html:67
+#: acct_mgr/templates/admin_accountsconfig.html:63
 msgid "Verify email"
 msgstr "E-Mail-Adresse bestätigen"
 
-#: acct_mgr/templates/admin_accountsconfig.html:70
+#: acct_mgr/templates/admin_accountsconfig.html:66
 msgid "Force users to verify their email addresses."
 msgstr "Zwinge Nutzer, ihre E-Mail-Adresse zu bestätigen."
 
-#: acct_mgr/templates/admin_accountsconfig.html:75
-#: acct_mgr/templates/admin_accountsnotification.html:49
+#: acct_mgr/templates/admin_accountsconfig.html:71
+#: acct_mgr/templates/admin_accountsnotification.html:48
 msgid "Save"
 msgstr "Speichern"
 
-#: acct_mgr/templates/admin_accountsnotification.html:14
-#: acct_mgr/templates/admin_accountsnotification.html:18
+#: acct_mgr/templates/admin_accountsnotification.html:11
+#: acct_mgr/templates/admin_accountsnotification.html:15
 msgid "Accounts: Notification Configuration"
 msgstr "Nutzerkonten: Benachrichtigungseinstellungen"
 
-#: acct_mgr/templates/admin_accountsnotification.html:21
+#: acct_mgr/templates/admin_accountsnotification.html:19
 msgid "Account Notification"
 msgstr "Nutzerkontenbenachrichtigung"
 
-#: acct_mgr/templates/admin_accountsnotification.html:22
+#: acct_mgr/templates/admin_accountsnotification.html:20
 msgid ""
 "Set the following options in order to be notified of\n"
-"        account creation, password reset and account deletion."
+"          account creation, password reset and account deletion."
 msgstr ""
 "Wählen Sie die folgenden Optionen, um über Kontenerstellung, "
 "Kennwortrücksetzen und Kontenlöschung benachrichtigt zu werden."
 
-#: acct_mgr/templates/admin_accountsnotification.html:25
+#: acct_mgr/templates/admin_accountsnotification.html:23
 msgid "Notification Actions"
 msgstr "Benachrichtigungsaktionen"
 
-#: acct_mgr/templates/admin_accountsnotification.html:26
+#: acct_mgr/templates/admin_accountsnotification.html:24
 msgid ""
 "This is a list of actions which you can\n"
 "          enable or disable by [1:checking] the [2:checkboxes]."
 "Dies ist eine Aktionsliste, die Sie durch [1:Wählen] der "
 "[2:Ankreuzfelder] aktivieren oder deaktivieren können."
 
-#: acct_mgr/templates/admin_accountsnotification.html:30
+#: acct_mgr/templates/admin_accountsnotification.html:28
 msgid "Get notified of new account creation"
 msgstr "Erstellung eines neuen Benutzerkontos melden"
 
-#: acct_mgr/templates/admin_accountsnotification.html:34
+#: acct_mgr/templates/admin_accountsnotification.html:32
 msgid "Get notified of password reset"
 msgstr "Kennwortrücksetzen melden"
 
-#: acct_mgr/templates/admin_accountsnotification.html:38
+#: acct_mgr/templates/admin_accountsnotification.html:36
 msgid "Get notified of account deletion"
 msgstr "Benutzerkontenlöschung melden"
 
-#: acct_mgr/templates/admin_accountsnotification.html:41
+#: acct_mgr/templates/admin_accountsnotification.html:39
 msgid "Notification Recipient Addresses"
 msgstr "Empfängeradressen für Benachrichtigungen"
 
-#: acct_mgr/templates/admin_accountsnotification.html:42
+#: acct_mgr/templates/admin_accountsnotification.html:40
 msgid ""
 "Space-separated list of email addresses and/or\n"
-"        usernames that get notified of the above actions:"
+"          usernames that get notified of the above actions:"
 msgstr ""
 "Liste von durch Leerzeichen getrennten E-Mail-Adressen und/oder "
 "Nutzernamen, die über die vorgenannten Aktionen benachrichtigt werden:"
 
-#: acct_mgr/templates/admin_users.html:18
+#: acct_mgr/templates/admin_users.html:15
 msgid "Manage User Accounts"
 msgstr "Benutzerkontenverwaltung"
 
-#: acct_mgr/templates/admin_users.html:25
+#: acct_mgr/templates/admin_users.html:22
 msgid "Add Account:"
 msgstr "Benutzerkonto hinzufügen:"
 
-#: acct_mgr/templates/admin_users.html:27
-#: acct_mgr/templates/admin_users.html:55 acct_mgr/templates/login.html:35
-#: acct_mgr/templates/register.html:36
+#: acct_mgr/templates/admin_users.html:24
+#: acct_mgr/templates/admin_users.html:52 acct_mgr/templates/login.html:32
+#: acct_mgr/templates/register.html:33
 #: acct_mgr/templates/reset_password.html:50
 msgid "Username:"
 msgstr "Nutzername:"
 
-#: acct_mgr/templates/admin_users.html:30
-#: acct_mgr/templates/admin_users.html:58 acct_mgr/templates/login.html:39
-#: acct_mgr/templates/prefs_account.html:30 acct_mgr/templates/register.html:41
+#: acct_mgr/templates/admin_users.html:27
+#: acct_mgr/templates/admin_users.html:55 acct_mgr/templates/login.html:37
+#: acct_mgr/templates/prefs_account.html:27 acct_mgr/templates/register.html:39
 msgid "Password:"
 msgstr "Kennwort:"
 
-#: acct_mgr/templates/admin_users.html:33
-#: acct_mgr/templates/admin_users.html:61
-#: acct_mgr/templates/prefs_account.html:73 acct_mgr/templates/register.html:46
+#: acct_mgr/templates/admin_users.html:30
+#: acct_mgr/templates/admin_users.html:58
+#: acct_mgr/templates/prefs_account.html:71 acct_mgr/templates/register.html:45
 msgid "Confirm Password:"
 msgstr "Kennwortbestätigung:"
 
-#: acct_mgr/templates/admin_users.html:36 acct_mgr/templates/register.html:66
+#: acct_mgr/templates/admin_users.html:33 acct_mgr/templates/register.html:67
 msgid "Name:"
 msgstr "Name:"
 
-#: acct_mgr/templates/admin_users.html:39 acct_mgr/templates/register.html:52
-#: acct_mgr/templates/register.html:71
+#: acct_mgr/templates/admin_users.html:36 acct_mgr/templates/register.html:51
+#: acct_mgr/templates/register.html:73
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: acct_mgr/templates/admin_users.html:41
+#: acct_mgr/templates/admin_users.html:38
 msgid "Add a new user account."
 msgstr "Füge ein neues Benutzerkonto hinzu."
 
-#: acct_mgr/templates/admin_users.html:43
+#: acct_mgr/templates/admin_users.html:40
 msgid " Add "
 msgstr " Hinzufügen "
 
-#: acct_mgr/templates/admin_users.html:53
+#: acct_mgr/templates/admin_users.html:50
 msgid "Change Password:"
 msgstr "Kennwortänderung:"
 
-#: acct_mgr/templates/admin_users.html:63
+#: acct_mgr/templates/admin_users.html:60
 msgid "Change a user's password."
 msgstr "Ändere ein Nutzerkennwort."
 
-#: acct_mgr/templates/admin_users.html:65
+#: acct_mgr/templates/admin_users.html:62
 msgid " Change "
 msgstr " Ändern "
 
-#: acct_mgr/templates/admin_users.html:73
+#: acct_mgr/templates/admin_users.html:70
 msgid "This password store does not support listing users."
 msgstr "Der Kennwortspeicher erlaubt das Auflisten von Nutzern nicht."
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Name"
 msgstr "Name"
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Email"
 msgstr "E-Mail"
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Last Login"
 msgstr "Letzte Anmeldung"
 
-#: acct_mgr/templates/admin_users.html:98
+#: acct_mgr/templates/admin_users.html:95
 msgid "Remove selected accounts"
 msgstr "Ausgewählte Nutzerkonten löschen"
 
-#: acct_mgr/templates/login.html:14 acct_mgr/templates/login.html:25
+#: acct_mgr/templates/login.html:11 acct_mgr/templates/login.html:22
 #: acct_mgr/templates/login.html:46
 msgid "Login"
 msgstr "Anmelden"
 
-#: acct_mgr/templates/login.html:28 acct_mgr/templates/prefs_account.html:23
-#: acct_mgr/templates/prefs_account.html:49
-#: acct_mgr/templates/prefs_account.html:56 acct_mgr/templates/register.html:27
+#: acct_mgr/templates/login.html:25 acct_mgr/templates/prefs_account.html:20
+#: acct_mgr/templates/prefs_account.html:47
+#: acct_mgr/templates/prefs_account.html:54 acct_mgr/templates/register.html:24
 #: acct_mgr/templates/reset_password.html:42
 msgid "Error"
 msgstr "Fehler"
 msgid "Remember me"
 msgstr "Angemeldet bleiben"
 
-#: acct_mgr/templates/prefs_account.html:20
+#: acct_mgr/templates/prefs_account.html:17
 msgid "Delete Account"
 msgstr "Nutzerkontolöschung"
 
-#: acct_mgr/templates/prefs_account.html:37
+#: acct_mgr/templates/prefs_account.html:34
 msgid "Delete account"
 msgstr "Nutzerkonto löschen"
 
-#: acct_mgr/templates/prefs_account.html:53
+#: acct_mgr/templates/prefs_account.html:51
 msgid "Change Password"
 msgstr "Kennwortänderung"
 
-#: acct_mgr/templates/prefs_account.html:61
+#: acct_mgr/templates/prefs_account.html:59
 msgid "Old Password:"
 msgstr "Altes Kennwort:"
 
-#: acct_mgr/templates/prefs_account.html:67
+#: acct_mgr/templates/prefs_account.html:65
 msgid "New Password:"
 msgstr "Neues Kennwort:"
 
-#: acct_mgr/templates/register.html:24
+#: acct_mgr/templates/register.html:21
 msgid "Register an account"
 msgstr "Nutzerkonto registrieren"
 
-#: acct_mgr/templates/register.html:33
+#: acct_mgr/templates/register.html:30
 msgid "Required"
 msgstr "Erforderlich"
 
 #: acct_mgr/templates/register.html:55
 msgid ""
 "The email address is required for Trac to send you a\n"
-"              verification code."
+"              verification token."
 msgstr ""
 "Ihre E-Mail-Adresse wird benötigt, damit Trac Ihnen einen "
 "Bestätigungscode zusenden kann."
 "Das Eintragen Ihrer E-Mail-Adresse ermöglicht es Ihnen ausserdem, Ihr "
 "Kennwort zurückzusetzen, falls Sie es jemals vergessen sollten."
 
-#: acct_mgr/templates/register.html:64
+#: acct_mgr/templates/register.html:65
 msgid "Optional"
 msgstr "Optional"
 
-#: acct_mgr/templates/register.html:74
+#: acct_mgr/templates/register.html:77
 msgid ""
 "Entering your email address\n"
 "              will enable you to reset your password if you ever forget "
 "Das Eintragen Ihrer E-Mail-Adresse ermöglicht es Ihnen, Ihr Kennwort "
 "zurückzusetzen, falls Sie es jemals vergessen sollten."
 
-#: acct_mgr/templates/register.html:79
+#: acct_mgr/templates/register.html:82
 msgid "Create account"
 msgstr "Nutzerkonto erstellen"
 
-#: acct_mgr/templates/reset_password.html:14
-#: acct_mgr/templates/reset_password.html:24
+#: acct_mgr/templates/reset_password.html:11
+#: acct_mgr/templates/reset_password.html:21
 msgid "Reset Password"
 msgstr "Kennwort zurücksetzen"
 
-#: acct_mgr/templates/reset_password.html:28
+#: acct_mgr/templates/reset_password.html:25
 msgid "Already logged in"
 msgstr "Bereits angemeldet"
 
-#: acct_mgr/templates/reset_password.html:29
+#: acct_mgr/templates/reset_password.html:26
 msgid ""
-"You're already logged in.  If you need to change\n"
-"        your password please use the\n"
-"        [1:Account Preferences] page."
+"You're already logged in. If you need to change\n"
+"          your password please use the\n"
+"          [1:Account Preferences] page."
 msgstr ""
 "Sie sind bereits angemeldet. Falls Sie Ihr Kennwort ändern möchten, "
 "benutzen Sie bitte die Seite für [1:Nutzerkonto-Einstellungen]."
 
-#: acct_mgr/templates/reset_password.html:34
-msgid "A new password has been emailed to you at"
-msgstr "Ein neues Kennwort ist Ihnen per E-Mail zugeschickt worden an"
+#: acct_mgr/templates/reset_password.html:32
+#, python-format
+msgid ""
+"A new password\n"
+"        has been emailed to you at %(email)s ."
+msgstr "Ein neues Kennwort ist Ihnen per E-Mail zugeschickt worden an %(email)s ."
 
-#: acct_mgr/templates/reset_password.html:38
+#: acct_mgr/templates/reset_password.html:37
 msgid ""
-"If you've forgot your password enter your username and\n"
-"      email address below and you'll be emailed a new password."
+"If you've forgotten your password, enter your username and\n"
+"        email address below and you'll be emailed a new password."
 msgstr ""
 "Falls Sie Ihr Kennwort vergessen haben, dann tragen Sie bitte Ihren "
 "Nutzernamen und Ihre E-Mail-Adresse nachfolgend ein, und Sie erhalten  "
 msgid "Reset password"
 msgstr "Kennwort zurücksetzen"
 
-#: acct_mgr/templates/verify_email.html:14
-#: acct_mgr/templates/verify_email.html:25
+#: acct_mgr/templates/verify_email.html:11
+#: acct_mgr/templates/verify_email.html:22
 msgid "Verify Email"
 msgstr "E-Mail-Adresse bestätigen"
 
-#: acct_mgr/templates/verify_email.html:27
+#: acct_mgr/templates/verify_email.html:24
 #, python-format
 msgid ""
 "An email was sent to\n"
-"      %(email)s with a token to verify your new address.\n"
-"      Please check your email and enter the token in the form below."
+"        %(email)s with a token to verify your new address.\n"
+"        Please check your email and enter the token in the form below."
 msgstr ""
 "Zur Bestätigung Ihrer neuen Adresse wurde eine E-Mail-Nachricht mit einem"
 " Bestätigungscode an %(email)s gesendet. Bitte sehen Sie Ihre Nachrichten"
 " durch, und tragen Sie den Code in das nachfolgende Feld ein."
 
-#: acct_mgr/templates/verify_email.html:30
+#: acct_mgr/templates/verify_email.html:27
 msgid ""
 "You can [1:change your\n"
-"      email address] if it is incorrect."
+"        email address], if it is incorrect."
 msgstr "Sie können [1: Ihre E-Mail-Adresse ändern], falls sie fehlerhaft ist."
 
-#: acct_mgr/templates/verify_email.html:35
+#: acct_mgr/templates/verify_email.html:32
 msgid "Verification Token:"
 msgstr "Bestätigungscode:"
 
-#: acct_mgr/templates/verify_email.html:39
+#: acct_mgr/templates/verify_email.html:36
 msgid "Verify"
 msgstr "Bestätigen"
 
-#: acct_mgr/templates/verify_email.html:41
+#: acct_mgr/templates/verify_email.html:38
 msgid "Resend Email"
 msgstr "E-Mail-Nachricht erneut versenden"
 

File acct_mgr/locale/es/LC_MESSAGES/acct_mgr.po

 msgstr ""
 "Project-Id-Version: TracAccountManager 0.3\n"
 "Report-Msgid-Bugs-To: agonzalez@qwi.es\n"
-"POT-Creation-Date: 2010-11-16 14:30+0100\n"
+"POT-Creation-Date: 2010-11-17 00:22+0100\n"
 "PO-Revision-Date: 2010-11-03 13:32+0100\n"
 "Last-Translator: Adolfo González Blázquez <agonzalez@qwi.es>\n"
 "Language-Team: Spanish es_ES <trac-dev@googlegroups.com>\n"
 msgstr "Tipo de clave (%s) inválida para StoreOrder"
 
 #: acct_mgr/admin.py:115 acct_mgr/admin.py:117 acct_mgr/notification.py:170
-#: acct_mgr/templates/admin_users.html:14
+#: acct_mgr/templates/admin_users.html:11
 msgid "Accounts"
 msgstr "Cuentas"
 
 "La dirección de correo electrónico que ha introducido ya está en uso. Por"
 " favor introduzca una diferente."
 
-#: acct_mgr/web_ui.py:206 acct_mgr/templates/admin_users.html:82
-#: acct_mgr/templates/prefs_account.html:44
+#: acct_mgr/web_ui.py:206 acct_mgr/templates/admin_users.html:79
+#: acct_mgr/templates/prefs_account.html:42
 msgid "Account"
 msgstr "Cuenta"
 
 msgid "Password is incorrect."
 msgstr "La contraseña es incorrecta."
 
-#: acct_mgr/web_ui.py:403 acct_mgr/templates/register.html:14
+#: acct_mgr/web_ui.py:403 acct_mgr/templates/register.html:11
 msgid "Register"
 msgstr "Registrarse"
 
 msgid "Your permissions have been limited until you %(link)s."
 msgstr "Sus permisos se han limitado hasta que %(link)s."
 
-#. TRANSLATOR: ... verify your new email address
+#. TRANSLATOR: An email has been sent to %(email)s
+#. with a token to ... (the link label for following message)
 #: acct_mgr/web_ui.py:652
-#, python-format
-msgid "An email has been sent to %(email)s with a token to "
-msgstr "Se ha enviado un correo electrónico a %(email)s con una clave para "
-
-#: acct_mgr/web_ui.py:653
 msgid "verify your new email address"
 msgstr "verifique su nueva dirección de correo electrónico"
 
-#: acct_mgr/web_ui.py:664
+#. TRANSLATOR: ... verify your new email address
+#: acct_mgr/web_ui.py:655
+#, python-format
+msgid ""
+"An email has been sent to %(email)s with a token to\n"
+"                %(link)s."
+msgstr ""
+"Se ha enviado un correo electrónico a %(email)s con una clave para "
+"%(link)s."
+
+#: acct_mgr/web_ui.py:668
 msgid "Please log in to finish email verification procedure."
 msgstr ""
 "Por favor, inicie sesión para terminar el proceso de verificación de "
 "correo electrónico."
 
-#: acct_mgr/web_ui.py:668
+#: acct_mgr/web_ui.py:672
 msgid "Your email is already verified."
 msgstr "Su correo electrónico ya ha sido verificado."
 
-#: acct_mgr/web_ui.py:676
+#: acct_mgr/web_ui.py:680
 #, python-format
 msgid "A notification email has been resent to <%s>."
 msgstr "Se ha reenviado un correo de notificación a <%s>."
 
-#: acct_mgr/web_ui.py:682
+#: acct_mgr/web_ui.py:686
 msgid "Thank you for verifying your email address."
 msgstr "Gracias por verificar su dirección de correo electrónico."
 
-#: acct_mgr/web_ui.py:685
+#: acct_mgr/web_ui.py:689
 msgid "Invalid verification token"
 msgstr "Clave de verificación inválida"
 
-#: acct_mgr/templates/admin_accountsconfig.html:14
-#: acct_mgr/templates/admin_accountsconfig.html:18
+#: acct_mgr/templates/admin_accountsconfig.html:11
+#: acct_mgr/templates/admin_accountsconfig.html:15
 msgid "Accounts: Configuration"
 msgstr "Cuentas: configuración"
 
-#: acct_mgr/templates/admin_accountsconfig.html:44
+#: acct_mgr/templates/admin_accountsconfig.html:40
 msgid "Persistent Sessions"
 msgstr "Sesiones persistentes"
 
-#: acct_mgr/templates/admin_accountsconfig.html:47
+#: acct_mgr/templates/admin_accountsconfig.html:43
 msgid ""
 "Allow the user to be remembered across sessions without needing to\n"
 "          re-authenticate."
 "Permite al usuario ser recordado entre sesiones sin la necesidad de "
 "reautenticarse."
 
-#: acct_mgr/templates/admin_accountsconfig.html:51
+#: acct_mgr/templates/admin_accountsconfig.html:47
 msgid ""
 "This is, user checks a \"Remember Me\"\n"
 "          [1:checkbox] and, next time he visits the site,\n"
 "          he'll be remembered and automatically authenticated."
 msgstr ""
-"Esto es, el usuario activa la [1:casilla] \"Recuérdeme\" y la próxima "
-"vez que visite la web se le reconocerá y autenticará automáticamente."
+"Esto es, el usuario activa la [1:casilla] \"Recuérdeme\" y la próxima vez"
+" que visite la web se le reconocerá y autenticará automáticamente."
 
-#: acct_mgr/templates/admin_accountsconfig.html:58
+#: acct_mgr/templates/admin_accountsconfig.html:54
 msgid "Password Reset"
 msgstr "Reiniciar contraseña"
 
-#: acct_mgr/templates/admin_accountsconfig.html:61
+#: acct_mgr/templates/admin_accountsconfig.html:57
 msgid "Force users to change passwords after a password reset."
 msgstr ""
 "Obligar a los usuarios a cambiar sus contraseñas después de un reinicio "
 "de contraseña."
 
-#: acct_mgr/templates/admin_accountsconfig.html:67
+#: acct_mgr/templates/admin_accountsconfig.html:63
 msgid "Verify email"
 msgstr "Verificar correo electrónico"
 
-#: acct_mgr/templates/admin_accountsconfig.html:70
+#: acct_mgr/templates/admin_accountsconfig.html:66
 msgid "Force users to verify their email addresses."
 msgstr "Obliga a los usuarios a verificar su dirección de correo electrónico."
 
-#: acct_mgr/templates/admin_accountsconfig.html:75
-#: acct_mgr/templates/admin_accountsnotification.html:49
+#: acct_mgr/templates/admin_accountsconfig.html:71
+#: acct_mgr/templates/admin_accountsnotification.html:48
 msgid "Save"
 msgstr "Guardar"
 
-#: acct_mgr/templates/admin_accountsnotification.html:14
-#: acct_mgr/templates/admin_accountsnotification.html:18
+#: acct_mgr/templates/admin_accountsnotification.html:11
+#: acct_mgr/templates/admin_accountsnotification.html:15
 msgid "Accounts: Notification Configuration"
 msgstr "Cuentas: configuración de notificación"
 
-#: acct_mgr/templates/admin_accountsnotification.html:21
+#: acct_mgr/templates/admin_accountsnotification.html:19
 msgid "Account Notification"
 msgstr "Notificación de cuentas"
 
-#: acct_mgr/templates/admin_accountsnotification.html:22
+#: acct_mgr/templates/admin_accountsnotification.html:20
 msgid ""
 "Set the following options in order to be notified of\n"
-"        account creation, password reset and account deletion."
+"          account creation, password reset and account deletion."
 msgstr ""
 "Active las siguientes opciones para ser notificado cuando se creen "
 "cuentas, se reinicien contraseñas o se eliminen cuentas."
 
-#: acct_mgr/templates/admin_accountsnotification.html:25
+#: acct_mgr/templates/admin_accountsnotification.html:23
 msgid "Notification Actions"
 msgstr "Acciones de notificación"
 
-#: acct_mgr/templates/admin_accountsnotification.html:26
+#: acct_mgr/templates/admin_accountsnotification.html:24
 msgid ""
 "This is a list of actions which you can\n"
 "          enable or disable by [1:checking] the [2:checkboxes]."
 "Esta es una lista de acciones que puede activar o desactivar haciendo "
 "[1:clic] en las [2:casillas de activación]."
 
-#: acct_mgr/templates/admin_accountsnotification.html:30
+#: acct_mgr/templates/admin_accountsnotification.html:28
 msgid "Get notified of new account creation"
 msgstr "Notificarme la creación de nuevas cuentas"
 
-#: acct_mgr/templates/admin_accountsnotification.html:34
+#: acct_mgr/templates/admin_accountsnotification.html:32
 msgid "Get notified of password reset"
 msgstr "Notificarme los reinicios de contraseñas"
 
-#: acct_mgr/templates/admin_accountsnotification.html:38
+#: acct_mgr/templates/admin_accountsnotification.html:36
 msgid "Get notified of account deletion"
 msgstr "Notificarme las eliminaciones de cuentas"
 
-#: acct_mgr/templates/admin_accountsnotification.html:41
+#: acct_mgr/templates/admin_accountsnotification.html:39
 msgid "Notification Recipient Addresses"
 msgstr "Direcciones de destinatarios de las notificaciones"
 
-#: acct_mgr/templates/admin_accountsnotification.html:42
+#: acct_mgr/templates/admin_accountsnotification.html:40
 msgid ""
 "Space-separated list of email addresses and/or\n"
-"        usernames that get notified of the above actions:"
+"          usernames that get notified of the above actions:"
 msgstr ""
 "Lista de direcciones de correo electrónico separadas por comas y/o "
 "usuarios a los que notificar sobre las siguientes acciones:"
 
-#: acct_mgr/templates/admin_users.html:18
+#: acct_mgr/templates/admin_users.html:15
 msgid "Manage User Accounts"
 msgstr "Administrar cuentas de usuario"
 
-#: acct_mgr/templates/admin_users.html:25
+#: acct_mgr/templates/admin_users.html:22
 msgid "Add Account:"
 msgstr "Añadir cuenta:"
 
-#: acct_mgr/templates/admin_users.html:27
-#: acct_mgr/templates/admin_users.html:55 acct_mgr/templates/login.html:35
-#: acct_mgr/templates/register.html:36
+#: acct_mgr/templates/admin_users.html:24
+#: acct_mgr/templates/admin_users.html:52 acct_mgr/templates/login.html:32
+#: acct_mgr/templates/register.html:33
 #: acct_mgr/templates/reset_password.html:50
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: acct_mgr/templates/admin_users.html:30
-#: acct_mgr/templates/admin_users.html:58 acct_mgr/templates/login.html:39
-#: acct_mgr/templates/prefs_account.html:30 acct_mgr/templates/register.html:41
+#: acct_mgr/templates/admin_users.html:27
+#: acct_mgr/templates/admin_users.html:55 acct_mgr/templates/login.html:37
+#: acct_mgr/templates/prefs_account.html:27 acct_mgr/templates/register.html:39
 msgid "Password:"
 msgstr "Contraseña:"
 
-#: acct_mgr/templates/admin_users.html:33
-#: acct_mgr/templates/admin_users.html:61
-#: acct_mgr/templates/prefs_account.html:73 acct_mgr/templates/register.html:46
+#: acct_mgr/templates/admin_users.html:30
+#: acct_mgr/templates/admin_users.html:58
+#: acct_mgr/templates/prefs_account.html:71 acct_mgr/templates/register.html:45
 msgid "Confirm Password:"
 msgstr "Confirmar contraseña:"
 
-#: acct_mgr/templates/admin_users.html:36 acct_mgr/templates/register.html:66
+#: acct_mgr/templates/admin_users.html:33 acct_mgr/templates/register.html:67
 msgid "Name:"
 msgstr "Nombre:"
 
-#: acct_mgr/templates/admin_users.html:39 acct_mgr/templates/register.html:52
-#: acct_mgr/templates/register.html:71
+#: acct_mgr/templates/admin_users.html:36 acct_mgr/templates/register.html:51
+#: acct_mgr/templates/register.html:73
 msgid "Email:"
 msgstr "Correo electrónico:"
 
-#: acct_mgr/templates/admin_users.html:41
+#: acct_mgr/templates/admin_users.html:38
 msgid "Add a new user account."
 msgstr "Añadir nueva cuenta de usuario."
 
-#: acct_mgr/templates/admin_users.html:43
+#: acct_mgr/templates/admin_users.html:40
 msgid " Add "
 msgstr " Añadir "
 
-#: acct_mgr/templates/admin_users.html:53
+#: acct_mgr/templates/admin_users.html:50
 msgid "Change Password:"
 msgstr "Cambiar contraseña:"
 
-#: acct_mgr/templates/admin_users.html:63
+#: acct_mgr/templates/admin_users.html:60
 msgid "Change a user's password."
 msgstr "Cambiar la contraseña de un usuario."
 
-#: acct_mgr/templates/admin_users.html:65
+#: acct_mgr/templates/admin_users.html:62
 msgid " Change "
 msgstr " Cambiar "
 
-#: acct_mgr/templates/admin_users.html:73
+#: acct_mgr/templates/admin_users.html:70
 msgid "This password store does not support listing users."
 msgstr "Este almacén de contraseñas no puede listar usuarios."
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Name"
 msgstr "Nombre"
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Last Login"
 msgstr "Última conexión"
 
-#: acct_mgr/templates/admin_users.html:98
+#: acct_mgr/templates/admin_users.html:95
 msgid "Remove selected accounts"
 msgstr "Eliminar cuentas de usuario seleccionadas"
 
-#: acct_mgr/templates/login.html:14 acct_mgr/templates/login.html:25
+#: acct_mgr/templates/login.html:11 acct_mgr/templates/login.html:22
 #: acct_mgr/templates/login.html:46
 msgid "Login"
 msgstr "Iniciar sesión"
 
-#: acct_mgr/templates/login.html:28 acct_mgr/templates/prefs_account.html:23
-#: acct_mgr/templates/prefs_account.html:49
-#: acct_mgr/templates/prefs_account.html:56 acct_mgr/templates/register.html:27
+#: acct_mgr/templates/login.html:25 acct_mgr/templates/prefs_account.html:20
+#: acct_mgr/templates/prefs_account.html:47
+#: acct_mgr/templates/prefs_account.html:54 acct_mgr/templates/register.html:24
 #: acct_mgr/templates/reset_password.html:42
 msgid "Error"
 msgstr "Error"
 msgid "Remember me"
 msgstr "Recuérdeme"
 
-#: acct_mgr/templates/prefs_account.html:20
+#: acct_mgr/templates/prefs_account.html:17
 msgid "Delete Account"
 msgstr "Eliminar cuenta"
 
-#: acct_mgr/templates/prefs_account.html:37
+#: acct_mgr/templates/prefs_account.html:34
 msgid "Delete account"
 msgstr "Eliminar cuenta"
 
-#: acct_mgr/templates/prefs_account.html:53
+#: acct_mgr/templates/prefs_account.html:51
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: acct_mgr/templates/prefs_account.html:61
+#: acct_mgr/templates/prefs_account.html:59
 msgid "Old Password:"
 msgstr "Contraseña antigua:"
 
-#: acct_mgr/templates/prefs_account.html:67
+#: acct_mgr/templates/prefs_account.html:65
 msgid "New Password:"
 msgstr "Nueva contraseña:"
 
-#: acct_mgr/templates/register.html:24
+#: acct_mgr/templates/register.html:21
 msgid "Register an account"
 msgstr "Registrar una cuenta"
 
-#: acct_mgr/templates/register.html:33
+#: acct_mgr/templates/register.html:30
 msgid "Required"
 msgstr "Obligatorio"
 
 #: acct_mgr/templates/register.html:55
 msgid ""
 "The email address is required for Trac to send you a\n"
-"              verification code."
+"              verification token."
 msgstr ""
 "La dirección de correo electrónico es necesaria para que Trac le envíe "
 "una clave de verificación."
 "Introducir su contraseña le permitirá también recuperar su contraseña si "
 "alguna vez la olvida."
 
-#: acct_mgr/templates/register.html:64
+#: acct_mgr/templates/register.html:65
 msgid "Optional"
 msgstr "Opcional"
 
-#: acct_mgr/templates/register.html:74
+#: acct_mgr/templates/register.html:77
 msgid ""
 "Entering your email address\n"
 "              will enable you to reset your password if you ever forget "
 "Introducir su contraseña le permitirá también reiniciar su contraseña"
 " si alguna vez la olvida."
 
-#: acct_mgr/templates/register.html:79
+#: acct_mgr/templates/register.html:82
 msgid "Create account"
 msgstr "Crear cuenta"
 
-#: acct_mgr/templates/reset_password.html:14
-#: acct_mgr/templates/reset_password.html:24
+#: acct_mgr/templates/reset_password.html:11
+#: acct_mgr/templates/reset_password.html:21
 msgid "Reset Password"
 msgstr "Reiniciar contraseña"
 
-#: acct_mgr/templates/reset_password.html:28
+#: acct_mgr/templates/reset_password.html:25
 msgid "Already logged in"
 msgstr "Ya está conectado"
 
-#: acct_mgr/templates/reset_password.html:29
+#: acct_mgr/templates/reset_password.html:26
 msgid ""
-"You're already logged in.  If you need to change\n"
-"        your password please use the\n"
-"        [1:Account Preferences] page."
+"You're already logged in. If you need to change\n"
+"          your password please use the\n"
+"          [1:Account Preferences] page."
 msgstr ""
 "Ya está conectado. Si necesita cambiar su contraseña por favor use la "
 "página [1:Preferencias de cuenta]."
 
-#: acct_mgr/templates/reset_password.html:34
-msgid "A new password has been emailed to you at"
-msgstr "Se le ha enviado una nueva contraseña por correo electrónico a"
+#: acct_mgr/templates/reset_password.html:32
+#, python-format
+msgid ""
+"A new password\n"
+"        has been emailed to you at %(email)s ."
+msgstr "Se le ha enviado una nueva contraseña por correo electrónico a %(email)s ."
 
-#: acct_mgr/templates/reset_password.html:38
+#: acct_mgr/templates/reset_password.html:37
 msgid ""
-"If you've forgot your password enter your username and\n"
-"      email address below and you'll be emailed a new password."
+"If you've forgotten your password, enter your username and\n"
+"        email address below and you'll be emailed a new password."
 msgstr ""
 "Si ha olvidado su contraseña introduzca su nombre de usuario y su "
 "dirección de correo electrónico y se le enviará una nueva."
 msgid "Reset password"
 msgstr "Reiniciar contraseña"
 
-#: acct_mgr/templates/verify_email.html:14
-#: acct_mgr/templates/verify_email.html:25
+#: acct_mgr/templates/verify_email.html:11
+#: acct_mgr/templates/verify_email.html:22
 msgid "Verify Email"
 msgstr "Verificar correo electrónico"
 
-#: acct_mgr/templates/verify_email.html:27
+#: acct_mgr/templates/verify_email.html:24
 #, python-format
 msgid ""
 "An email was sent to\n"
-"      %(email)s with a token to verify your new address.\n"
-"      Please check your email and enter the token in the form below."
+"        %(email)s with a token to verify your new address.\n"
+"        Please check your email and enter the token in the form below."
 msgstr ""
 "Se ha enviado un correo electrónico a %(email)s con una clave para "
 "verificar su nueva dirección. Por favor, compruebe su correo he "
 "introduzca la clave en el formulario de abajo."
 
-#: acct_mgr/templates/verify_email.html:30
+#: acct_mgr/templates/verify_email.html:27
 msgid ""
 "You can [1:change your\n"
-"      email address] if it is incorrect."
+"        email address], if it is incorrect."
 msgstr "Puede [1:cambiar su dirección de correo electrónico] si es incorrecta."
 
-#: acct_mgr/templates/verify_email.html:35
+#: acct_mgr/templates/verify_email.html:32
 msgid "Verification Token:"
 msgstr "Clave de verificación:"
 
-#: acct_mgr/templates/verify_email.html:39
+#: acct_mgr/templates/verify_email.html:36
 msgid "Verify"
 msgstr "Verificar"
 
-#: acct_mgr/templates/verify_email.html:41
+#: acct_mgr/templates/verify_email.html:38
 msgid "Resend Email"
 msgstr "Reenviar correo electrónico"
 

File acct_mgr/locale/messages.pot

 msgstr ""
 "Project-Id-Version: TracAccountManager 0.3\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2010-11-16 14:30+0100\n"
+"POT-Creation-Date: 2010-11-17 00:22+0100\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"
 msgstr ""
 
 #: acct_mgr/admin.py:115 acct_mgr/admin.py:117 acct_mgr/notification.py:170
-#: acct_mgr/templates/admin_users.html:14
+#: acct_mgr/templates/admin_users.html:11
 msgid "Accounts"
 msgstr ""
 
 "                              "
 msgstr ""
 
-#: acct_mgr/web_ui.py:206 acct_mgr/templates/admin_users.html:82
-#: acct_mgr/templates/prefs_account.html:44
+#: acct_mgr/web_ui.py:206 acct_mgr/templates/admin_users.html:79
+#: acct_mgr/templates/prefs_account.html:42
 msgid "Account"
 msgstr ""
 
 msgid "Password is incorrect."
 msgstr ""
 
-#: acct_mgr/web_ui.py:403 acct_mgr/templates/register.html:14
+#: acct_mgr/web_ui.py:403 acct_mgr/templates/register.html:11
 msgid "Register"
 msgstr ""
 
 msgid "Your permissions have been limited until you %(link)s."
 msgstr ""
 
-#. TRANSLATOR: ... verify your new email address
+#. TRANSLATOR: An email has been sent to %(email)s
+#. with a token to ... (the link label for following message)
 #: acct_mgr/web_ui.py:652
-#, python-format
-msgid "An email has been sent to %(email)s with a token to "
-msgstr ""
-
-#: acct_mgr/web_ui.py:653
 msgid "verify your new email address"
 msgstr ""
 
-#: acct_mgr/web_ui.py:664
+#. TRANSLATOR: ... verify your new email address
+#: acct_mgr/web_ui.py:655
+#, python-format
+msgid ""
+"An email has been sent to %(email)s with a token to\n"
+"                %(link)s."
+msgstr ""
+
+#: acct_mgr/web_ui.py:668
 msgid "Please log in to finish email verification procedure."
 msgstr ""
 
-#: acct_mgr/web_ui.py:668
+#: acct_mgr/web_ui.py:672
 msgid "Your email is already verified."
 msgstr ""
 
-#: acct_mgr/web_ui.py:676
+#: acct_mgr/web_ui.py:680
 #, python-format
 msgid "A notification email has been resent to <%s>."
 msgstr ""
 
-#: acct_mgr/web_ui.py:682
+#: acct_mgr/web_ui.py:686
 msgid "Thank you for verifying your email address."
 msgstr ""
 
-#: acct_mgr/web_ui.py:685
+#: acct_mgr/web_ui.py:689
 msgid "Invalid verification token"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsconfig.html:14
-#: acct_mgr/templates/admin_accountsconfig.html:18
+#: acct_mgr/templates/admin_accountsconfig.html:11
+#: acct_mgr/templates/admin_accountsconfig.html:15
 msgid "Accounts: Configuration"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsconfig.html:44
+#: acct_mgr/templates/admin_accountsconfig.html:40
 msgid "Persistent Sessions"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsconfig.html:47
+#: acct_mgr/templates/admin_accountsconfig.html:43
 msgid ""
 "Allow the user to be remembered across sessions without needing to\n"
 "          re-authenticate."
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsconfig.html:51
+#: acct_mgr/templates/admin_accountsconfig.html:47
 msgid ""
 "This is, user checks a \"Remember Me\"\n"
 "          [1:checkbox] and, next time he visits the site,\n"
 "          he'll be remembered and automatically authenticated."
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsconfig.html:58
+#: acct_mgr/templates/admin_accountsconfig.html:54
 msgid "Password Reset"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsconfig.html:61
+#: acct_mgr/templates/admin_accountsconfig.html:57
 msgid "Force users to change passwords after a password reset."
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsconfig.html:67
+#: acct_mgr/templates/admin_accountsconfig.html:63
 msgid "Verify email"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsconfig.html:70
+#: acct_mgr/templates/admin_accountsconfig.html:66
 msgid "Force users to verify their email addresses."
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsconfig.html:75
-#: acct_mgr/templates/admin_accountsnotification.html:49
+#: acct_mgr/templates/admin_accountsconfig.html:71
+#: acct_mgr/templates/admin_accountsnotification.html:48
 msgid "Save"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:14
-#: acct_mgr/templates/admin_accountsnotification.html:18
+#: acct_mgr/templates/admin_accountsnotification.html:11
+#: acct_mgr/templates/admin_accountsnotification.html:15
 msgid "Accounts: Notification Configuration"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:21
+#: acct_mgr/templates/admin_accountsnotification.html:19
 msgid "Account Notification"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:22
+#: acct_mgr/templates/admin_accountsnotification.html:20
 msgid ""
 "Set the following options in order to be notified of\n"
-"        account creation, password reset and account deletion."
+"          account creation, password reset and account deletion."
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:25
+#: acct_mgr/templates/admin_accountsnotification.html:23
 msgid "Notification Actions"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:26
+#: acct_mgr/templates/admin_accountsnotification.html:24
 msgid ""
 "This is a list of actions which you can\n"
 "          enable or disable by [1:checking] the [2:checkboxes]."
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:30
+#: acct_mgr/templates/admin_accountsnotification.html:28
 msgid "Get notified of new account creation"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:34
+#: acct_mgr/templates/admin_accountsnotification.html:32
 msgid "Get notified of password reset"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:38
+#: acct_mgr/templates/admin_accountsnotification.html:36
 msgid "Get notified of account deletion"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:41
+#: acct_mgr/templates/admin_accountsnotification.html:39
 msgid "Notification Recipient Addresses"
 msgstr ""
 
-#: acct_mgr/templates/admin_accountsnotification.html:42
+#: acct_mgr/templates/admin_accountsnotification.html:40
 msgid ""
 "Space-separated list of email addresses and/or\n"
-"        usernames that get notified of the above actions:"
+"          usernames that get notified of the above actions:"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:18
+#: acct_mgr/templates/admin_users.html:15
 msgid "Manage User Accounts"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:25
+#: acct_mgr/templates/admin_users.html:22
 msgid "Add Account:"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:27
-#: acct_mgr/templates/admin_users.html:55 acct_mgr/templates/login.html:35
-#: acct_mgr/templates/register.html:36
+#: acct_mgr/templates/admin_users.html:24
+#: acct_mgr/templates/admin_users.html:52 acct_mgr/templates/login.html:32
+#: acct_mgr/templates/register.html:33
 #: acct_mgr/templates/reset_password.html:50
 msgid "Username:"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:30
-#: acct_mgr/templates/admin_users.html:58 acct_mgr/templates/login.html:39
-#: acct_mgr/templates/prefs_account.html:30
-#: acct_mgr/templates/register.html:41
+#: acct_mgr/templates/admin_users.html:27
+#: acct_mgr/templates/admin_users.html:55 acct_mgr/templates/login.html:37
+#: acct_mgr/templates/prefs_account.html:27
+#: acct_mgr/templates/register.html:39
 msgid "Password:"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:33
-#: acct_mgr/templates/admin_users.html:61
-#: acct_mgr/templates/prefs_account.html:73
-#: acct_mgr/templates/register.html:46
+#: acct_mgr/templates/admin_users.html:30
+#: acct_mgr/templates/admin_users.html:58
+#: acct_mgr/templates/prefs_account.html:71
+#: acct_mgr/templates/register.html:45
 msgid "Confirm Password:"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:36
-#: acct_mgr/templates/register.html:66
+#: acct_mgr/templates/admin_users.html:33
+#: acct_mgr/templates/register.html:67
 msgid "Name:"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:39
-#: acct_mgr/templates/register.html:52 acct_mgr/templates/register.html:71
+#: acct_mgr/templates/admin_users.html:36
+#: acct_mgr/templates/register.html:51 acct_mgr/templates/register.html:73
 msgid "Email:"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:41
+#: acct_mgr/templates/admin_users.html:38
 msgid "Add a new user account."
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:43
+#: acct_mgr/templates/admin_users.html:40
 msgid " Add "
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:53
+#: acct_mgr/templates/admin_users.html:50
 msgid "Change Password:"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:63
+#: acct_mgr/templates/admin_users.html:60
 msgid "Change a user's password."
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:65
+#: acct_mgr/templates/admin_users.html:62
 msgid " Change "
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:73
+#: acct_mgr/templates/admin_users.html:70
 msgid "This password store does not support listing users."
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Name"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Email"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Last Login"
 msgstr ""
 
-#: acct_mgr/templates/admin_users.html:98
+#: acct_mgr/templates/admin_users.html:95
 msgid "Remove selected accounts"
 msgstr ""
 
-#: acct_mgr/templates/login.html:14 acct_mgr/templates/login.html:25
+#: acct_mgr/templates/login.html:11 acct_mgr/templates/login.html:22
 #: acct_mgr/templates/login.html:46
 msgid "Login"
 msgstr ""
 
-#: acct_mgr/templates/login.html:28
-#: acct_mgr/templates/prefs_account.html:23
-#: acct_mgr/templates/prefs_account.html:49
-#: acct_mgr/templates/prefs_account.html:56
-#: acct_mgr/templates/register.html:27
+#: acct_mgr/templates/login.html:25
+#: acct_mgr/templates/prefs_account.html:20
+#: acct_mgr/templates/prefs_account.html:47
+#: acct_mgr/templates/prefs_account.html:54
+#: acct_mgr/templates/register.html:24
 #: acct_mgr/templates/reset_password.html:42
 msgid "Error"
 msgstr ""
 msgid "Remember me"
 msgstr ""
 
-#: acct_mgr/templates/prefs_account.html:20
+#: acct_mgr/templates/prefs_account.html:17
 msgid "Delete Account"
 msgstr ""
 
-#: acct_mgr/templates/prefs_account.html:37
+#: acct_mgr/templates/prefs_account.html:34
 msgid "Delete account"
 msgstr ""
 
-#: acct_mgr/templates/prefs_account.html:53
+#: acct_mgr/templates/prefs_account.html:51
 msgid "Change Password"
 msgstr ""
 
-#: acct_mgr/templates/prefs_account.html:61
+#: acct_mgr/templates/prefs_account.html:59
 msgid "Old Password:"
 msgstr ""
 
-#: acct_mgr/templates/prefs_account.html:67
+#: acct_mgr/templates/prefs_account.html:65
 msgid "New Password:"
 msgstr ""
 
-#: acct_mgr/templates/register.html:24
+#: acct_mgr/templates/register.html:21
 msgid "Register an account"
 msgstr ""
 
-#: acct_mgr/templates/register.html:33
+#: acct_mgr/templates/register.html:30
 msgid "Required"
 msgstr ""
 
 #: acct_mgr/templates/register.html:55
 msgid ""
 "The email address is required for Trac to send you a\n"
-"              verification code."
+"              verification token."
 msgstr ""
 
 #: acct_mgr/templates/register.html:58
 "forget it."
 msgstr ""
 
-#: acct_mgr/templates/register.html:64
+#: acct_mgr/templates/register.html:65
 msgid "Optional"
 msgstr ""
 
-#: acct_mgr/templates/register.html:74
+#: acct_mgr/templates/register.html:77
 msgid ""
 "Entering your email address\n"
 "              will enable you to reset your password if you ever "
 "forget it."
 msgstr ""
 
-#: acct_mgr/templates/register.html:79
+#: acct_mgr/templates/register.html:82
 msgid "Create account"
 msgstr ""
 
-#: acct_mgr/templates/reset_password.html:14
-#: acct_mgr/templates/reset_password.html:24
+#: acct_mgr/templates/reset_password.html:11
+#: acct_mgr/templates/reset_password.html:21
 msgid "Reset Password"
 msgstr ""
 
-#: acct_mgr/templates/reset_password.html:28
+#: acct_mgr/templates/reset_password.html:25
 msgid "Already logged in"
 msgstr ""
 
-#: acct_mgr/templates/reset_password.html:29
+#: acct_mgr/templates/reset_password.html:26
 msgid ""
-"You're already logged in.  If you need to change\n"
-"        your password please use the\n"
-"        [1:Account Preferences] page."
+"You're already logged in. If you need to change\n"
+"          your password please use the\n"
+"          [1:Account Preferences] page."
 msgstr ""
 
-#: acct_mgr/templates/reset_password.html:34
-msgid "A new password has been emailed to you at"
+#: acct_mgr/templates/reset_password.html:32
+#, python-format
+msgid ""
+"A new password\n"
+"        has been emailed to you at %(email)s ."
 msgstr ""
 
-#: acct_mgr/templates/reset_password.html:38
+#: acct_mgr/templates/reset_password.html:37
 msgid ""
-"If you've forgot your password enter your username and\n"
-"      email address below and you'll be emailed a new password."
+"If you've forgotten your password, enter your username and\n"
+"        email address below and you'll be emailed a new password."
 msgstr ""
 
 #: acct_mgr/templates/reset_password.html:55
 msgid "Reset password"
 msgstr ""
 
-#: acct_mgr/templates/verify_email.html:14
-#: acct_mgr/templates/verify_email.html:25
+#: acct_mgr/templates/verify_email.html:11
+#: acct_mgr/templates/verify_email.html:22
 msgid "Verify Email"
 msgstr ""
 
-#: acct_mgr/templates/verify_email.html:27
+#: acct_mgr/templates/verify_email.html:24
 #, python-format
 msgid ""
 "An email was sent to\n"
-"      %(email)s with a token to verify your new address.\n"
-"      Please check your email and enter the token in the form below."
+"        %(email)s with a token to verify your new address.\n"
+"        Please check your email and enter the token in the form below."
 msgstr ""
 
-#: acct_mgr/templates/verify_email.html:30
+#: acct_mgr/templates/verify_email.html:27
 msgid ""
 "You can [1:change your\n"
-"      email address] if it is incorrect."
+"        email address], if it is incorrect."
 msgstr ""
 
-#: acct_mgr/templates/verify_email.html:35
+#: acct_mgr/templates/verify_email.html:32
 msgid "Verification Token:"
 msgstr ""
 
-#: acct_mgr/templates/verify_email.html:39
+#: acct_mgr/templates/verify_email.html:36
 msgid "Verify"
 msgstr ""
 
-#: acct_mgr/templates/verify_email.html:41
+#: acct_mgr/templates/verify_email.html:38
 msgid "Resend Email"
 msgstr ""
 

File acct_mgr/locale/ru/LC_MESSAGES/acct_mgr.po

 msgstr ""
 "Project-Id-Version: TracAccountManager 0.3\n"
 "Report-Msgid-Bugs-To: hoff.st@shaas.net\n"
-"POT-Creation-Date: 2010-11-16 14:30+0100\n"
+"POT-Creation-Date: 2010-11-17 00:22+0100\n"
 "PO-Revision-Date: 2010-10-24 20:24+0300\n"
 "Last-Translator: Dmitri Bogomolov <4glitch@gmail.com>\n"
 "Language-Team: ru <LL@li.org>\n"
 msgstr "Недопустимый тип ключа (%s) для StoreOrder"
 
 #: acct_mgr/admin.py:115 acct_mgr/admin.py:117 acct_mgr/notification.py:170
-#: acct_mgr/templates/admin_users.html:14
+#: acct_mgr/templates/admin_users.html:11
 msgid "Accounts"
 msgstr "Учетные записи"
 
 "Указанный электронный адрес уже используется. Пожалуйста, укажите другой "
 "адрес."
 
-#: acct_mgr/web_ui.py:206 acct_mgr/templates/admin_users.html:82
-#: acct_mgr/templates/prefs_account.html:44
+#: acct_mgr/web_ui.py:206 acct_mgr/templates/admin_users.html:79
+#: acct_mgr/templates/prefs_account.html:42
 msgid "Account"
 msgstr "Учетная запись"
 
 msgid "Password is incorrect."
 msgstr "Неправильный пароль."
 
-#: acct_mgr/web_ui.py:403 acct_mgr/templates/register.html:14
+#: acct_mgr/web_ui.py:403 acct_mgr/templates/register.html:11
 msgid "Register"
 msgstr "Регистрация"
 
 #: acct_mgr/web_ui.py:624
 #, python-format
 msgid "Your permissions have been limited until you %(link)s."
-msgstr "Ваши разрешения ограничены до тех пор, пока вы не %(link)s"
+msgstr "Ваши разрешения ограничены до тех пор, пока вы не %(link)s."
 
-#. TRANSLATOR: ... verify your new email address
+#. TRANSLATOR: An email has been sent to %(email)s
+#. with a token to ... (the link label for following message)
 #: acct_mgr/web_ui.py:652
-#, python-format
-msgid "An email has been sent to %(email)s with a token to "
-msgstr "На адрес %(email)s выслано письмо со словом для "
-
-#: acct_mgr/web_ui.py:653
 msgid "verify your new email address"
 msgstr "проверки вашего нового электронного адреса"
 
-#: acct_mgr/web_ui.py:664
+#. TRANSLATOR: ... verify your new email address
+#: acct_mgr/web_ui.py:655
+#, python-format
+msgid ""
+"An email has been sent to %(email)s with a token to\n"
+"                %(link)s."
+msgstr "На адрес %(email)s выслано письмо со словом для %(link)s."
+
+#: acct_mgr/web_ui.py:668
 msgid "Please log in to finish email verification procedure."
 msgstr "Для завершения проверки электронного адреса пожалуйста выполните вход."
 
-#: acct_mgr/web_ui.py:668
+#: acct_mgr/web_ui.py:672
 msgid "Your email is already verified."
 msgstr "Ваш адрес уже проверен"
 
-#: acct_mgr/web_ui.py:676
+#: acct_mgr/web_ui.py:680
 #, python-format
 msgid "A notification email has been resent to <%s>."
 msgstr "Уведомление повторно отправлено  <%s>."
 
-#: acct_mgr/web_ui.py:682
+#: acct_mgr/web_ui.py:686
 msgid "Thank you for verifying your email address."
 msgstr "Спасибо за подтверждение электронного адреса"
 
-#: acct_mgr/web_ui.py:685
+#: acct_mgr/web_ui.py:689
 msgid "Invalid verification token"
 msgstr "Неправильное проверочное слово"
 
-#: acct_mgr/templates/admin_accountsconfig.html:14
-#: acct_mgr/templates/admin_accountsconfig.html:18
+#: acct_mgr/templates/admin_accountsconfig.html:11
+#: acct_mgr/templates/admin_accountsconfig.html:15
 msgid "Accounts: Configuration"
 msgstr "Учетные записи: настройки"
 
-#: acct_mgr/templates/admin_accountsconfig.html:44
+#: acct_mgr/templates/admin_accountsconfig.html:40
 msgid "Persistent Sessions"
 msgstr "Хранимые сеансы"
 
-#: acct_mgr/templates/admin_accountsconfig.html:47
+#: acct_mgr/templates/admin_accountsconfig.html:43
 msgid ""
 "Allow the user to be remembered across sessions without needing to\n"
 "          re-authenticate."
 "Разрешить запоминать пользователей между посещениями и осуществлять вход "
 "без повторной аутентификации?"
 
-#: acct_mgr/templates/admin_accountsconfig.html:51
+#: acct_mgr/templates/admin_accountsconfig.html:47
 msgid ""
 "This is, user checks a \"Remember Me\"\n"
 "          [1:checkbox] and, next time he visits the site,\n"
 "Пользователь ставит [1:флажок] \"Запомнить меня\", и в следующий раз, "
 "когда он открывает сайт, его сеанс будет возобновлен автоматически."
 
-#: acct_mgr/templates/admin_accountsconfig.html:58
+#: acct_mgr/templates/admin_accountsconfig.html:54
 msgid "Password Reset"
 msgstr "Сброс пароля"
 
-#: acct_mgr/templates/admin_accountsconfig.html:61
+#: acct_mgr/templates/admin_accountsconfig.html:57
 msgid "Force users to change passwords after a password reset."
 msgstr "Заставить пользователей менять пароль после его сброса."
 
-#: acct_mgr/templates/admin_accountsconfig.html:67
+#: acct_mgr/templates/admin_accountsconfig.html:63
 msgid "Verify email"
 msgstr "Подтверждения адреса"
 
-#: acct_mgr/templates/admin_accountsconfig.html:70
+#: acct_mgr/templates/admin_accountsconfig.html:66
 msgid "Force users to verify their email addresses."
 msgstr "Заставить пользователей подтверждать свой электронный адрес."
 
-#: acct_mgr/templates/admin_accountsconfig.html:75
-#: acct_mgr/templates/admin_accountsnotification.html:49
+#: acct_mgr/templates/admin_accountsconfig.html:71
+#: acct_mgr/templates/admin_accountsnotification.html:48
 msgid "Save"
 msgstr "Сохранить"
 
-#: acct_mgr/templates/admin_accountsnotification.html:14
-#: acct_mgr/templates/admin_accountsnotification.html:18
+#: acct_mgr/templates/admin_accountsnotification.html:11
+#: acct_mgr/templates/admin_accountsnotification.html:15
 msgid "Accounts: Notification Configuration"
 msgstr "Учетные записи: настройки уведомлений"
 
-#: acct_mgr/templates/admin_accountsnotification.html:21
+#: acct_mgr/templates/admin_accountsnotification.html:19
 msgid "Account Notification"
 msgstr "Уведомления"
 
-#: acct_mgr/templates/admin_accountsnotification.html:22
+#: acct_mgr/templates/admin_accountsnotification.html:20
 msgid ""
 "Set the following options in order to be notified of\n"
-"        account creation, password reset and account deletion."
+"          account creation, password reset and account deletion."
 msgstr ""
 "Выберите из следующих пунктов, чтобы получать уведомления о создании "
 "пользователей, сбросе пароля и удалении пользователей."
 
-#: acct_mgr/templates/admin_accountsnotification.html:25
+#: acct_mgr/templates/admin_accountsnotification.html:23
 msgid "Notification Actions"
 msgstr "Варианты уведомлений"
 
-#: acct_mgr/templates/admin_accountsnotification.html:26
+#: acct_mgr/templates/admin_accountsnotification.html:24
 msgid ""
 "This is a list of actions which you can\n"
 "          enable or disable by [1:checking] the [2:checkboxes]."
 "Здесь перечень действий, которые вы можете включить или выключить, "
 "[1:установкой] [2:флажков]."
 
-#: acct_mgr/templates/admin_accountsnotification.html:30
+#: acct_mgr/templates/admin_accountsnotification.html:28
 msgid "Get notified of new account creation"
 msgstr "Уведомлять о создании новых пользователей"
 
-#: acct_mgr/templates/admin_accountsnotification.html:34
+#: acct_mgr/templates/admin_accountsnotification.html:32
 msgid "Get notified of password reset"
 msgstr "Уведомлять о сбросе паролей"
 
-#: acct_mgr/templates/admin_accountsnotification.html:38
+#: acct_mgr/templates/admin_accountsnotification.html:36
 msgid "Get notified of account deletion"
 msgstr "Уведомлять об удалении учетных записей"
 
-#: acct_mgr/templates/admin_accountsnotification.html:41
+#: acct_mgr/templates/admin_accountsnotification.html:39
 msgid "Notification Recipient Addresses"
 msgstr "Адреса получателей уведомлений"
 
-#: acct_mgr/templates/admin_accountsnotification.html:42
+#: acct_mgr/templates/admin_accountsnotification.html:40
 msgid ""
 "Space-separated list of email addresses and/or\n"
-"        usernames that get notified of the above actions:"
+"          usernames that get notified of the above actions:"
 msgstr ""
 "Список электронных адресов и/или имен пользователей, которые уведомляются"
 " об этих действиях (через пробел):"
 
-#: acct_mgr/templates/admin_users.html:18
+#: acct_mgr/templates/admin_users.html:15
 msgid "Manage User Accounts"
 msgstr "Управление пользователями"
 
-#: acct_mgr/templates/admin_users.html:25
+#: acct_mgr/templates/admin_users.html:22
 msgid "Add Account:"
 msgstr "Добавить пользователя:"
 
-#: acct_mgr/templates/admin_users.html:27
-#: acct_mgr/templates/admin_users.html:55 acct_mgr/templates/login.html:35
-#: acct_mgr/templates/register.html:36
+#: acct_mgr/templates/admin_users.html:24
+#: acct_mgr/templates/admin_users.html:52 acct_mgr/templates/login.html:32
+#: acct_mgr/templates/register.html:33
 #: acct_mgr/templates/reset_password.html:50
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: acct_mgr/templates/admin_users.html:30
-#: acct_mgr/templates/admin_users.html:58 acct_mgr/templates/login.html:39
-#: acct_mgr/templates/prefs_account.html:30 acct_mgr/templates/register.html:41
+#: acct_mgr/templates/admin_users.html:27
+#: acct_mgr/templates/admin_users.html:55 acct_mgr/templates/login.html:37
+#: acct_mgr/templates/prefs_account.html:27 acct_mgr/templates/register.html:39
 msgid "Password:"
 msgstr "Пароль:"
 
-#: acct_mgr/templates/admin_users.html:33
-#: acct_mgr/templates/admin_users.html:61
-#: acct_mgr/templates/prefs_account.html:73 acct_mgr/templates/register.html:46
+#: acct_mgr/templates/admin_users.html:30
+#: acct_mgr/templates/admin_users.html:58
+#: acct_mgr/templates/prefs_account.html:71 acct_mgr/templates/register.html:45
 msgid "Confirm Password:"
 msgstr "Подтверждение пароля:"
 
-#: acct_mgr/templates/admin_users.html:36 acct_mgr/templates/register.html:66
+#: acct_mgr/templates/admin_users.html:33 acct_mgr/templates/register.html:67
 msgid "Name:"
 msgstr "Имя:"
 
-#: acct_mgr/templates/admin_users.html:39 acct_mgr/templates/register.html:52
-#: acct_mgr/templates/register.html:71
+#: acct_mgr/templates/admin_users.html:36 acct_mgr/templates/register.html:51
+#: acct_mgr/templates/register.html:73
 msgid "Email:"
 msgstr "Электронный адрес:"
 
-#: acct_mgr/templates/admin_users.html:41
+#: acct_mgr/templates/admin_users.html:38
 msgid "Add a new user account."
 msgstr "Добавить нового пользователя."
 
-#: acct_mgr/templates/admin_users.html:43
+#: acct_mgr/templates/admin_users.html:40
 msgid " Add "
 msgstr " Добавить "
 
-#: acct_mgr/templates/admin_users.html:53
+#: acct_mgr/templates/admin_users.html:50
 msgid "Change Password:"
 msgstr "Изменить пароль:"
 
-#: acct_mgr/templates/admin_users.html:63
+#: acct_mgr/templates/admin_users.html:60
 msgid "Change a user's password."
 msgstr "Изменить пароль пользователя."
 
-#: acct_mgr/templates/admin_users.html:65
+#: acct_mgr/templates/admin_users.html:62
 msgid " Change "
 msgstr " Изменить "
 
-#: acct_mgr/templates/admin_users.html:73
+#: acct_mgr/templates/admin_users.html:70
 msgid "This password store does not support listing users."
 msgstr "Это хранилище паролей не поддерживает перечисление пользователей"
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Name"
 msgstr "Имя"
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Email"
 msgstr "Электронный адрес"
 
-#: acct_mgr/templates/admin_users.html:82
+#: acct_mgr/templates/admin_users.html:79
 msgid "Last Login"
 msgstr "Последний вход"
 
-#: acct_mgr/templates/admin_users.html:98
+#: acct_mgr/templates/admin_users.html:95
 msgid "Remove selected accounts"
 msgstr "Удалить выбранных"
 
-#: acct_mgr/templates/login.html:14 acct_mgr/templates/login.html:25
+#: acct_mgr/templates/login.html:11 acct_mgr/templates/login.html:22
 #: acct_mgr/templates/login.html:46
 msgid "Login"
 msgstr "Вход"
 
-#: acct_mgr/templates/login.html:28 acct_mgr/templates/prefs_account.html:23
-#: acct_mgr/templates/prefs_account.html:49
-#: acct_mgr/templates/prefs_account.html:56 acct_mgr/templates/register.html:27
+#: acct_mgr/templates/login.html:25 acct_mgr/templates/prefs_account.html:20
+#: acct_mgr/templates/prefs_account.html:47
+#: acct_mgr/templates/prefs_account.html:54 acct_mgr/templates/register.html:24
 #: acct_mgr/templates/reset_password.html:42
 msgid "Error"
 msgstr "Ошибка"
 msgid "Remember me"
 msgstr "Запомнить меня"
 
-#: acct_mgr/templates/prefs_account.html:20
+#: acct_mgr/templates/prefs_account.html:17
 msgid "Delete Account"
 msgstr "Удалить учетную запись"
 
-#: acct_mgr/templates/prefs_account.html:37
+#: acct_mgr/templates/prefs_account.html:34
 msgid "Delete account"
 msgstr "Удалить учетную запись"
 
-#: acct_mgr/templates/prefs_account.html:53
+#: acct_mgr/templates/prefs_account.html:51
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: acct_mgr/templates/prefs_account.html:61
+#: acct_mgr/templates/prefs_account.html:59
 msgid "Old Password:"
 msgstr "Старый пароль:"
 
-#: acct_mgr/templates/prefs_account.html:67
+#: acct_mgr/templates/prefs_account.html:65
 msgid "New Password:"
 msgstr "Новый пароль:"
 
-#: acct_mgr/templates/register.html:24
+#: acct_mgr/templates/register.html:21
 msgid "Register an account"
 msgstr "Зарегистрировать учетную запись"
 
-#: acct_mgr/templates/register.html:33
+#: acct_mgr/templates/register.html:30
 msgid "Required"
 msgstr "Обязательно"
 
 #: acct_mgr/templates/register.html:55
 msgid ""
 "The email address is required for Trac to send you a\n"
-"              verification code."
+"              verification token."
 msgstr "Trac необходим электронный адрес, для отправки кода подтверждения."
 
 #: acct_mgr/templates/register.html:58
 "Ввод электронного адреса также позволит осуществить сброс пароля, если вы"
 " когда-нибудь его забудете."
 
-#: acct_mgr/templates/register.html:64
+#: acct_mgr/templates/register.html:65
 msgid "Optional"
 msgstr "На выбор"
 
-#: acct_mgr/templates/register.html:74
+#: acct_mgr/templates/register.html:77
 msgid ""
 "Entering your email address\n"
 "              will enable you to reset your password if you ever forget "
 "Ввод электронного адреса позволит осуществить сброс пароля, если вы "
 "когда-нибудь его забудете."
 
-#: acct_mgr/templates/register.html:79
+#: acct_mgr/templates/register.html:82
 msgid "Create account"
 msgstr "Создать учетную запись"
 
-#: acct_mgr/templates/reset_password.html:14
-#: acct_mgr/templates/reset_password.html:24
+#: acct_mgr/templates/reset_password.html:11
+#: acct_mgr/templates/reset_password.html:21
 msgid "Reset Password"
 msgstr "Сбросить пароль"
 
-#: acct_mgr/templates/reset_password.html:28
+#: acct_mgr/templates/reset_password.html:25
 msgid "Already logged in"
 msgstr "Вы уже вошли"
 
-#: acct_mgr/templates/reset_password.html:29
+#: acct_mgr/templates/reset_password.html:26
 msgid ""
-"You're already logged in.  If you need to change\n"
-"        your password please use the\n"
-"        [1:Account Preferences] page."
+"You're already logged in. If you need to change\n"
+"          your password please use the\n"
+"          [1:Account Preferences] page."
 msgstr ""
 "Вы уже вошли. Если вам нужно сменить пароль, используйте страницу "
 "[1:Предпочтения]."
 
-#: acct_mgr/templates/reset_password.html:34
-msgid "A new password has been emailed to you at"
-msgstr "Новый пароль отправлен на ваш адрес"
+#: acct_mgr/templates/reset_password.html:32
+#, python-format
+msgid ""
+"A new password\n"
+"        has been emailed to you at %(email)s ."
+msgstr "Новый пароль отправлен на ваш адрес %(email)s ."
 
-#: acct_mgr/templates/reset_password.html:38
+#: acct_mgr/templates/reset_password.html:37
 msgid ""
-"If you've forgot your password enter your username and\n"
-"      email address below and you'll be emailed a new password."
+"If you've forgotten your password, enter your username and\n"
+"        email address below and you'll be emailed a new password."
 msgstr ""
 "Если вы забыли пароль, введите ваше имя пользователя и почтовый адрес "
 "ниже, и вам будет выслан новый пароль."
 msgid "Reset password"
 msgstr "Сброс пароля"
 
-#: acct_mgr/templates/verify_email.html:14
-#: acct_mgr/templates/verify_email.html:25
+#: acct_mgr/templates/verify_email.html:11
+#: acct_mgr/templates/verify_email.html:22
 msgid "Verify Email"
 msgstr "Подтверждения адреса"
 
-#: acct_mgr/templates/verify_email.html:27
+#: acct_mgr/templates/verify_email.html:24