diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-19 11:33:34 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-09-19 11:33:34 +0200 |
| commit | 1bba800e47517c6dcda834038794862ae73d682d (patch) | |
| tree | 9e5aa772bd6fec68dfc8b129f1c55429d2343b6f | |
| parent | ae97fad6322c94765ce7bed0b7c2278d5aa0e701 (diff) | |
| parent | eea02cee2fdec2fd40acf174349aab4e813658c9 (diff) | |
| download | nextcloud-server-1bba800e47517c6dcda834038794862ae73d682d.tar.gz nextcloud-server-1bba800e47517c6dcda834038794862ae73d682d.zip | |
Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
| -rw-r--r-- | apps/files/js/file-upload.js | 2 | ||||
| -rw-r--r-- | apps/files/js/files.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index cca256a5ab0..b52221ac1fc 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -169,7 +169,7 @@ OC.Upload = { }, /** * TODO checks the list of existing files prior to uploading and shows a simple dialog to choose - * skip all, replace all or choosw which files to keep + * skip all, replace all or choose which files to keep * @param {array} selection of files to upload * @param {object} callbacks - object with several callback methods * @param {function} callbacks.onNoConflicts diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 76f19b87cbc..ccb40e7216f 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -499,7 +499,7 @@ var folderDropOptions={ $('#notification').fadeIn(); } } else { - OC.dialogs.alert(t('Error moving file'), t('core', 'Error')); + OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error')); } }); }); @@ -537,7 +537,7 @@ var crumbDropOptions={ $('#notification').fadeIn(); } } else { - OC.dialogs.alert(t('Error moving file'), t('core', 'Error')); + OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error')); } }); }); |