diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-31 23:34:12 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-31 23:34:12 +0100 |
commit | b1da1db0eb5d738d5d5e5379796c048614d2ba00 (patch) | |
tree | a0ad3610338ffc5c911554d2915ed77194957144 /l10n/hr/settings.po | |
parent | de00111c1f20b46814971e1e0afac37fcb5c2886 (diff) | |
parent | 317261d6dfa2b95234628c6e6649bcb94999552a (diff) | |
download | nextcloud-server-b1da1db0eb5d738d5d5e5379796c048614d2ba00.tar.gz nextcloud-server-b1da1db0eb5d738d5d5e5379796c048614d2ba00.zip |
Merge branch 'master' into from_live_to_on
Conflicts:
apps/files_external/js/google.js
Diffstat (limited to 'l10n/hr/settings.po')
-rw-r--r-- | l10n/hr/settings.po | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po index a8be98c5afb..247ce35fc2e 100644 --- a/l10n/hr/settings.po +++ b/l10n/hr/settings.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-01-30 00:23+0100\n" -"PO-Revision-Date: 2013-01-29 23:24+0000\n" +"POT-Creation-Date: 2013-01-31 00:27+0100\n" +"PO-Revision-Date: 2013-01-30 23:28+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -265,6 +265,14 @@ msgstr "Grupa Admin" msgid "Storage" msgstr "" +#: templates/users.php:97 +msgid "change display name" +msgstr "" + +#: templates/users.php:101 +msgid "set new password" +msgstr "" + #: templates/users.php:137 msgid "Default" msgstr "" |