summaryrefslogtreecommitdiffstats
path: root/l10n/en_GB/core.po
diff options
context:
space:
mode:
Diffstat (limited to 'l10n/en_GB/core.po')
-rw-r--r--l10n/en_GB/core.po119
1 files changed, 69 insertions, 50 deletions
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index b844b623441..03aa5e36d77 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-06-08 01:54-0400\n"
-"PO-Revision-Date: 2014-06-07 06:12+0000\n"
+"POT-Creation-Date: 2014-06-15 01:54-0400\n"
+"PO-Revision-Date: 2014-06-15 05:54+0000\n"
"Last-Translator: I Robot\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -168,54 +168,85 @@ msgstr ""
msgid "Saving..."
msgstr "Saving..."
-#: js/js.js:1271
+#: js/js.js:1276
msgid "seconds ago"
msgstr "seconds ago"
-#: js/js.js:1272
+#: js/js.js:1277
msgid "%n minute ago"
msgid_plural "%n minutes ago"
msgstr[0] "%n minute ago"
msgstr[1] "%n minutes ago"
-#: js/js.js:1273
+#: js/js.js:1278
msgid "%n hour ago"
msgid_plural "%n hours ago"
msgstr[0] "%n hour ago"
msgstr[1] "%n hours ago"
-#: js/js.js:1274
+#: js/js.js:1279
msgid "today"
msgstr "today"
-#: js/js.js:1275
+#: js/js.js:1280
msgid "yesterday"
msgstr "yesterday"
-#: js/js.js:1276
+#: js/js.js:1281
msgid "%n day ago"
msgid_plural "%n days ago"
msgstr[0] "%n day ago"
msgstr[1] "%n days ago"
-#: js/js.js:1277
+#: js/js.js:1282
msgid "last month"
msgstr "last month"
-#: js/js.js:1278
+#: js/js.js:1283
msgid "%n month ago"
msgid_plural "%n months ago"
msgstr[0] "%n month ago"
msgstr[1] "%n months ago"
-#: js/js.js:1279
+#: js/js.js:1284
msgid "last year"
msgstr "last year"
-#: js/js.js:1280
+#: js/js.js:1285
msgid "years ago"
msgstr "years ago"
+#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:175
+msgid "Couldn't send reset email. Please contact your administrator."
+msgstr ""
+
+#: js/lostpassword.js:5
+msgid ""
+"The link to reset your password has been sent to your email. If you do not "
+"receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator."
+msgstr ""
+
+#: js/lostpassword.js:7
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset.<br />If "
+"you are not sure what to do, please contact your administrator before you "
+"continue. <br />Do you really want to continue?"
+msgstr ""
+
+#: js/lostpassword.js:10
+msgid "I know what I'm doing"
+msgstr ""
+
+#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
+msgid "Reset password"
+msgstr "Reset password"
+
+#: js/lostpassword.js:16
+msgid "Password can not be changed. Please contact your administrator."
+msgstr ""
+
#: js/oc-dialogs.js:109 js/oc-dialogs.js:250
msgid "Yes"
msgstr "Yes"
@@ -514,43 +545,40 @@ msgstr "The update was unsuccessful."
msgid "The update was successful. Redirecting you to ownCloud now."
msgstr "The update was successful. Redirecting you to ownCloud now."
-#: lostpassword/controller.php:70
+#: lostpassword/controller/lostcontroller.php:110
+msgid "Couldn't reset password because the token is invalid"
+msgstr ""
+
+#: lostpassword/controller/lostcontroller.php:136
+msgid "Couldn't send reset email. Please make sure your username is correct."
+msgstr ""
+
+#: lostpassword/controller/lostcontroller.php:151
+msgid ""
+"Couldn't send reset email because there is no email address for this "
+"username. Please contact your administrator."
+msgstr ""
+
+#: lostpassword/controller/lostcontroller.php:168
#, php-format
msgid "%s password reset"
msgstr "%s password reset"
-#: lostpassword/controller.php:72
-msgid ""
-"A problem has occurred whilst sending the email, please contact your "
-"administrator."
-msgstr "A problem has occurred whilst sending the email, please contact your administrator."
-
#: lostpassword/templates/email.php:2
msgid "Use the following link to reset your password: {link}"
msgstr "Use the following link to reset your password: {link}"
-#: lostpassword/templates/lostpassword.php:7
-msgid ""
-"The link to reset your password has been sent to your email.<br>If you do "
-"not receive it within a reasonable amount of time, check your spam/junk "
-"folders.<br>If it is not there ask your local administrator ."
-msgstr "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ."
-
-#: lostpassword/templates/lostpassword.php:15
-msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "Request failed!<br>Did you make sure your email/username was correct?"
-
-#: lostpassword/templates/lostpassword.php:18
+#: lostpassword/templates/lostpassword.php:6
msgid "You will receive a link to reset your password via Email."
msgstr "You will receive a link to reset your password via email."
-#: lostpassword/templates/lostpassword.php:21
-#: lostpassword/templates/lostpassword.php:23 templates/installation.php:51
+#: lostpassword/templates/lostpassword.php:8
+#: lostpassword/templates/lostpassword.php:9 templates/installation.php:51
#: templates/installation.php:54 templates/login.php:31 templates/login.php:35
msgid "Username"
msgstr "Username"
-#: lostpassword/templates/lostpassword.php:27
+#: lostpassword/templates/lostpassword.php:13
msgid ""
"Your files are encrypted. If you haven't enabled the recovery key, there "
"will be no way to get your data back after your password is reset. If you "
@@ -558,30 +586,21 @@ msgid ""
"continue. Do you really want to continue?"
msgstr "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?"
-#: lostpassword/templates/lostpassword.php:29
+#: lostpassword/templates/lostpassword.php:15
msgid "Yes, I really want to reset my password now"
msgstr "Yes, I really want to reset my password now"
-#: lostpassword/templates/lostpassword.php:32
+#: lostpassword/templates/lostpassword.php:18
msgid "Reset"
msgstr "Reset"
-#: lostpassword/templates/resetpassword.php:4
-msgid "Your password was reset"
-msgstr "Your password was reset"
-
#: lostpassword/templates/resetpassword.php:5
-msgid "To login page"
-msgstr "To login page"
-
-#: lostpassword/templates/resetpassword.php:8
-#: lostpassword/templates/resetpassword.php:10
msgid "New password"
msgstr "New password"
-#: lostpassword/templates/resetpassword.php:13
-msgid "Reset password"
-msgstr "Reset password"
+#: lostpassword/templates/resetpassword.php:6
+msgid "New Password"
+msgstr ""
#: setup/controller.php:140
#, php-format
@@ -808,8 +827,8 @@ msgid "Please contact your administrator."
msgstr "Please contact your administrator."
#: templates/login.php:50
-msgid "Lost your password?"
-msgstr "Lost your password?"
+msgid "Forgot your password? Reset it!"
+msgstr ""
#: templates/login.php:55
msgid "remember"