diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index ceb096f0941dea157b36bd516cd52c4095481111..206fa561251b16486c1aa45bbc2a3b9f4b98c167 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -131,15 +131,15 @@ var Files = {
 		var encryptedFiles = $('#encryptedFiles').val();
 		var initStatus = $('#encryptionInitStatus').val();
 		if (initStatus === '0') { // enc not initialized, but should be
-			OC.Notification.show(t('files_encryption', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again'));
+			OC.Notification.show(t('files', 'Encryption App is enabled but your keys are not initialized, please log-out and log-in again'));
 			return;
 		}
 		if (initStatus === '1') { // encryption tried to init but failed
-			OC.Notification.showHtml(t('files_encryption', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
+			OC.Notification.showHtml(t('files', 'Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.'));
 			return;
 		}
 		if (encryptedFiles === '1') {
-			OC.Notification.show(t('files_encryption', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
+			OC.Notification.show(t('files', 'Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.'));
 			return;
 		}
 	},
diff --git a/settings/ajax/decryptall.php b/settings/ajax/decryptall.php
index 4782a4cfc81c98039f7d555bb4b6a9363d1be861..d12df230d41c83f0f8d58b4d743ae60121452b61 100644
--- a/settings/ajax/decryptall.php
+++ b/settings/ajax/decryptall.php
@@ -12,6 +12,7 @@ $params = array('uid' => \OCP\User::getUser(),
 
 $view = new OC_FilesystemView('/');
 $util = new \OCA\Encryption\Util($view, \OCP\User::getUser());
+$l = \OC_L10N::get('settings');
 
 $result = $util->initEncryption($params);
 
@@ -27,11 +28,11 @@ if ($result !== false) {
 	$util->closeEncryptionSession();
 
 	if ($successful === true) {
-		\OCP\JSON::success(array('data' => array('message' => 'Files decrypted successfully')));
+		\OCP\JSON::success(array('data' => array('message' => $l->t('Files decrypted successfully'))));
 	} else {
-		\OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator')));
+		\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, please check your owncloud.log or ask your administrator'))));
 	}
 } else {
-	\OCP\JSON::error(array('data' => array('message' => 'Couldn\'t decrypt your files, check your password and try again')));
+	\OCP\JSON::error(array('data' => array('message' => $l->t('Couldn\'t decrypt your files, check your password and try again'))));
 }
 
diff --git a/settings/js/personal.js b/settings/js/personal.js
index f502037cfdacdd345e91b38e20da211e6b40d957..b659d1f1d39366117ebd0e3d8a3e35cbf1c91005 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -313,7 +313,7 @@ OC.Encryption.msg={
 	startDecrypting:function(selector){
 		var spinner = '<img src="'+ OC.imagePath('core', 'loading-small.gif') +'">';
 		$(selector)
-			.html( t('files_encryption', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner )
+			.html( t('settings', 'Decrypting files... Please wait, this can take some time.') + ' ' + spinner )
 			.removeClass('success')
 			.removeClass('error')
 			.stop(true, true)