Merge branch 'master' into fixing-998-master

Conflicts:
	apps/files/js/files.js

diff --cc apps/files/js/files.js
index 843c6e3fc4a5b899e7173295166e79f80860bd55,c1abe205151f285aed8d39f751048c527025fe30..ce5a8096bf93f45c120051dc37d5aa99b22068e8
--- 1/apps/files/js/files.js
--- 2/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@@ -216,7 -201,8 +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.'));
 -              $('#notification').text(t('files','Your download is being prepared. This might take some time if the files are big.'));
 -              $('#notification').fadeIn();
++              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;