diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-01-17 14:47:29 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-01-17 14:47:29 +0100 |
| commit | 5cb08bb9cb6cf603d47a124ffa0ea60881f7de51 (patch) | |
| tree | 89ac0ff4115dc175cb79b35b4df837dab3f7df45 /settings/js/users.js | |
| parent | 299bb4d99db935bb529a30fe6ae0c9bc72344d69 (diff) | |
| parent | db353e14cce316b271d3bfcfdbc6989e146d4517 (diff) | |
| download | nextcloud-server-5cb08bb9cb6cf603d47a124ffa0ea60881f7de51.tar.gz nextcloud-server-5cb08bb9cb6cf603d47a124ffa0ea60881f7de51.zip | |
Merge branch 'master' into fileinfo
Conflicts:
tests/lib/files/cache/cache.php
Diffstat (limited to 'settings/js/users.js')
| -rw-r--r-- | settings/js/users.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/js/users.js b/settings/js/users.js index 5ae157b07c6..6886db668b5 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -44,7 +44,7 @@ var UserList = { // Provide user with option to undo $('#notification').data('deleteuser', true); - OC.Notification.showHtml(t('users', 'deleted') + ' ' + escapeHTML(uid) + '<span class="undo">' + t('users', 'undo') + '</span>'); + OC.Notification.showHtml(t('settings', 'deleted') + ' ' + escapeHTML(uid) + '<span class="undo">' + t('settings', 'undo') + '</span>'); }, /** |