diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-19 15:58:15 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-01-19 15:58:15 +0100 |
| commit | b8318e6df4ad8f2dcf466fa6b4d9c994c8943002 (patch) | |
| tree | 106c02fa35fbc0395252e49547f4b4cfd4433485 /apps/files/js/files.js | |
| parent | 1dd70ac506982d230d18059ba3626ef2a92664fd (diff) | |
| parent | 53b95cb8fd303e2daa392af23d338f7c9a85f6f4 (diff) | |
| download | nextcloud-server-b8318e6df4ad8f2dcf466fa6b4d9c994c8943002.tar.gz nextcloud-server-b8318e6df4ad8f2dcf466fa6b4d9c994c8943002.zip | |
Merge branch 'master' into fixing-998-master
Conflicts:
apps/files/js/files.js
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 843c6e3fc4a..ce5a8096bf9 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -216,7 +216,7 @@ $(document).ready(function() { $('.download').click('click',function(event) { var files=getSelectedFiles('name').join(';'); var dir=$('#dir').val()||'/'; - OC.Notification.show(t('files','generating ZIP-file, it may take some time.')); + OC.Notification.show(t('files','Your download is being prepared. This might take some time if the files are big.')); // use special download URL if provided, e.g. for public shared files if ( (downloadURL = document.getElementById("downloadURL")) ) { window.location=downloadURL.value+"&download&files="+files; |