From 26a1120c4dd9dcb5ebf4d80459fdaf824da343d8 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 28 Aug 2017 10:56:21 +0200
Subject: [PATCH] Change move copy order and debug leftover

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 apps/files/js/fileactions.js  | 4 ++--
 apps/files/templates/list.php | 2 +-
 core/js/oc-dialogs.js         | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 668960d593738..3da9b06b0d3aa 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -618,8 +618,8 @@
 			});
 
 			this.registerAction({
-				name: 'CopyMove',
-				displayName: t('files', 'Copy or Move'),
+				name: 'MoveCopy',
+				displayName: t('files', 'Move or copy'),
 				mime: 'all',
 				order: -25,
 				permissions: OC.PERMISSION_UPDATE,
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 3857ad3badde7..f3b6759644ca1 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -49,7 +49,7 @@
 					<span id="selectedActionsList" class="selectedActions">
 						<a href="" class="copy-move">
 							<span class="icon icon-external"></span>
-							<span><?php p($l->t('Copy or Move'))?></span>
+							<span><?php p($l->t('Move or copy'))?></span>
 						</a>
 						<a href="" class="download">
 							<span class="icon icon-download"></span>
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 902d5263d0440..1bc1399466db8 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -257,7 +257,6 @@ var OCdialogs = {
 			};
 
 			var copyCallback = function () {
-				console.log('copy callback');
 				functionToCall(OCdialogs.FILEPICKER_TYPE_COPY);
 			};