Merge branch 'master' into fixing-4343-master

Conflicts:
	lib/connector/sabre/quotaplugin.php

2 files changed, 3 insertions, 11 deletions

diff --git a/apps/files_trashbin/js/disableDefaultActions.js b/apps/files_trashbin/js/disableDefaultActions.js
index df08bfb1a50..afa80cacd6b 100644
--- a/apps/files_trashbin/js/disableDefaultActions.js
+++ b/apps/files_trashbin/js/disableDefaultActions.js
@@ -1,4 +1,4 @@
 /* disable download and sharing actions */
 var disableDownloadActions = true;
 var disableSharing = true;
-var trashBinApp = true;
\ No newline at end of file
+var trashBinApp = true;
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index c3c958b07a7..b14a7240cbe 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -188,21 +188,13 @@ function processSelection(){
 		$('.selectedActions').show();
 		var selection='';
 		if(selectedFolders.length>0){
-			if(selectedFolders.length === 1){
-				selection+=t('files','1 folder');
-			}else{
-				selection+=t('files','{count} folders',{count: selectedFolders.length});
-			}
+			selection += n('files', '%n folder', '%n folders', selectedFolders.length);
 			if(selectedFiles.length>0){
 				selection+=' & ';
 			}
 		}
 		if(selectedFiles.length>0){
-			if(selectedFiles.length === 1){
-				selection+=t('files','1 file');
-			}else{
-				selection+=t('files','{count} files',{count: selectedFiles.length});
-			}
+			selection += n('files', '%n file', '%n files', selectedFiles.length);
 		}
 		$('#headerName>span.name').text(selection);
 		$('#modified').text('');