diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-09-25 09:52:12 +0200 |
| commit | db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d (patch) | |
| tree | 0d8c9f25deb067ce23e901c72f2af842e9002341 /l10n/te/settings.po | |
| parent | 843f15f3489856b518a30de4c803740844232209 (diff) | |
| parent | 2d12e52769a30ba37d5760b1194f613bcc71035b (diff) | |
| download | nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.tar.gz nextcloud-server-db39fede97dc4d6b9a5caf739cb2c03b4dbdd21d.zip | |
Merge branch 'master' into appframework-master
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
Diffstat (limited to 'l10n/te/settings.po')
| -rw-r--r-- | l10n/te/settings.po | 41 |
1 files changed, 35 insertions, 6 deletions
diff --git a/l10n/te/settings.po b/l10n/te/settings.po index 38c9a149cc5..b9bb6933e6a 100644 --- a/l10n/te/settings.po +++ b/l10n/te/settings.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-16 11:33-0400\n" -"PO-Revision-Date: 2013-09-16 15:34+0000\n" +"POT-Creation-Date: 2013-09-20 10:45-0400\n" +"PO-Revision-Date: 2013-09-20 14:45+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgid "Unable to load list from App Store" msgstr "" #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17 -#: ajax/togglegroups.php:20 +#: ajax/togglegroups.php:20 changepassword/controller.php:55 msgid "Authentication error" msgstr "" @@ -84,6 +84,35 @@ msgstr "" msgid "Couldn't update app." msgstr "" +#: changepassword/controller.php:20 +msgid "Wrong password" +msgstr "" + +#: changepassword/controller.php:42 +msgid "No user supplied" +msgstr "" + +#: changepassword/controller.php:74 +msgid "" +"Please provide an admin recovery password, otherwise all user data will be " +"lost" +msgstr "" + +#: changepassword/controller.php:79 +msgid "" +"Wrong admin recovery password. Please check the password and try again." +msgstr "" + +#: changepassword/controller.php:87 +msgid "" +"Back-end doesn't support password change, but the users encryption key was " +"successfully updated." +msgstr "" + +#: changepassword/controller.php:92 changepassword/controller.php:103 +msgid "Unable to change password" +msgstr "" + #: js/apps.js:43 msgid "Update to {appversion}" msgstr "" @@ -128,15 +157,15 @@ msgstr "" msgid "Updated" msgstr "" -#: js/personal.js:217 +#: js/personal.js:220 msgid "Select a profile picture" msgstr "" -#: js/personal.js:262 +#: js/personal.js:265 msgid "Decrypting files... Please wait, this can take some time." msgstr "" -#: js/personal.js:284 +#: js/personal.js:287 msgid "Saving..." msgstr "" |