summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/files/js/file-upload.js2
-rw-r--r--apps/files/js/files.js4
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'));
}
});
});