aboutsummaryrefslogtreecommitdiffstats
path: root/lib/CatDap/I18N/messages.pot
diff options
context:
space:
mode:
Diffstat (limited to 'lib/CatDap/I18N/messages.pot')
-rw-r--r--lib/CatDap/I18N/messages.pot58
1 files changed, 33 insertions, 25 deletions
diff --git a/lib/CatDap/I18N/messages.pot b/lib/CatDap/I18N/messages.pot
index 295da82..b972de9 100644
--- a/lib/CatDap/I18N/messages.pot
+++ b/lib/CatDap/I18N/messages.pot
@@ -19,7 +19,7 @@ msgstr ""
msgid "Activation"
msgstr ""
-#: root/admin/account_addoc.tt:28 root/admin/account_modify.tt:24 root/admin/group_modify.tt:18 root/user/index.tt:19 root/user/index.tt:46
+#: root/admin/account_addoc.tt:28 root/admin/account_modify.tt:24 root/admin/group_modify.tt:18 root/user/index.tt:19 root/user/index.tt:48
msgid "Add"
msgstr ""
@@ -54,12 +54,12 @@ msgid "An error occured sending the email, but your account was created. Please
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/admin.pm:539
+#: lib/CatDap/Controller/admin.pm:548
msgid "An error occured sending the email, but your account was created. Please try the password recovery process if you entered the correct email address: %1"
msgstr ""
#. ($errors)
-#: lib/CatDap/Controller/forgot_password.pm:105
+#: lib/CatDap/Controller/forgot_password.pm:110
msgid "An error occured sending the email, please try again later. Errors %1"
msgstr ""
@@ -75,7 +75,7 @@ msgstr ""
msgid "Captcha"
msgstr ""
-#: root/user/firstlogin.tt:14 root/user/password.tt:19
+#: root/user/firstlogin.tt:14 root/user/password.tt:15
msgid "Change"
msgstr ""
@@ -117,7 +117,7 @@ msgstr ""
msgid "Email"
msgstr ""
-#: root/forgot_password/index.tt:11 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:21
msgid "Email address"
msgstr ""
@@ -133,6 +133,10 @@ msgstr ""
msgid "Enter text"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:62 lib/CatDap/Controller/forgot_password.pm:76
+msgid "Error while searching for account: "
+msgstr ""
+
#: root/admin/account.tt:34 root/admin/account_promote.tt:7
msgid "First Name"
msgstr ""
@@ -141,15 +145,15 @@ msgstr ""
msgid "First name"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:94
-msgid "Forgot password"
+#: root/forgot_password/index.tt:2
+msgid "Forgot your password?"
msgstr ""
-#: root/forgot_password/index.tt:5
-msgid "Forgot your password?"
+#: lib/CatDap/Controller/forgot_password.pm:98
+msgid "Forgotten password"
msgstr ""
-#: root/index.tt:17 root/index.tt:18
+#: root/index.tt:17
msgid "Forgotten password?"
msgstr ""
@@ -169,7 +173,7 @@ msgstr ""
msgid "Groups"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:48 lib/CatDap/Controller/register.pm:52
+#: lib/CatDap/Controller/register.pm:52
msgid "Incorrect validation text, please try again"
msgstr ""
@@ -193,11 +197,11 @@ msgstr ""
msgid "Login"
msgstr ""
-#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:10
+#: root/forgot_password/confirm.tt:8 root/user/firstlogin.tt:5 root/user/password.tt:9
msgid "New Password"
msgstr ""
-#: lib/CatDap/Controller/user.pm:296
+#: lib/CatDap/Controller/user.pm:295
msgid "New passwords dont match"
msgstr ""
@@ -206,14 +210,14 @@ msgid "Operation was successful."
msgstr ""
#: root/index.tt:10
-msgid "Password"
+msgid "Password : "
msgstr ""
-#: lib/CatDap/Controller/user.pm:290
+#: lib/CatDap/Controller/user.pm:289
msgid "Password incorrect"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:542
+#: lib/CatDap/Controller/admin.pm:551
msgid "Password reset and email sent"
msgstr ""
@@ -233,6 +237,10 @@ msgstr ""
msgid "Primary group"
msgstr ""
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid "Privileged accounts may not recover passwords via this mechanism"
+msgstr ""
+
#: root/admin/account_modify.tt:71
msgid "Promote"
msgstr ""
@@ -253,11 +261,11 @@ msgstr ""
msgid "Registration was successful."
msgstr ""
-#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:15
+#: root/forgot_password/confirm.tt:11 root/user/firstlogin.tt:10 root/user/password.tt:12
msgid "Repeat New Password"
msgstr ""
-#: root/admin/account_modify.tt:1
+#: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
msgid "Reset password"
msgstr ""
@@ -273,10 +281,6 @@ msgstr ""
msgid "Select"
msgstr ""
-#: root/forgot_password/index.tt:18
-msgid "Send me my password"
-msgstr ""
-
#: root/forgot_password/confirm.tt:16
msgid "Set new password"
msgstr ""
@@ -297,7 +301,7 @@ msgstr ""
msgid "The surname supplied contains illegal characters"
msgstr ""
-#: lib/CatDap/Controller/forgot_password.pm:66
+#: lib/CatDap/Controller/forgot_password.pm:67
msgid "This email address is not bound to an account"
msgstr ""
@@ -313,10 +317,14 @@ msgstr ""
msgid "Update"
msgstr ""
-#: root/admin/account.tt:32 root/admin/account.tt:7 root/admin/account_promote.tt:5 root/index.tt:6 root/register/index.tt:7 root/register/index.tt:8
+#: root/admin/account.tt:32 root/admin/account.tt:7 root/admin/account_promote.tt:5 root/register/index.tt:7 root/register/index.tt:8
msgid "Username"
msgstr ""
+#: root/index.tt:6
+msgid "Username : "
+msgstr ""
+
#: lib/CatDap/Controller/register.pm:65
msgid "Username is not authorized to be used"
msgstr ""
@@ -368,7 +376,7 @@ msgstr ""
msgid "member"
msgstr ""
-#: lib/CatDap/Controller/admin.pm:526
+#: lib/CatDap/Controller/admin.pm:535
msgid "password reset"
msgstr ""