6 files changed, 6 insertions, 5 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index ac10191618b..9f38263bef3 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -135,7 +135,7 @@ var Files = {
 			return;
 		}
 		if (initStatus === '1') { // encryption tried to init but failed
-			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.'));
+			OC.Notification.show(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') {
diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php
index 93ae47b25c5..c0b32e8e0cb 100644
--- a/apps/files/l10n/ast.php
+++ b/apps/files/l10n/ast.php
@@ -22,6 +22,7 @@ $TRANSLATIONS = array(
 "Upload" => "Xubir",
 "Save" => "Guardar",
 "New folder" => "Nueva carpeta",
+"Folder" => "Carpeta",
 "Cancel upload" => "Encaboxar xuba",
 "Download" => "Descargar",
 "Delete" => "Desaniciar"
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 713072d3e0e..cf2022c2d7f 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -69,7 +69,7 @@ $TRANSLATIONS = array(
 "Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
 "max. possible: " => "μέγιστο δυνατό:",
 "Needed for multi-file and folder downloads." => "Απαραίτητο για κατέβασμα πολλαπλών αρχείων και φακέλων",
-"Enable ZIP-download" => "Ενεργοποίηση κατεβάσματος ZIP",
+"Enable ZIP-download" => "Επιτρέπεται η λήψη ZIP",
 "0 is unlimited" => "0 για απεριόριστο",
 "Maximum input size for ZIP files" => "Μέγιστο μέγεθος για αρχεία ZIP",
 "Save" => "Αποθήκευση",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 76fafc32650..1f69dca628d 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,6 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten var.",
+"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten mevcut",
 "Could not move %s" => "%s taşınamadı",
 "File name cannot be empty." => "Dosya adı boş olamaz.",
 "\"%s\" is an invalid file name." => "'%s' geçersiz bir dosya adı.",
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index f9515d67157..2e3741cbdca 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -11,7 +11,7 @@ class Helper
 		$l = new \OC_L10N('files');
 		$maxUploadFilesize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
 		$maxHumanFilesize = \OCP\Util::humanFileSize($maxUploadFilesize);
-		$maxHumanFilesize = $l->t('Upload') . ' max. ' . $maxHumanFilesize;
+		$maxHumanFilesize = $l->t('Upload (max. %s)', array($maxHumanFilesize));
 
 		return array('uploadMaxFilesize' => $maxUploadFilesize,
 					 'maxHumanFilesize'  => $maxHumanFilesize,
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 95edd625cb3..a8437835d95 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -19,7 +19,7 @@
 			</div>
 			<?php endif;?>
 			<div id="upload" class="button"
-				 title="<?php p($l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize']) ?>">
+				 title="<?php p($l->t('Upload (max. %s)', array($_['uploadMaxHumanFilesize']))) ?>">
 					<?php if($_['uploadMaxFilesize'] >= 0):?>
 					<input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php p($_['uploadMaxFilesize']) ?>">
 					<?php endif;?>