Merge branch 'master' into fixing-appframework-master

Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php

apps/files/ajax/upload.php

@@ -110,30 +110,35 @@ if (strpos($dir, '..') === false) {
 			|| (isset($_POST['resolution']) && $_POST['resolution']==='replace')
 		) {
 			// upload and overwrite file
-			if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
+			try
+			{
+				if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
+
+					// updated max file size after upload
+					$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
+
+					$meta = \OC\Files\Filesystem::getFileInfo($target);
+					if ($meta === false) {
+						$error = $l->t('Upload failed. Could not get file info.');
+					} else {
+						$result[] = array('status' => 'success',
+							'mime' => $meta['mimetype'],
+							'mtime' => $meta['mtime'],
+							'size' => $meta['size'],
+							'id' => $meta['fileid'],
+							'name' => basename($target),
+							'originalname' => $files['tmp_name'][$i],
+							'uploadMaxFilesize' => $maxUploadFileSize,
+							'maxHumanFilesize' => $maxHumanFileSize,
+							'permissions' => $meta['permissions'] & OCP\PERMISSION_READ
+						);
+					}
 
-				// updated max file size after upload
-				$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
-				
-				$meta = \OC\Files\Filesystem::getFileInfo($target);
-				if ($meta === false) {
-					$error = $l->t('Upload failed. Could not get file info.');
 				} else {
-					$result[] = array('status' => 'success',
-						'mime' => $meta['mimetype'],
-						'mtime' => $meta['mtime'],
-						'size' => $meta['size'],
-						'id' => $meta['fileid'],
-						'name' => basename($target),
-						'originalname' => $files['tmp_name'][$i],
-						'uploadMaxFilesize' => $maxUploadFileSize,
-						'maxHumanFilesize' => $maxHumanFileSize,
-						'permissions' => $meta['permissions'],
-					);
+					$error = $l->t('Upload failed. Could not find uploaded file');
 				}
-				
-			} else {
-				$error = $l->t('Upload failed. Could not find uploaded file');
+			} catch(Exception $ex) {
+				$error = $ex->getMessage();
 			}
 			
 		} else {
@@ -151,7 +156,7 @@ if (strpos($dir, '..') === false) {
 					'originalname' => $files['tmp_name'][$i],
 					'uploadMaxFilesize' => $maxUploadFileSize,
 					'maxHumanFilesize' => $maxHumanFileSize,
-					'permissions' => $meta['permissions'],
+					'permissions' => $meta['permissions'] & OCP\PERMISSION_READ
 				);
 			}
 		}
@@ -164,5 +169,5 @@ if ($error === false) {
 	OCP\JSON::encodedPrint($result);
 	exit();
 } else {
-	OCP\JSON::error(array('data' => array_merge(array('message' => $error), $storageStats)));
+	OCP\JSON::error(array(array('data' => array_merge(array('message' => $error), $storageStats))));
 }

apps/files/css/files.css

@@ -105,8 +105,6 @@ table th#headerDate, table td.date {
 	box-sizing: border-box;
 	position: relative;
 	min-width: 11em;
-	display: block;
-	height: 51px;
 }
 
 /* Multiselect bar */
@@ -161,8 +159,6 @@ table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0
 }
 .modified {
 	position: relative;
-	top: 11px;
-	left: 5px;
 }
 
 /* TODO fix usability bug (accidental file/folder selection) */
@@ -178,6 +174,9 @@ table td.filename .nametext {
 table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
 table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 
+.ie8 input[type="checkbox"]{
+	padding: 0;
+}
 
 /* File checkboxes */
 #fileList tr td.filename>input[type="checkbox"]:first-child {
@@ -240,22 +239,12 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 	top: 14px;
 	right: 0;
 }
-#fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
-	background-color: rgba(240,240,240,0.898);
-	box-shadow: -5px 0 7px rgba(240,240,240,0.898);
-}
-#fileList tr.selected:hover .fileactions, #fileList tr.mouseOver .fileactions { /* slightly darker color for selected rows */
-	background-color: rgba(230,230,230,.9);
-	box-shadow: -5px 0 7px rgba(230,230,230,.9);
-}
 
 #fileList img.move2trash { display:inline; margin:-.5em 0; padding:1em .5em 1em .5em !important; float:right; }
 #fileList a.action.delete {
 	position: absolute;
 	right: 0;
-	top: 0;
-	margin: 0;
-	padding: 15px 14px 19px !important;
+	padding: 9px 14px 19px !important;
 }
 a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 

apps/files/js/file-upload.js

@@ -345,7 +345,7 @@ $(document).ready(function() {
 				} else if (result[0].status !== 'success') {
 					//delete data.jqXHR;
 					data.textStatus = 'servererror';
-					data.errorThrown = result.data.message; // error message has been translated on server
+					data.errorThrown = result[0].data.message; // error message has been translated on server
 					var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
 					fu._trigger('fail', e, data);
 				}
@@ -523,8 +523,10 @@ $(document).ready(function() {
 						function(result){
 							if (result.status == 'success') {
 								var date=new Date();
-								FileList.addFile(name,0,date,false,hidden);
-								var tr=$('tr').filterAttr('data-file',name);
+								// TODO: ideally addFile should be able to receive
+								// all attributes and set them automatically,
+								// and also auto-load the preview
+								var tr = FileList.addFile(name,0,date,false,hidden);
 								tr.attr('data-size',result.data.size);
 								tr.attr('data-mime',result.data.mime);
 								tr.attr('data-id', result.data.id);
@@ -533,6 +535,7 @@ $(document).ready(function() {
 								lazyLoadPreview(path, result.data.mime, function(previewpath){
 									tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
 								});
+								FileActions.display(tr.find('td.filename'));
 							} else {
 								OC.dialogs.alert(result.data.message, t('core', 'Error'));
 							}

apps/files/js/filelist.js

@@ -677,6 +677,7 @@ var FileList={
 };
 
 $(document).ready(function(){
+	var isPublic = !!$('#isPublic').val();
 
 	// handle upload events
 	var file_upload_start = $('#file_upload_start');
@@ -684,28 +685,32 @@ $(document).ready(function(){
 	file_upload_start.on('fileuploaddrop', function(e, data) {
 		OC.Upload.log('filelist handle fileuploaddrop', e, data);
 
-		var dropTarget = $(e.originalEvent.target).closest('tr');
-		if(dropTarget && dropTarget.data('type') === 'dir') { // drag&drop upload to folder
+		var dropTarget = $(e.originalEvent.target).closest('tr, .crumb');
+		if(dropTarget && (dropTarget.data('type') === 'dir' || dropTarget.hasClass('crumb'))) { // drag&drop upload to folder
 
 			// remember as context
 			data.context = dropTarget;
 
 			var dir = dropTarget.data('file');
+			// if from file list, need to prepend parent dir
+			if (dir){
+				var parentDir = $('#dir').val() || '/';
+				if (parentDir[parentDir.length - 1] != '/'){
+					parentDir += '/';
+				}
+				dir = parentDir + dir;
+			}
+			else{
+				// read full path from crumb
+				dir = dropTarget.data('dir') || '/';
+			}
 
 			// update folder in form
 			data.formData = function(form) {
-				var formArray = form.serializeArray();
-				// array index 0 contains the max files size
-				// array index 1 contains the request token
-				// array index 2 contains the directory
-				var parentDir = formArray[2]['value'];
-				if (parentDir === '/') {
-					formArray[2]['value'] += dir;
-				} else {
-					formArray[2]['value'] += '/' + dir;
-				}
-
-				return formArray;
+				return [
+					{name: 'dir', value: dir},
+					{name: 'requesttoken', value: oc_requesttoken}
+				];
 			};
 		} 
 
@@ -783,6 +788,10 @@ $(document).ready(function(){
 				data.context.find('td.filesize').text(humanFileSize(size));
 
 			} else {
+				// only append new file if dragged onto current dir's crumb (last)
+				if (data.context && data.context.hasClass('crumb') && !data.context.hasClass('last')){
+					return;
+				}
 
 				// add as stand-alone row to filelist
 				var size=t('files', 'Pending');
@@ -924,29 +933,32 @@ $(document).ready(function(){
 		return (params && params.dir) || '/';
 	}
 
-	// fallback to hashchange when no history support
-	if (!window.history.pushState){
-		$(window).on('hashchange', function(){
-			FileList.changeDirectory(parseCurrentDirFromUrl(), false);
-		});
-	}
-	window.onpopstate = function(e){
-		var targetDir;
-		if (e.state && e.state.dir){
-			targetDir = e.state.dir;
-		}
-		else{
-			// read from URL
-			targetDir = parseCurrentDirFromUrl();
+	// disable ajax/history API for public app (TODO: until it gets ported)
+	if (!isPublic){
+		// fallback to hashchange when no history support
+		if (!window.history.pushState){
+			$(window).on('hashchange', function(){
+				FileList.changeDirectory(parseCurrentDirFromUrl(), false);
+			});
 		}
-		if (targetDir){
-			FileList.changeDirectory(targetDir, false);
+		window.onpopstate = function(e){
+			var targetDir;
+			if (e.state && e.state.dir){
+				targetDir = e.state.dir;
+			}
+			else{
+				// read from URL
+				targetDir = parseCurrentDirFromUrl();
+			}
+			if (targetDir){
+				FileList.changeDirectory(targetDir, false);
+			}
 		}
-	}
 
-	if (parseInt($('#ajaxLoad').val(), 10) === 1){
-		// need to initially switch the dir to the one from the hash (IE8)
-		FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
+		if (parseInt($('#ajaxLoad').val(), 10) === 1){
+			// need to initially switch the dir to the one from the hash (IE8)
+			FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
+		}
 	}
 
 	FileList.createFileSummary();

apps/files/js/files.js

@@ -703,7 +703,12 @@ function checkTrashStatus() {
 }
 
 function onClickBreadcrumb(e){
-	var $el = $(e.target).closest('.crumb');
-	e.preventDefault();
-	FileList.changeDirectory(decodeURIComponent($el.data('dir')));
+	var $el = $(e.target).closest('.crumb'),
+		$targetDir = $el.data('dir');
+		isPublic = !!$('#isPublic').val();
+
+	if ($targetDir !== undefined && !isPublic){
+		e.preventDefault();
+		FileList.changeDirectory(decodeURIComponent($targetDir));
+	}
 }

apps/files/l10n/cs_CZ.php

@@ -13,10 +13,14 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
 "Failed to write to disk" => "Zápis na disk selhal",
 "Not enough storage available" => "Nedostatek dostupného úložného prostoru",
+"Upload failed. Could not get file info." => "Nahrávání selhalo. Nepodařilo se získat informace o souboru.",
+"Upload failed. Could not find uploaded file" => "Nahrávání selhalo. Nepodařilo se nalézt nahraný soubor.",
 "Invalid directory." => "Neplatný adresář",
 "Files" => "Soubory",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů",
 "Not enough space available" => "Nedostatek volného místa",
 "Upload cancelled." => "Odesílání zrušeno.",
+"Could not get result from server." => "Nepodařilo se získat výsledek ze serveru.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
 "URL cannot be empty." => "URL nemůže být prázdná.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Název složky nelze použít. Použití názvu 'Shared' je ownCloudem rezervováno",
@@ -40,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.",
 "Your download is being prepared. This might take some time if the files are big." => "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat.",
 "Error moving file" => "Chyba při přesunu souboru",

apps/files/l10n/en_GB.php

@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
 "Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.",
 "Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
 "Error moving file" => "Error moving file",

apps/files/l10n/es.php

@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
 "Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡no se pueden actualizar o sincronizar más!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Encryption App está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "La clave privada no es válida para Encryption App. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos encriptados.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
 "Your download is being prepared. This might take some time if the files are big." => "Su descarga está siendo preparada. Esto puede tardar algún tiempo si los archivos son grandes.",
 "Error moving file" => "Error moviendo archivo",

apps/files/l10n/et_EE.php

@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
 "Upload failed. Could not find uploaded file" => "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud",
 "Invalid directory." => "Vigane kaust.",
 "Files" => "Failid",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
 "Not enough space available" => "Pole piisavalt ruumi",
 "Upload cancelled." => "Üleslaadimine tühistati.",
 "Could not get result from server." => "Serverist ei saadud tulemusi",
@@ -43,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
 "Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
 "Your download is being prepared. This might take some time if the files are big." => "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. ",
 "Error moving file" => "Viga faili eemaldamisel",

apps/files/l10n/fr.php

@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
 "Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
 "Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Votre clef privée pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.",
 "Your download is being prepared. This might take some time if the files are big." => "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux.",
 "Error moving file" => "Erreur lors du déplacement du fichier",

apps/files/l10n/ja_JP.php

@@ -44,6 +44,8 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
 "Your storage is full, files can not be updated or synced anymore!" => "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
 "Your storage is almost full ({usedSpacePercent}%)" => "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
 "Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
 "Error moving file" => "ファイルの移動エラー",

apps/files/l10n/nl.php

@@ -13,10 +13,14 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
+"Upload failed. Could not get file info." => "Upload mislukt, Kon geen bestandsinfo krijgen.",
+"Upload failed. Could not find uploaded file" => "Upload mislukt. Kon ge-uploade bestand niet vinden",
 "Invalid directory." => "Ongeldige directory.",
 "Files" => "Bestanden",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
 "Not enough space available" => "Niet genoeg ruimte beschikbaar",
 "Upload cancelled." => "Uploaden geannuleerd.",
+"Could not get result from server." => "Kon het resultaat van de server niet terugkrijgen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
 "URL cannot be empty." => "URL kan niet leeg zijn.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ongeldige mapnaam. Gebruik van 'Gedeeld' is voorbehouden aan Owncloud zelf",
@@ -40,8 +44,11 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
 "Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
 "Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
+"Error moving file" => "Fout bij verplaatsen bestand",
 "Name" => "Naam",
 "Size" => "Grootte",
 "Modified" => "Aangepast",

apps/files/l10n/pt_PT.php

@@ -13,10 +13,12 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Está a faltar a pasta temporária",
 "Failed to write to disk" => "Falhou a escrita no disco",
 "Not enough storage available" => "Não há espaço suficiente em disco",
+"Upload failed. Could not get file info." => "O carregamento falhou. Não foi possível obter a informação do ficheiro.",
 "Invalid directory." => "Directório Inválido",
 "Files" => "Ficheiros",
 "Not enough space available" => "Espaço em disco insuficiente!",
 "Upload cancelled." => "Envio cancelado.",
+"Could not get result from server." => "Não foi possível obter o resultado do servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
 "URL cannot be empty." => "O URL não pode estar vazio.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Nome da pasta inválido. Palavra 'Shared' é reservado pela ownCloud",
@@ -42,6 +44,7 @@ $TRANSLATIONS = array(
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
 "Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
+"Error moving file" => "Erro ao mover o ficheiro",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",

apps/files/l10n/sv.php

@@ -13,10 +13,14 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "En temporär mapp saknas",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
+"Upload failed. Could not get file info." => "Uppladdning misslyckades. Gick inte att hämta filinformation.",
+"Upload failed. Could not find uploaded file" => "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen",
 "Invalid directory." => "Felaktig mapp.",
 "Files" => "Filer",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.",
 "Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
 "Upload cancelled." => "Uppladdning avbruten.",
+"Could not get result from server." => "Gick inte att hämta resultat från server.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
 "URL cannot be empty." => "URL kan inte vara tom.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Ogiltigt mappnamn. Användning av 'Shared' är reserverad av ownCloud",
@@ -40,8 +44,11 @@ $TRANSLATIONS = array(
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.",
 "Your download is being prepared. This might take some time if the files are big." => "Din nedladdning förbereds. Det kan ta tid om det är stora filer.",
+"Error moving file" => "Fel uppstod vid flyttning av fil",
 "Name" => "Namn",
 "Size" => "Storlek",
 "Modified" => "Ändrad",

apps/files/l10n/tr.php

@@ -13,10 +13,14 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Geçici dizin eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Not enough storage available" => "Yeterli disk alanı yok",
+"Upload failed. Could not get file info." => "Yükleme başarısız. Dosya bilgisi alınamadı.",
+"Upload failed. Could not find uploaded file" => "Yükleme başarısız. Yüklenen dosya bulunamadı",
 "Invalid directory." => "Geçersiz dizin.",
 "Files" => "Dosyalar",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Bir dizin veya 0 bayt olduğundan {filename} yüklenemedi",
 "Not enough space available" => "Yeterli disk alanı yok",
 "Upload cancelled." => "Yükleme iptal edildi.",
+"Could not get result from server." => "Sunucudan sonuç alınamadı.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
 "URL cannot be empty." => "URL boş olamaz.",
 "Invalid folder name. Usage of 'Shared' is reserved by ownCloud" => "Geçersiz dizin adı. 'Shared' dizin ismi kullanımı ownCloud tarafından rezerve edilmiştir.",
@@ -33,14 +37,18 @@ $TRANSLATIONS = array(
 "undo" => "geri al",
 "_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
 "_%n file_::_%n files_" => array("%n dosya","%n dosya"),
+"{dirs} and {files}" => "{dirs} ve {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
 "'.' is an invalid file name." => "'.' geçersiz dosya adı.",
 "File name cannot be empty." => "Dosya adı boş olamaz.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
 "Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek yada senkronizasyon edilmeyecek.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçiniz.",
 "Your download is being prepared. This might take some time if the files are big." => "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir.",
+"Error moving file" => "Dosya taşıma hatası",
 "Name" => "İsim",
 "Size" => "Boyut",
 "Modified" => "Değiştirilme",

apps/files/templates/index.php

@@ -1,4 +1,3 @@
-<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}table td{position:static !important;}</style><![endif]-->
 <div id="controls">
 	<?php print_unescaped($_['breadcrumb']); ?>
 		<div class="actions creatable <?php if (!$_['isCreatable']):?>hidden<?php endif; ?> <?php if (isset($_['files']) and count($_['files'])==0):?>emptycontent<?php endif; ?>">
@@ -108,6 +107,7 @@
 </div>
 
 <!-- config hints for javascript -->
+<input type="hidden" name="filesApp" id="filesApp" value="1" />
 <input type="hidden" name="ajaxLoad" id="ajaxLoad" value="<?php p($_['ajaxLoad']); ?>" />
 <input type="hidden" name="allowZipDownload" id="allowZipDownload" value="<?php p($_['allowZipDownload']); ?>" />
 <input type="hidden" name="usedSpacePercent" id="usedSpacePercent" value="<?php p($_['usedSpacePercent']); ?>" />

apps/files/templates/part.list.php

@@ -36,7 +36,7 @@ $totalsize = 0; ?>
 		<?php else: ?>
 			<a class="name" href="<?php p(rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>">
 				<label class="filetext" title="" for="select-<?php p($file['fileid']); ?>"></label>
-				<span class="nametext"><?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span>
+				<span class="nametext"><?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span></span>
 			</a>
 		<?php endif; ?>
 			<?php if($file['type'] == 'dir'):?>

apps/files_encryption/files/error.php

@@ -5,26 +5,39 @@ if (!isset($_)) { //also provide standalone error page
 
 	$l = OC_L10N::get('files_encryption');
 
-	if (isset($_GET['i']) && $_GET['i'] === '0') {
-		$errorMsg = $l->t('Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app.');
-		$init = '0';
+	if (isset($_GET['errorCode'])) {
+		$errorCode = $_GET['errorCode'];
+		switch ($errorCode) {
+			case \OCA\Encryption\Crypt::ENCRYPTION_NOT_INITIALIZED_ERROR:
+				$errorMsg = $l->t('Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app.');
+				break;
+			case \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR:
+				$errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.');
+				break;
+			case \OCA\Encryption\Crypt::ENCRYPTION_NO_SHARE_KEY_FOUND:
+				$errorMsg = $l->t('Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you.');
+				break;
+			default:
+				$errorMsg = $l->t("Unknown error please check your system settings or contact your administrator");
+				break;
+		}
 	} else {
-		$errorMsg = $l->t('Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.');
-		$init = '1';
+		$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_UNKNOWN_ERROR;
+		$errorMsg = $l->t("Unknown error please check your system settings or contact your administrator");
 	}
 
 	if (isset($_GET['p']) && $_GET['p'] === '1') {
-		header('HTTP/1.0 404 ' . $errorMsg);
+		header('HTTP/1.0 403 ' . $errorMsg);
 	}
 
 // check if ajax request
 	if (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') {
 		\OCP\JSON::error(array('data' => array('message' => $errorMsg)));
 	} else {
-		header('HTTP/1.0 404 ' . $errorMsg);
+		header('HTTP/1.0 403 ' . $errorMsg);
 		$tmpl = new OC_Template('files_encryption', 'invalid_private_key', 'guest');
 		$tmpl->assign('message', $errorMsg);
-		$tmpl->assign('init', $init);
+		$tmpl->assign('errorCode', $errorCode);
 		$tmpl->printPage();
 	}
 

apps/files_encryption/hooks/hooks.php

@@ -92,8 +92,6 @@ class Hooks {
 			}
 
 			// Encrypt existing user files:
-			// This serves to upgrade old versions of the encryption
-			// app (see appinfo/spec.txt)
 			if (
 				$util->encryptAll('/' . $params['uid'] . '/' . 'files', $session->getLegacyKey(), $params['password'])
 			) {

apps/files_encryption/l10n/cs_CZ.php

@@ -8,20 +8,26 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
 "Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klíč není platný! Pravděpodobně bylo heslo změněno vně systému ownCloud (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
+"Unknown error please check your system settings or contact your administrator" => "Neznámá chyba, zkontrolujte vaše systémová nastavení nebo kontaktujte vašeho správce",
 "Missing requirements." => "Nesplněné závislosti.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
 "Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:",
 "Saving..." => "Ukládám...",
+"Go directly to your " => "Běžte přímo do vašeho",
 "personal settings" => "osobní nastavení",
 "Encryption" => "Šifrování",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
 "Recovery key password" => "Heslo klíče pro obnovu",
+"Repeat Recovery key password" => "Zopakujte heslo klíče pro obnovu",
 "Enabled" => "Povoleno",
 "Disabled" => "Zakázáno",
 "Change recovery key password:" => "Změna hesla klíče pro obnovu:",
 "Old Recovery key password" => "Původní heslo klíče pro obnovu",
 "New Recovery key password" => "Nové heslo klíče pro obnovu",
+"Repeat New Recovery key password" => "Zopakujte nové heslo klíče pro obnovu",
 "Change Password" => "Změnit heslo",
 "Your private key password no longer match your log-in password:" => "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem:",
 "Set your old private key password to your current log-in password." => "Změňte heslo vaše soukromého klíče na stejné jako vaše přihlašovací heslo.",

apps/files_encryption/l10n/de.php

@@ -8,20 +8,26 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
 "Private key password successfully updated." => "Passwort des privaten Schlüssels erfolgreich aktualisiert",
 "Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Dein Passwort geändert (z.B. in deinem gemeinsamen Verzeichnis). Du kannst das Passwort deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an deine Dateien zu gelangen.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Datei-Besitzer, dass er die Datei nochmals mit Dir teilt.",
+"Unknown error please check your system settings or contact your administrator" => "Unbekannter Fehler, bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
 "Missing requirements." => "Fehlende Vorraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
 "Saving..." => "Speichern...",
+"Go directly to your " => "Direkt wechseln zu Deinem",
 "personal settings" => "Private Einstellungen",
 "Encryption" => "Verschlüsselung",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
 "Recovery key password" => "Wiederherstellungsschlüssel-Passwort",
+"Repeat Recovery key password" => "Schlüssel-Passwort zur Wiederherstellung wiederholen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
 "Change recovery key password:" => "Wiederherstellungsschlüssel-Passwort ändern:",
 "Old Recovery key password" => "Altes Wiederherstellungsschlüssel-Passwort",
 "New Recovery key password" => "Neues Wiederherstellungsschlüssel-Passwort",
+"Repeat New Recovery key password" => "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
 "Change Password" => "Passwort ändern",
 "Your private key password no longer match your log-in password:" => "Ihr Passwort für ihren privaten Schlüssel stimmt nicht mehr mit ihrem Loginpasswort überein.",
 "Set your old private key password to your current log-in password." => "Setzen Sie ihr altes Passwort für ihren privaten Schlüssel auf ihr aktuelles Login-Passwort",

apps/files_encryption/l10n/de_DE.php

@@ -8,20 +8,26 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
 "Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
 "Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde von außerhalb Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Datei-Besitzer, dass er die Datei nochmals mit Ihnen teilt.",
+"Unknown error please check your system settings or contact your administrator" => "Unbekannter Fehler, bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
 "Missing requirements." => "Fehlende Voraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
 "Saving..." => "Speichern...",
+"Go directly to your " => "Direkt wechseln zu Ihrem",
 "personal settings" => "Persönliche Einstellungen",
 "Encryption" => "Verschlüsselung",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
 "Recovery key password" => "Wiederherstellungschlüsselpasswort",
+"Repeat Recovery key password" => "Schlüssel-Passwort zur Wiederherstellung wiederholen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
 "Change recovery key password:" => "Wiederherstellungsschlüsselpasswort ändern",
 "Old Recovery key password" => "Altes Wiederherstellungsschlüsselpasswort",
 "New Recovery key password" => "Neues Wiederherstellungsschlüsselpasswort ",
+"Repeat New Recovery key password" => "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
 "Change Password" => "Passwort ändern",
 "Your private key password no longer match your log-in password:" => "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen.",
 "Set your old private key password to your current log-in password." => "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort.",

apps/files_encryption/l10n/en_GB.php

@@ -8,22 +8,28 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Could not change the password. Maybe the old password was incorrect.",
 "Private key password successfully updated." => "Private key password updated successfully.",
 "Could not update the private key password. Maybe the old password was not correct." => "Could not update the private key password. Maybe the old password was not correct.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
+"Unknown error please check your system settings or contact your administrator" => "Unknown error. Please check your system settings or contact your administrator",
 "Missing requirements." => "Missing requirements.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.",
 "Following users are not set up for encryption:" => "Following users are not set up for encryption:",
 "Saving..." => "Saving...",
+"Go directly to your " => "Go directly to your ",
 "personal settings" => "personal settings",
 "Encryption" => "Encryption",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Enable recovery key (allow to recover users files in case of password loss):",
 "Recovery key password" => "Recovery key password",
+"Repeat Recovery key password" => "Repeat recovery key password",
 "Enabled" => "Enabled",
 "Disabled" => "Disabled",
 "Change recovery key password:" => "Change recovery key password:",
-"Old Recovery key password" => "Old Recovery key password",
-"New Recovery key password" => "New Recovery key password",
+"Old Recovery key password" => "Old recovery key password",
+"New Recovery key password" => "New recovery key password",
+"Repeat New Recovery key password" => "Repeat new recovery key password",
 "Change Password" => "Change Password",
-"Your private key password no longer match your log-in password:" => "Your private key password no longer match your login password:",
+"Your private key password no longer match your log-in password:" => "Your private key password no longer matches your login password:",
 "Set your old private key password to your current log-in password." => "Set your old private key password to your current login password.",
 " If you don't remember your old password you can ask your administrator to recover your files." => " If you don't remember your old password you can ask your administrator to recover your files.",
 "Old log-in password" => "Old login password",

apps/files_encryption/l10n/es.php

@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
 "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
 "Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡Encryption App no está inicializada!. Quizás la aplicación fue reiniciada durante tu sesión. Por favor, cierra la sesión y vuelva a iniciarla para intentar inicializar la Encryption App.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. Puede actualizar su clave privada en sus opciones personales para recuperar el acceso a sus ficheros.",
 "Missing requirements." => "Requisitos incompletos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",

apps/files_encryption/l10n/et_EE.php

@@ -8,20 +8,26 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
 "Private key password successfully updated." => "Privaatse võtme parool edukalt uuendatud.",
 "Could not update the private key password. Maybe the old password was not correct." => "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu privaatne võti pole toimiv! Tõenäoliselt on sinu parool muutunud väljaspool ownCloud süsteemi (näiteks ettevõtte keskhaldus). Sa saad uuendada oma privaatse võtme parooli seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
+"Unknown error please check your system settings or contact your administrator" => "Tundmatu tõrge. Palun kontrolli süsteemi seadeid või võta ühendust oma süsteemi administraatoriga",
 "Missing requirements." => "Nõutavad on puudu.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
 "Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
 "Saving..." => "Salvestamine...",
+"Go directly to your " => "Liigu otse oma",
 "personal settings" => "isiklikes seadetes",
 "Encryption" => "Krüpteerimine",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Luba taastevõti (võimada kasutaja failide taastamine parooli kaotuse puhul):",
 "Recovery key password" => "Taastevõtme parool",
+"Repeat Recovery key password" => "Korda taastevõtme parooli",
 "Enabled" => "Sisse lülitatud",
 "Disabled" => "Väljalülitatud",
 "Change recovery key password:" => "Muuda taastevõtme parooli:",
 "Old Recovery key password" => "Vana taastevõtme parool",
 "New Recovery key password" => "Uus taastevõtme parool",
+"Repeat New Recovery key password" => "Korda uut taastevõtme parooli",
 "Change Password" => "Muuda parooli",
 "Your private key password no longer match your log-in password:" => "Sinu privaatse võtme parool ei ühti enam sinu sisselogimise parooliga:",
 "Set your old private key password to your current log-in password." => "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",

apps/files_encryption/l10n/fr.php

@@ -8,20 +8,26 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
 "Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clé de sécurité privée n'est pas valide! Il est probable que votre mot de passe ait été changé sans passer par le système ownCloud (par éxemple: le serveur de votre entreprise). Ain d'avoir à nouveau accès à vos fichiers cryptés, vous pouvez mettre à jour votre clé de sécurité privée dans les paramètres personnels de votre compte.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Impossible de déchiffrer ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire de ce fichier de le repartager avec vous.",
+"Unknown error please check your system settings or contact your administrator" => "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter votre administrateur.",
 "Missing requirements." => "Système minimum requis non respecté.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.",
 "Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
 "Saving..." => "Enregistrement...",
+"Go directly to your " => "Allez directement à votre",
 "personal settings" => "paramètres personnel",
 "Encryption" => "Chiffrement",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
 "Recovery key password" => "Mot de passe de la clef de récupération",
+"Repeat Recovery key password" => "Répétez le mot de passe de la clé de récupération",
 "Enabled" => "Activer",
 "Disabled" => "Désactiver",
 "Change recovery key password:" => "Modifier le mot de passe de la clef de récupération :",
 "Old Recovery key password" => "Ancien mot de passe de la clef de récupération",
 "New Recovery key password" => "Nouveau mot de passe de la clef de récupération",
+"Repeat New Recovery key password" => "Répétez le nouveau mot de passe de la clé de récupération",
 "Change Password" => "Changer de mot de passe",
 "Your private key password no longer match your log-in password:" => "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion :",
 "Set your old private key password to your current log-in password." => "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion. ",

apps/files_encryption/l10n/it.php

@@ -13,15 +13,18 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
 "Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
 "Saving..." => "Salvataggio in corso...",
+"Go directly to your " => "Passa direttamente a",
 "personal settings" => "impostazioni personali",
 "Encryption" => "Cifratura",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
 "Recovery key password" => "Password della chiave di recupero",
+"Repeat Recovery key password" => "Ripeti la password della chiave di recupero",
 "Enabled" => "Abilitata",
 "Disabled" => "Disabilitata",
 "Change recovery key password:" => "Cambia la password della chiave di recupero:",
 "Old Recovery key password" => "Vecchia password della chiave di recupero",
 "New Recovery key password" => "Nuova password della chiave di recupero",
+"Repeat New Recovery key password" => "Ripeti la nuova password della chiave di recupero",
 "Change Password" => "Modifica password",
 "Your private key password no longer match your log-in password:" => "La password della chiave privata non corrisponde più alla password di accesso:",
 "Set your old private key password to your current log-in password." => "Imposta la vecchia password della chiave privata sull'attuale password di accesso.",

apps/files_encryption/l10n/nl.php

@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
 "Private key password successfully updated." => "Privésleutel succesvol bijgewerkt.",
 "Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Uw privésleutel is niet geldig! Misschien was uw wachtwoord van buitenaf gewijzigd. U kunt het wachtwoord van uw privésleutel aanpassen in uw persoonlijke instellingen om toegang tot uw versleutelde bestanden te vergaren.",
 "Missing requirements." => "Missende benodigdheden.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
 "Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
 "Saving..." => "Opslaan",
+"Go directly to your " => "Ga meteen naar uw",
 "personal settings" => "persoonlijke instellingen",
 "Encryption" => "Versleuteling",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
 "Recovery key password" => "Wachtwoord herstelsleulel",
+"Repeat Recovery key password" => "Herhaal het herstelsleutel wachtwoord",
 "Enabled" => "Geactiveerd",
 "Disabled" => "Gedeactiveerd",
 "Change recovery key password:" => "Wijzig wachtwoord herstelsleutel:",
 "Old Recovery key password" => "Oude wachtwoord herstelsleutel",
 "New Recovery key password" => "Nieuwe wachtwoord herstelsleutel",
+"Repeat New Recovery key password" => "Herhaal het nieuwe herstelsleutel wachtwoord",
 "Change Password" => "Wijzigen wachtwoord",
 "Your private key password no longer match your log-in password:" => "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord:",
 "Set your old private key password to your current log-in password." => "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",

apps/files_encryption/l10n/pl.php

@@ -8,20 +8,24 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
 "Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Klucz prywatny nie jest ważny! Prawdopodobnie Twoje hasło zostało zmienione poza systemem ownCloud (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
 "Missing requirements." => "Brak wymagań.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
 "Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
 "Saving..." => "Zapisywanie...",
+"Go directly to your " => "Przejdź bezpośrednio do",
 "personal settings" => "Ustawienia osobiste",
 "Encryption" => "Szyfrowanie",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):",
 "Recovery key password" => "Hasło klucza odzyskiwania",
+"Repeat Recovery key password" => "Powtórz hasło klucza odzyskiwania",
 "Enabled" => "Włączone",
 "Disabled" => "Wyłączone",
 "Change recovery key password:" => "Zmień hasło klucza odzyskiwania",
 "Old Recovery key password" => "Stare hasło klucza odzyskiwania",
 "New Recovery key password" => "Nowe hasło klucza odzyskiwania",
+"Repeat New Recovery key password" => "Powtórz nowe hasło klucza odzyskiwania",
 "Change Password" => "Zmień hasło",
 "Your private key password no longer match your log-in password:" => "Hasło klucza prywatnego nie pasuje do  hasła logowania:",
 "Set your old private key password to your current log-in password." => "Podaj swoje stare prywatne hasło aby ustawić nowe",

apps/files_encryption/l10n/pt_BR.php

@@ -10,6 +10,8 @@ $TRANSLATIONS = array(
 "Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora do sistema ownCloud (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Poe favoe peça ao dono do arquivo para compartilha-lo com você.",
+"Unknown error please check your system settings or contact your administrator" => "Erro desconhecido, por favor verifique suas configurações ou faça contato com o administrador",
 "Missing requirements." => "Requisitos não encontrados.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
 "Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",

apps/files_encryption/l10n/pt_PT.php

@@ -9,6 +9,7 @@ $TRANSLATIONS = array(
 "Could not update the private key password. Maybe the old password was not correct." => "Não foi possível alterar a chave. Possivelmente a password antiga não está correcta.",
 "Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada não é válida! Provavelmente senha foi alterada fora do sistema ownCloud (exemplo, o diretório corporativo). Pode atualizar password da chave privada em configurações personalizadas para recuperar o acesso aos seus arquivos encriptados.",
 "Missing requirements." => "Faltam alguns requisitos.",
+"Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:",
 "Saving..." => "A guardar...",
 "personal settings" => "configurações personalizadas ",
 "Encryption" => "Encriptação",

apps/files_encryption/l10n/sv.php

@@ -6,29 +6,33 @@ $TRANSLATIONS = array(
 "Could not disable recovery key. Please check your recovery key password!" => "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
 "Password successfully changed." => "Ändringen av lösenordet lyckades.",
 "Could not change the password. Maybe the old password was not correct." => "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
-"Private key password successfully updated." => "Den privata lösenordsnyckeln uppdaterades utan problem.",
-"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera den privata lösenordsnyckeln. Kanske var det gamla lösenordet fel.",
-"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
+"Private key password successfully updated." => "Den privata nyckelns lösenord uppdaterades utan problem.",
+"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
+"Your private key is not valid! Likely your password was changed outside the ownCloud system (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Lösenordet för din privata nyckel är inte giltig! Troligen har ditt lösenord ändrats utanför ownCloud (t.ex. i företagets katalogtjänst). Du kan uppdatera lösenordet för den privata nyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
 "Missing requirements." => "Krav som saknas",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
 "Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
 "Saving..." => "Sparar...",
+"Go directly to your " => "Gå direkt till din",
 "personal settings" => "personliga inställningar",
 "Encryption" => "Kryptering",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivera lösenordsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
-"Recovery key password" => "Lösenordsnyckel",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
+"Recovery key password" => "Lösenord för återställningsnyckel",
+"Repeat Recovery key password" => "Upprepa återställningsnyckelns lösenord",
 "Enabled" => "Aktiverad",
 "Disabled" => "Inaktiverad",
-"Change recovery key password:" => "Ändra lösenordsnyckel:",
-"Old Recovery key password" => "Gammal lösenordsnyckel",
-"New Recovery key password" => "Ny lösenordsnyckel",
+"Change recovery key password:" => "Ändra lösenord för återställningsnyckel:",
+"Old Recovery key password" => "Gammalt lösenord för återställningsnyckel",
+"New Recovery key password" => "Nytt lösenord för återställningsnyckel",
+"Repeat New Recovery key password" => "Upprepa lösenord för ny återställningsnyckel",
 "Change Password" => "Byt lösenord",
-"Your private key password no longer match your log-in password:" => "Din privata lösenordsnyckel stämmer inte längre överrens med ditt inloggningslösenord:",
-"Set your old private key password to your current log-in password." => "Ställ in din gamla privata lösenordsnyckel till ditt aktuella inloggningslösenord.",
+"Your private key password no longer match your log-in password:" => "Lösenordet till din privata nyckel stämmer inte längre överens med ditt inloggningslösenord:",
+"Set your old private key password to your current log-in password." => "Använd din gamla privata nyckels lösenord som ditt aktuella inloggningslösenord.",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
 "Old log-in password" => "Gammalt inloggningslösenord",
 "Current log-in password" => "Nuvarande inloggningslösenord",
-"Update Private Key Password" => "Uppdatera den privata lösenordsnyckeln",
+"Update Private Key Password" => "Uppdatera lösenordet för din privata nyckel",
 "Enable password recovery:" => "Aktivera lösenordsåterställning",
 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord",
 "File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",

apps/files_encryption/lib/crypt.php

@@ -33,6 +33,12 @@ require_once __DIR__ . '/../3rdparty/Crypt_Blowfish/Blowfish.php';
 
 class Crypt {
 
+	const ENCRYPTION_UNKNOWN_ERROR = -1;
+	const ENCRYPTION_NOT_INITIALIZED_ERROR = 1;
+	const ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR = 2;
+	const ENCRYPTION_NO_SHARE_KEY_FOUND = 3;
+
+
 	/**
 	 * @brief return encryption mode client or server side encryption
 	 * @param string $user name (use system wide setting if name=null)

apps/files_encryption/lib/helper.php

@@ -235,16 +235,28 @@ class Helper {
 	/**
 	 * @brief redirect to a error page
 	 */
-	public static function redirectToErrorPage($session) {
-
-		$init = $session->getInitialized();
+	public static function redirectToErrorPage($session, $errorCode = null) {
+
+		if ($errorCode === null) {
+			$init = $session->getInitialized();
+			switch ($init) {
+				case \OCA\Encryption\Session::INIT_EXECUTED:
+					$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR;
+					break;
+				case \OCA\Encryption\Session::NOT_INITIALIZED:
+					$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_NOT_INITIALIZED_ERROR;
+					break;
+				default:
+					$errorCode = \OCA\Encryption\Crypt::ENCRYPTION_UNKNOWN_ERROR;
+			}
+		}
 
 		$location = \OC_Helper::linkToAbsolute('apps/files_encryption/files', 'error.php');
 		$post = 0;
 		if(count($_POST) > 0) {
 			$post = 1;
 			}
-			header('Location: ' . $location . '?p=' . $post . '&i=' . $init);
+			header('Location: ' . $location . '?p=' . $post . '&errorCode=' . $errorCode);
 			exit();
 	}
 

apps/files_encryption/lib/proxy.php

@@ -38,8 +38,6 @@ class Proxy extends \OC_FileProxy {
 
 	private static $blackList = null; //mimetypes blacklisted from encryption
 
-	private static $enableEncryption = null;
-
 	/**
 	 * Check if a file requires encryption
 	 * @param string $path
@@ -49,46 +47,23 @@ class Proxy extends \OC_FileProxy {
 	 */
 	private static function shouldEncrypt($path) {
 
-		if (is_null(self::$enableEncryption)) {
-			if (
-				\OCP\App::isEnabled('files_encryption') === true
-				&& Crypt::mode() === 'server'
-			) {
-
-				self::$enableEncryption = true;
-
-			} else {
-
-				self::$enableEncryption = false;
-
-			}
-
-		}
-
-		if (!self::$enableEncryption) {
-
+		if (\OCP\App::isEnabled('files_encryption') === false || Crypt::mode() !== 'server' ||
+				strpos($path, '/' . \OCP\User::getUser() . '/files') !== 0) {
 			return false;
-
 		}
 
 		if (is_null(self::$blackList)) {
-
 			self::$blackList = explode(',', \OCP\Config::getAppValue('files_encryption', 'type_blacklist', ''));
-
 		}
 
 		if (Crypt::isCatfileContent($path)) {
-
 			return true;
-
 		}
 
 		$extension = substr($path, strrpos($path, '.') + 1);
 
 		if (array_search($extension, self::$blackList) === false) {
-
 			return true;
-
 		}
 
 		return false;
@@ -342,6 +317,16 @@ class Proxy extends \OC_FileProxy {
 
 		$view = new \OC_FilesystemView('/');
 
+		$userId = \OCP\User::getUser();
+		$util = new Util($view, $userId);
+
+		// if encryption is no longer enabled or if the files aren't migrated yet
+		// we return the default file size
+		if(!\OCP\App::isEnabled('files_encryption') ||
+				$util->getMigrationStatus() !== Util::MIGRATION_COMPLETED) {
+			return $size;
+		}
+
 		// if path is a folder do nothing
 		if ($view->is_dir($path)) {
 			return $size;
@@ -363,6 +348,15 @@ class Proxy extends \OC_FileProxy {
 
 		// if file is encrypted return real file size
 		if (is_array($fileInfo) && $fileInfo['encrypted'] === true) {
+			// try to fix unencrypted file size if it doesn't look plausible
+			if ((int)$fileInfo['size'] > 0 && (int)$fileInfo['unencrypted_size'] === 0 ) {
+				$fixSize = $util->getFileSize($path);
+				$fileInfo['unencrypted_size'] = $fixSize;
+				// put file info if not .part file
+				if (!Keymanager::isPartialFilePath($relativePath)) {
+					$view->putFileInfo($path, $fileInfo);
+				}
+			}
 			$size = $fileInfo['unencrypted_size'];
 		} else {
 			// self healing if file was removed from file cache
@@ -370,8 +364,6 @@ class Proxy extends \OC_FileProxy {
 				$fileInfo = array();
 			}
 
-			$userId = \OCP\User::getUser();
-			$util = new Util($view, $userId);
 			$fixSize = $util->getFileSize($path);
 			if ($fixSize > 0) {
 				$size = $fixSize;

apps/files_encryption/lib/stream.php

@@ -254,16 +254,20 @@ class Stream {
 		// If a keyfile already exists
 		if ($this->encKeyfile) {
 
+			$shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
+
 			// if there is no valid private key return false
 			if ($this->privateKey === false) {
-
 				// if private key is not valid redirect user to a error page
-				\OCA\Encryption\Helper::redirectToErrorPage();
-
+				\OCA\Encryption\Helper::redirectToErrorPage($this->session);
 				return false;
 			}
 
-			$shareKey = Keymanager::getShareKey($this->rootView, $this->userId, $this->relPath);
+			if ($shareKey === false) {
+				// if no share key is available redirect user to a error page
+				\OCA\Encryption\Helper::redirectToErrorPage($this->session, \OCA\Encryption\Crypt::ENCRYPTION_NO_SHARE_KEY_FOUND);
+				return false;
+			}
 
 			$this->plainKey = Crypt::multiKeyDecrypt($this->encKeyfile, $shareKey, $this->privateKey);
 
@@ -506,9 +510,10 @@ class Stream {
 
 				// Get all users sharing the file includes current user
 				$uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $this->relPath, $this->userId);
+				$checkedUserIds = $util->filterShareReadyUsers($uniqueUserIds);
 
 				// Fetch public keys for all sharing users
-				$publicKeys = Keymanager::getPublicKeys($this->rootView, $uniqueUserIds);
+				$publicKeys = Keymanager::getPublicKeys($this->rootView, $checkedUserIds['ready']);
 
 				// Encrypt enc key for all sharing users
 				$this->encKeyfiles = Crypt::multiKeyEncrypt($this->plainKey, $publicKeys);

apps/files_encryption/templates/invalid_private_key.php

@@ -4,7 +4,7 @@
 
 		<?php p($_['message']); ?>
 		<br/>
-		<?php if($_['init']): ?>
+		<?php if($_['errorCode'] === \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR): ?>
 			<?php>p($l->t('Go directly to your ')); ?> <a href="<?php echo $location?>"><?php p($l->t('personal settings')); ?>.</a>
 		<?php endif; ?>
 		<br/>

apps/files_encryption/templates/settings-admin.php

@@ -1,10 +1,7 @@
 <form id="encryption">
 	<fieldset class="personalblock">
 
-		<p>
-			<strong><?php p($l->t('Encryption')); ?></strong>
-			<br/>
-		</p>
+		<h2><?php p($l->t('Encryption')); ?></h2>
 
 		<p>
 			<?php p($l->t("Enable recovery key (allow to recover users files in case of password loss):")); ?>

apps/files_encryption/templates/settings-personal.php

@@ -1,8 +1,6 @@
 <form id="encryption">
 	<fieldset class="personalblock">
-		<legend>
-			<?php p( $l->t( 'Encryption' ) ); ?>
-		</legend>
+		<h2><?php p( $l->t( 'Encryption' ) ); ?></h2>
 
 		<?php if ( ! $_["privateKeySet"] && $_["initialized"] ): ?>
 			<p>
@@ -38,9 +36,8 @@
 			</p>
 		<?php endif; ?>
 
-		<br />
-
 		<?php if ( $_["recoveryEnabled"] && $_["privateKeySet"] ): ?>
+			<br />
 			<p>
 				<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
 				<br />
@@ -65,6 +62,5 @@
 			</p>
 		<?php endif; ?>
 
-		<br />
 	</fieldset>
 </form>

apps/files_encryption/tests/proxy.php

@@ -1,220 +1,110 @@
 <?php
 /**
- * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, 
- * and Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2013 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
  */
 
-// require_once "PHPUnit/Framework/TestCase.php";
-// require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Generator.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/MockInterface.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Mock.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Container.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Configuration.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CompositeExpectation.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/ExpectationDirector.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Expectation.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Exception.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CountValidator/CountValidatorAbstract.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CountValidator/Exception.php' );
-// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CountValidator/Exact.php' );
-// 
-// use \Mockery as m;
-// use OCA\Encryption;
-
-// class Test_Util extends \PHPUnit_Framework_TestCase {
-// 
-// 	public function setUp() {
-// 	
-// 		$this->proxy = new Encryption\Proxy();
-// 		
-// 		$this->tmpFileName = "tmpFile-".time();
-// 		
-// 		$this->privateKey = file_get_contents( realpath( dirname(__FILE__).'/data/admin.public.key' ) );
-// 		$this->publicKey = file_get_contents( realpath( dirname(__FILE__).'/data/admin.private.key' ) );
-// 		$this->encDataShort = file_get_contents( realpath( dirname(__FILE__).'/data/yoga-manchester-enc' ) );
-// 		$this->encDataShortKey = file_get_contents( realpath( dirname(__FILE__).'/data/yoga-manchester.key' ) );
-// 		
-// 		$this->dataShort = file_get_contents( realpath( dirname(__FILE__).'/data/yoga-manchester' ) );
-// 		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
-// 		$this->longDataPath = realpath( dirname(__FILE__).'/../lib/crypt.php' );
-// 		
-// 		$this->data1 = file_get_contents( realpath( dirname(__FILE__).'/../../../data/admin/files/enc-test.txt' ) );
-// 		
-// 		\OC_FileProxy::$enabled = false;
-// 		$this->Encdata1 = file_get_contents( realpath( dirname(__FILE__).'/../../../data/admin/files/enc-test.txt' ) );
-// 		\OC_FileProxy::$enabled = true;
-// 		
-// 		$this->userId = 'admin';
-// 		$this->pass = 'admin';
-// 		
-// 		$this->session = new Encryption\Session( $view ); // FIXME: Provide a $view object for use here
-// 		
-// $this->session->setPrivateKey( 
-// '-----BEGIN PRIVATE KEY-----
-// MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDiH3EA4EpFA7Fx
-// s2dyyfL5jwXeYXrTqQJ6DqKgGn8VsbT3eu8R9KzM2XitVwZe8c8L52DvJ06o5vg0
-// GqPYxilFdOFJe/ggac5Tq8UmJiZS4EqYEMwxBIfIyWTxeGV06/0HOwnVAkqHMcBz
-// 64qldtgi5O8kZMEM2/gKBgU0kMLJzM+8oEWhL1+gsUWQhxd8cKLXypS6iWgqFJrz
-// f/X0hJsJR+gyYxNpahtnjzd/LxLAETrOMsl2tue+BAxmjbAM0aG0NEM0div+b59s
-// 2uz/iWbxImp5pOdYVKcVW89D4XBMyGegR40trV2VwiuX1blKCfdjMsJhiaL9pymp
-// ug1wzyQFAgMBAAECggEAK6c+PZkPPXuVCgpEcliiW6NM0r2m5K3AGKgypQ34csu3
-// z/8foCvIIFPrhCtEw5eTDQ1CHWlNOjY8vHJYJ0U6Onpx86nHIRrMBkMm8FJ1G5LJ
-// U8oKYXwqaozWu/cuPwA//OFc6I5krOzh5n8WaRMkbrgbor8AtebRX74By0AXGrXe
-// cswJI7zR96oFn4Dm7Pgvpg5Zhk1vFJ+w6QtH+4DDJ6PBvlZsRkGxYBLGVd/3qhAI
-// sBAyjFlSzuP4eCRhHOhHC/e4gmAH9evFVXB88jFyRZm3K+jQ5W5CwrVRBCV2lph6
-// 2B6P7CBJN+IjGKMhy+75y13UvvKPv9IwH8Fzl2x1gQKBgQD8qQOr7a6KhSj16wQE
-// jim2xqt9gQ2jH5No405NrKs/PFQQZnzD4YseQsiK//NUjOJiUhaT+L5jhIpzINHt
-// RJpt3bGkEZmLyjdjgTpB3GwZdXa28DNK9VdXZ19qIl/ZH0qAjKmJCRahUDASMnVi
-// M4Pkk9yx9ZIKkri4TcuMWqc0DQKBgQDlHKBTITZq/arYPD6Nl3NsoOdqVRqJrGay
-// 0TjXAVbBXe46+z5lnMsqwXb79nx14hdmSEsZULrw/3f+MnQbdjMTYLFP24visZg9
-// MN8vAiALiiiR1a+Crz+DTA1Q8sGOMVCMqMDmD7QBys3ZuWxuapm0txAiIYUtsjJZ
-// XN76T4nZ2QKBgQCHaT3igzwsWTmesxowJtEMeGWomeXpKx8h89EfqA8PkRGsyIDN
-// qq+YxEoe1RZgljEuaLhZDdNcGsjo8woPk9kAUPTH7fbRCMuutK+4ZJ469s1tNkcH
-// QX5SBcEJbOrZvv967ehe3VQXmJZq6kgnHVzuwKBjcC2ZJRGDFY6l5l/+cQKBgCqh
-// +Adf/8NK7paMJ0urqfPFwSodKfICXZ3apswDWMRkmSbqh4La+Uc8dsqN5Dz/VEFZ
-// JHhSeGbN8uMfOlG93eU2MehdPxtw1pZUWMNjjtj23XO9ooob2CKzbSrp8TBnZsi1
-// widNNr66oTFpeo7VUUK6acsgF6sYJJxSVr+XO1yJAoGAEhvitq8shNKcEY0xCipS
-// k1kbgyS7KKB7opVxI5+ChEqyUDijS3Y9FZixrRIWE6i2uGu86UG+v2lbKvSbM4Qm
-// xvbOcX9OVMnlRb7n8woOP10UMY+ZE2x+YEUXQTLtPYq7F66e1OfxltstMxLQA+3d
-// Y1d5piFV8PXK3Fg2F+Cj5qg=
-// -----END PRIVATE KEY-----
-// '
-// , $this->userId 
-// );
-// 		
-// 		\OC_User::setUserId( $this->userId );
-// 		
-// 	}
-// 
-// 	public function testpreFile_get_contents() {
-// 	
-// 		// This won't work for now because mocking of the static keymanager class isn't working :(
-// 	
-// // 		$mock = m::mock( 'alias:OCA\Encryption\Keymanager' );
-// // 		
-// // 		$mock->shouldReceive( 'getFileKey' )->times(2)->andReturn( $this->encDataShort );
-// // 	
-// // 		$encrypted = $this->proxy->postFile_get_contents( 'data/'.$this->tmpFileName, $this->encDataShortKey );
-// // 		
-// // 		$this->assertNotEquals( $this->dataShort, $encrypted );
-// 
-// 		$decrypted = $this->proxy->postFile_get_contents( 'data/admin/files/enc-test.txt', $this->data1 );
-// 		
-// 	}
-// 
-// }
-
-// class Test_CryptProxy extends PHPUnit_Framework_TestCase {
-// 	private $oldConfig;
-// 	private $oldKey;
-// 	
-// 	public function setUp(){
-// 		$user=OC_User::getUser();
-// 
-// 		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
-// 		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
-// 		$this->oldKey=isset($_SESSION['privateKey'])?$_SESSION['privateKey']:null;
-// 	
-// 		
-// 		//set testing key
-// 		$_SESSION['privateKey']=md5(time());
-// 	
-// 		//clear all proxies and hooks so we can do clean testing
-// 		OC_FileProxy::clearProxies();
-// 		OC_Hook::clear('OC_Filesystem');
-// 
-// 		//enable only the encryption hook
-// 		OC_FileProxy::register(new OC_FileProxy_Encryption());
-// 
-// 		//set up temporary storage
-// 		OC_Filesystem::clearMounts();
-// 		OC_Filesystem::mount('OC_Filestorage_Temporary',array(),'/');
-// 
-// 		OC_Filesystem::init('/'.$user.'/files');
-// 
-// 		//set up the users home folder in the temp storage
-// 		$rootView=new OC_FilesystemView('');
-// 		$rootView->mkdir('/'.$user);
-// 		$rootView->mkdir('/'.$user.'/files');
-// 	}
-// 
-// 	public function tearDown(){
-// 		OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
-// 		if(!is_null($this->oldKey)){
-// 			$_SESSION['privateKey']=$this->oldKey;
-// 		}
-// 	}
-// 
-// 	public function testSimple(){
-// 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// 		$original=file_get_contents($file);
-// 
-// 		OC_Filesystem::file_put_contents('/file',$original);
-// 		
-// 		OC_FileProxy::$enabled=false;
-// 		$stored=OC_Filesystem::file_get_contents('/file');
-// 		OC_FileProxy::$enabled=true;
-// 		
-// 		$fromFile=OC_Filesystem::file_get_contents('/file');
-// 		$this->assertNotEquals($original,$stored);
-// 		$this->assertEquals(strlen($original),strlen($fromFile));
-// 		$this->assertEquals($original,$fromFile);
-// 
-// 	}
-// 
-// 	public function testView(){
-// 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-// 		$original=file_get_contents($file);
-// 
-// 		$rootView=new OC_FilesystemView('');
-// 		$view=new OC_FilesystemView('/'.OC_User::getUser());
-// 		$userDir='/'.OC_User::getUser().'/files';
-// 
-// 		$rootView->file_put_contents($userDir.'/file',$original);
-// 
-// 		OC_FileProxy::$enabled=false;
-// 		$stored=$rootView->file_get_contents($userDir.'/file');
-// 		OC_FileProxy::$enabled=true;
-// 
-// 		$this->assertNotEquals($original,$stored);
-// 		$fromFile=$rootView->file_get_contents($userDir.'/file');
-// 		$this->assertEquals($original,$fromFile);
-// 
-// 		$fromFile=$view->file_get_contents('files/file');
-// 		$this->assertEquals($original,$fromFile);
-// 	}
-// 
-// 	public function testBinary(){
-// 		$file=__DIR__.'/binary';
-// 		$original=file_get_contents($file);
-// 
-// 		OC_Filesystem::file_put_contents('/file',$original);
-// 
-// 		OC_FileProxy::$enabled=false;
-// 		$stored=OC_Filesystem::file_get_contents('/file');
-// 		OC_FileProxy::$enabled=true;
-// 
-// 		$fromFile=OC_Filesystem::file_get_contents('/file');
-// 		$this->assertNotEquals($original,$stored);
-// 		$this->assertEquals(strlen($original),strlen($fromFile));
-// 		$this->assertEquals($original,$fromFile);
-// 
-// 		$file=__DIR__.'/zeros';
-// 		$original=file_get_contents($file);
-// 
-// 		OC_Filesystem::file_put_contents('/file',$original);
-// 
-// 		OC_FileProxy::$enabled=false;
-// 		$stored=OC_Filesystem::file_get_contents('/file');
-// 		OC_FileProxy::$enabled=true;
-// 
-// 		$fromFile=OC_Filesystem::file_get_contents('/file');
-// 		$this->assertNotEquals($original,$stored);
-// 		$this->assertEquals(strlen($original),strlen($fromFile));
-// 	}
-// }
+require_once __DIR__ . '/../../../lib/base.php';
+require_once __DIR__ . '/../lib/crypt.php';
+require_once __DIR__ . '/../lib/keymanager.php';
+require_once __DIR__ . '/../lib/proxy.php';
+require_once __DIR__ . '/../lib/stream.php';
+require_once __DIR__ . '/../lib/util.php';
+require_once __DIR__ . '/../appinfo/app.php';
+require_once __DIR__ . '/util.php';
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_Proxy
+ * @brief this class provide basic proxy app tests
+ */
+class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
+
+	const TEST_ENCRYPTION_PROXY_USER1 = "test-proxy-user1";
+
+	public $userId;
+	public $pass;
+	/**
+	 * @var \OC_FilesystemView
+	 */
+	public $view;
+	public $data;
+
+	public static function setUpBeforeClass() {
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		\OC_Hook::clear('OC_Filesystem');
+		\OC_Hook::clear('OC_User');
+
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+
+		// create test user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1, true);
+	}
+
+	function setUp() {
+		// set user id
+		\OC_User::setUserId(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1);
+		$this->userId = \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1;
+		$this->pass = \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1;
+
+		// init filesystem view
+		$this->view = new \OC_FilesystemView('/'. \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1 . '/files');
+
+		// init short data
+		$this->data = 'hats';
+	}
+
+	public static function tearDownAfterClass() {
+		// cleanup test user
+		\OC_User::deleteUser(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1);
+	}
+
+	/**
+	 * @medium
+	 * @brief test if postFileSize returns the unencrypted file size
+	 */
+	function testPostFileSize() {
+
+		// generate filename
+		$filename = 'tmp-' . time() . '.txt';
+
+		$this->view->file_put_contents($filename, $this->data);
+
+		\OC_FileProxy::$enabled = false;
+
+		$unencryptedSize = $this->view->filesize($filename);
+
+		\OC_FileProxy::$enabled = true;
+
+		$encryptedSize = $this->view->filesize($filename);
+
+		$this->assertTrue($encryptedSize !== $unencryptedSize);
+
+	}
+
+}

apps/files_external/3rdparty/smb4php/smb.php

@@ -181,6 +181,8 @@ class smb {
 						return false;
 					}elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_PATH_NOT_FOUND'){
 						return false;
+					}elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_NAME_NOT_FOUND'){
+						return false;
 					}elseif(substr($regs[0],0,29)=='NT_STATUS_FILE_IS_A_DIRECTORY'){
 						return false;
 					}
@@ -305,7 +307,8 @@ class smb {
 			trigger_error('rename(): error in URL', E_USER_ERROR);
 		}
 		smb::clearstatcache ($url_from);
-		return smb::execute ('rename "'.$from['path'].'" "'.$to['path'].'"', $to);
+		$result = smb::execute ('rename "'.$from['path'].'" "'.$to['path'].'"', $to);
+		return $result !== false;
 	}
 
 	function mkdir ($url, $mode, $options) {
@@ -430,7 +433,10 @@ class smb_stream_wrapper extends smb {
 			case 'rb':
 			case 'a':
 			case 'a+':  $this->tmpfile = tempnam('/tmp', 'smb.down.');
-				smb::execute ('get "'.$pu['path'].'" "'.$this->tmpfile.'"', $pu);
+				$result = smb::execute ('get "'.$pu['path'].'" "'.$this->tmpfile.'"', $pu);
+				if($result === false){
+					return $result;
+				}
 				break;
 			case 'w':
 			case 'w+':

apps/files_external/css/settings.css

@@ -4,7 +4,6 @@ td.status > span {
 	width: 16px;
 	vertical-align: text-bottom;
 }
-
 span.success {
 	background: #37ce02;
 	border-radius: 8px;
@@ -12,9 +11,6 @@ span.success {
 span.error {
 	background: #ce3702;
 }
-span.waiting {
-	background: none;
-}
 
 td.mountPoint, td.backend { width:10em; }
 td.remove>img { visibility:hidden; padding-top:0.8em; }

apps/files_external/js/settings.js

@@ -1,10 +1,23 @@
+(function(){
+
+function updateStatus(statusEl, result){
+	statusEl.removeClass('success error loading-small');
+	if (result && result.status == 'success' && result.data.message) {
+		statusEl.addClass('success');
+		return true;
+	} else {
+		statusEl.addClass('error');
+		return false;
+	}
+}
+
 OC.MountConfig={
 	saveStorage:function(tr) {
 		var mountPoint = $(tr).find('.mountPoint input').val();
 		if (mountPoint == '') {
 			return false;
 		}
-		var statusSpan = $(tr).find('.status span');
+		var statusSpan = $(tr).closest('tr').find('.status span');
 		var backendClass = $(tr).find('.backend').data('class');
 		var configuration = $(tr).find('.configuration input');
 		var addMountPoint = true;
@@ -58,6 +71,7 @@ OC.MountConfig={
 						}
 						users.push(applicable);
 					}
+					statusSpan.addClass('loading-small').removeClass('error success');
 					$.ajax({type: 'POST',
 						url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
 						data: {
@@ -68,15 +82,11 @@ OC.MountConfig={
 							applicable: applicable,
 							isPersonal: isPersonal
 						},
-						async: false,
 						success: function(result) {
-							statusSpan.removeClass();
-							if (result && result.status == 'success' && result.data.message) {
-								status = true;
-								statusSpan.addClass('success');
-							} else {
-								statusSpan.addClass('error');
-							}
+							status = updateStatus(statusSpan, result);
+						},
+						error: function(result){
+							status = updateStatus(statusSpan, result);
 						}
 					});
 				});
@@ -93,8 +103,7 @@ OC.MountConfig={
 							mountType: mountType,
 							applicable: applicable,
 							isPersonal: isPersonal
-						},
-						async: false
+						}
 					});
 				});
 				var mountType = 'user';
@@ -108,14 +117,14 @@ OC.MountConfig={
 							mountType: mountType,
 							applicable: applicable,
 							isPersonal: isPersonal
-						},
-						async: false
+						}
 					});
 				});
 			} else {
 				var isPersonal = true;
 				var mountType = 'user';
 				var applicable = OC.currentUser;
+				statusSpan.addClass('loading-small').removeClass('error success');
 				$.ajax({type: 'POST',
 					url: OC.filePath('files_external', 'ajax', 'addMountPoint.php'),
 					data: {
@@ -126,15 +135,11 @@ OC.MountConfig={
 						applicable: applicable,
 						isPersonal: isPersonal
 					},
-					async: false,
 					success: function(result) {
-						statusSpan.removeClass();
-						if (result && result.status == 'success' && result.data.message) {
-							status = true;
-							statusSpan.addClass('success');
-						} else {
-							statusSpan.addClass('error');
-						}
+						status = updateStatus(statusSpan, result);
+					},
+					error: function(result){
+						status = updateStatus(statusSpan, result);
 					}
 				});
 			}
@@ -157,7 +162,7 @@ $(document).ready(function() {
 			$(tr).find('.mountPoint input').val(suggestMountPoint(selected));
 		}
 		$(tr).addClass(backendClass);
-		$(tr).find('.status').append('<span class="waiting"></span>');
+		$(tr).find('.status').append('<span></span>');
 		$(tr).find('.backend').data('class', backendClass);
 		var configurations = $(this).data('configurations');
 		var td = $(tr).find('td.configuration');
@@ -293,3 +298,5 @@ $(document).ready(function() {
 	});
 
 });
+
+})();

apps/files_external/l10n/ar.php

@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Folder name" => "اسم المجلد",
+"All Users" => "كل المستخدمين",
 "Groups" => "مجموعات",
 "Users" => "المستخدمين",
 "Delete" => "إلغاء"

apps/files_external/lib/streamwrapper.php

@@ -8,7 +8,7 @@
 
 namespace OC\Files\Storage;
 
-abstract class StreamWrapper extends Common{
+abstract class StreamWrapper extends Common {
 	abstract public function constructUrl($path);
 
 	public function mkdir($path) {
@@ -16,7 +16,15 @@ abstract class StreamWrapper extends Common{
 	}
 
 	public function rmdir($path) {
-		if($this->file_exists($path)) {
+		if ($this->file_exists($path)) {
+			$dh = $this->opendir($path);
+			while (($file = readdir($dh)) !== false) {
+				if ($this->is_dir($path . '/' . $file)) {
+					$this->rmdir($path . '/' . $file);
+				} else {
+					$this->unlink($path . '/' . $file);
+				}
+			}
 			$success = rmdir($this->constructUrl($path));
 			clearstatcache();
 			return $success;
@@ -34,11 +42,11 @@ abstract class StreamWrapper extends Common{
 	}
 
 	public function isReadable($path) {
-		return true;//not properly supported
+		return true; //not properly supported
 	}
 
 	public function isUpdatable($path) {
-		return true;//not properly supported
+		return true; //not properly supported
 	}
 
 	public function file_exists($path) {
@@ -55,15 +63,19 @@ abstract class StreamWrapper extends Common{
 		return fopen($this->constructUrl($path), $mode);
 	}
 
-	public function touch($path, $mtime=null) {
-		if(is_null($mtime)) {
-			$fh = $this->fopen($path, 'a');
-			fwrite($fh, '');
-			fclose($fh);
-
-			return true;
+	public function touch($path, $mtime = null) {
+		if ($this->file_exists($path)) {
+			if (is_null($mtime)) {
+				$fh = $this->fopen($path, 'a');
+				fwrite($fh, '');
+				fclose($fh);
+
+				return true;
+			} else {
+				return false; //not supported
+			}
 		} else {
-			return false;//not supported
+			$this->file_put_contents($path, '');
 		}
 	}
 

apps/files_external/templates/settings.php

@@ -2,7 +2,7 @@
 	<fieldset class="personalblock">
 	<h2><?php p($l->t('External Storage')); ?></h2>
 		<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) print_unescaped(''.$_['dependencies'].''); ?>
-		<table id="externalStorage" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'>
+		<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['isAdminPage'])); ?>'>
 			<thead>
 				<tr>
 					<th></th>

apps/files_external/tests/smb.php

@@ -15,7 +15,7 @@ class SMB extends Storage {
 	public function setUp() {
 		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if ( ! is_array($this->config) or ! isset($this->config['smb']) or ! $this->config['smb']['run']) {
+		if (!is_array($this->config) or !isset($this->config['smb']) or !$this->config['smb']['run']) {
 			$this->markTestSkipped('Samba backend not configured');
 		}
 		$this->config['smb']['root'] .= $id; //make sure we have an new empty folder to work in
@@ -28,4 +28,11 @@ class SMB extends Storage {
 			\OCP\Files::rmdirr($this->instance->constructUrl(''));
 		}
 	}
+
+	public function testRenameWithSpaces() {
+		$this->instance->mkdir('with spaces');
+		$result = $this->instance->rename('with spaces', 'foo bar');
+		$this->assertTrue($result);
+		$this->assertTrue($this->instance->is_dir('foo bar'));
+	}
 }

apps/files_sharing/appinfo/update.php

@@ -70,10 +70,10 @@ if (version_compare($installedVersion, '0.3', '<')) {
 }
 
 // clean up oc_share table from files which are no longer exists
-if (version_compare($installedVersion, '0.3.4', '<')) {
+if (version_compare($installedVersion, '0.3.5', '<')) {
 
 	// get all shares where the original file no longer exists
-	$findShares = \OC_DB::prepare('SELECT `file_source` FROM `*PREFIX*share` LEFT JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*filecache`.`fileid` IS NULL');
+	$findShares = \OC_DB::prepare('SELECT `file_source` FROM `*PREFIX*share` LEFT JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE `*PREFIX*filecache`.`fileid` IS NULL AND `*PREFIX*share`.`item_type` IN (\'file\', \'folder\')');
 	$sharesFound = $findShares->execute(array())->fetchAll();
 
 	// delete those shares from the oc_share table

apps/files_sharing/appinfo/version

@@ -1 +1 @@
-0.3.4
+0.3.5

apps/files_sharing/css/authenticate.css

@@ -0,0 +1,26 @@
+#body-login form label.infield {
+	width: 190px;
+	padding: 10px;
+	left: 8px;
+	top: 8px;
+}
+
+#password {
+	width: 190px !important;
+	padding: 10px;
+	margin:	6px;
+}
+
+input[type="submit"]{
+	width: 45px;
+	height: 45px;
+	margin:	6px;
+	background-image: url('%webroot%/core/img/actions/confirm.svg');
+	background-repeat: no-repeat;
+	background-position: center;
+}
+
+#body-login input[type="submit"] {
+	position: absolute;
+	top: 0px;
+}

apps/files_sharing/l10n/ar.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "كلمة المرور",
-"Submit" => "تطبيق",
 "%s shared the folder %s with you" => "%s شارك المجلد %s معك",
 "%s shared the file %s with you" => "%s شارك الملف %s معك",
 "Download" => "تحميل",

apps/files_sharing/l10n/bg_BG.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Парола",
-"Submit" => "Потвърждение",
 "%s shared the folder %s with you" => "%s сподели папката %s с Вас",
 "%s shared the file %s with you" => "%s сподели файла %s с Вас",
 "Download" => "Изтегляне",

apps/files_sharing/l10n/bn_BD.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "কূটশব্দ",
-"Submit" => "জমা দিন",
 "%s shared the folder %s with you" => "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন",
 "%s shared the file %s with you" => "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন",
 "Download" => "ডাউনলোড",

apps/files_sharing/l10n/ca.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "la contrasenya és incorrecta. Intenteu-ho de nou.",
 "Password" => "Contrasenya",
-"Submit" => "Envia",
 "Sorry, this link doesn’t seem to work anymore." => "Aquest enllaç sembla que no funciona.",
 "Reasons might be:" => "Les raons podrien ser:",
 "the item was removed" => "l'element ha estat eliminat",

apps/files_sharing/l10n/cs_CZ.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Toto sdílení je chráněno heslem",
 "The password is wrong. Try again." => "Heslo není správné. Zkuste to znovu.",
 "Password" => "Heslo",
-"Submit" => "Odeslat",
 "Sorry, this link doesn’t seem to work anymore." => "Je nám líto, ale tento odkaz již není funkční.",
 "Reasons might be:" => "Možné důvody:",
 "the item was removed" => "položka byla odebrána",

apps/files_sharing/l10n/cy_GB.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Cyfrinair",
-"Submit" => "Cyflwyno",
 "%s shared the folder %s with you" => "Rhannodd %s blygell %s â chi",
 "%s shared the file %s with you" => "Rhannodd %s ffeil %s â chi",
 "Download" => "Llwytho i lawr",

apps/files_sharing/l10n/da.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Kodeordet er forkert. Prøv igen.",
 "Password" => "Kodeord",
-"Submit" => "Send",
 "Sorry, this link doesn’t seem to work anymore." => "Desværre, dette link ser ikke ud til at fungerer længere.",
 "Reasons might be:" => "Årsagen kan være:",
 "the item was removed" => "Filen blev fjernet",

apps/files_sharing/l10n/de.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
 "The password is wrong. Try again." => "Bitte überprüfen sie Ihr Passwort und versuchen Sie es erneut.",
 "Password" => "Passwort",
-"Submit" => "Absenden",
 "Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
 "Reasons might be:" => "Gründe könnten sein:",
 "the item was removed" => "Die Elemente wurden entfernt",

apps/files_sharing/l10n/de_CH.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
 "Password" => "Passwort",
-"Submit" => "Bestätigen",
 "Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
 "Reasons might be:" => "Gründe könnten sein:",
 "the item was removed" => "Das Element wurde entfernt",

apps/files_sharing/l10n/de_DE.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
 "The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
 "Password" => "Passwort",
-"Submit" => "Bestätigen",
 "Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
 "Reasons might be:" => "Gründe könnten sein:",
 "the item was removed" => "Das Element wurde entfernt",

apps/files_sharing/l10n/el.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Εσφαλμένο συνθηματικό. Προσπαθήστε ξανά.",
 "Password" => "Συνθηματικό",
-"Submit" => "Καταχώρηση",
 "Sorry, this link doesn’t seem to work anymore." => "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.",
 "Reasons might be:" => "Οι λόγοι μπορεί να είναι:",
 "the item was removed" => "το αντικείμενο απομακρύνθηκε",

apps/files_sharing/l10n/en@pirate.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Secret Code",
-"Submit" => "Submit",
 "%s shared the folder %s with you" => "%s shared the folder %s with you",
 "%s shared the file %s with you" => "%s shared the file %s with you",
 "Download" => "Download",

apps/files_sharing/l10n/en_GB.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "This share is password-protected",
 "The password is wrong. Try again." => "The password is wrong. Try again.",
 "Password" => "Password",
-"Submit" => "Submit",
 "Sorry, this link doesn’t seem to work anymore." => "Sorry, this link doesn’t seem to work anymore.",
 "Reasons might be:" => "Reasons might be:",
 "the item was removed" => "the item was removed",

apps/files_sharing/l10n/eo.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Pasvorto",
-"Submit" => "Sendi",
 "%s shared the folder %s with you" => "%s kunhavigis la dosierujon %s kun vi",
 "%s shared the file %s with you" => "%s kunhavigis la dosieron %s kun vi",
 "Download" => "Elŝuti",

apps/files_sharing/l10n/es.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Este elemento compartido esta protegido por contraseña",
 "The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
 "Password" => "Contraseña",
-"Submit" => "Enviar",
 "Sorry, this link doesn’t seem to work anymore." => "Vaya, este enlace parece que no volverá a funcionar.",
 "Reasons might be:" => "Las causas podrían ser:",
 "the item was removed" => "el elemento fue eliminado",

apps/files_sharing/l10n/es_AR.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "La contraseña no es correcta. Probá de nuevo.",
 "Password" => "Contraseña",
-"Submit" => "Enviar",
 "Sorry, this link doesn’t seem to work anymore." => "Perdón, este enlace parece no funcionar más.",
 "Reasons might be:" => "Las causas podrían ser:",
 "the item was removed" => "el elemento fue borrado",

apps/files_sharing/l10n/et_EE.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "See jagamine on parooliga kaitstud",
 "The password is wrong. Try again." => "Parool on vale. Proovi uuesti.",
 "Password" => "Parool",
-"Submit" => "Saada",
 "Sorry, this link doesn’t seem to work anymore." => "Vabandust, see link ei tundu enam toimivat.",
 "Reasons might be:" => "Põhjused võivad olla:",
 "the item was removed" => "üksus on eemaldatud",

apps/files_sharing/l10n/eu.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Pasahitza ez da egokia. Saiatu berriro.",
 "Password" => "Pasahitza",
-"Submit" => "Bidali",
 "Sorry, this link doesn’t seem to work anymore." => "Barkatu, lotura ez dirudi eskuragarria dagoenik.",
 "Reasons might be:" => "Arrazoiak hurrengoak litezke:",
 "the item was removed" => "fitxategia ezbatua izan da",

apps/files_sharing/l10n/fa.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
 "Password" => "گذرواژه",
-"Submit" => "ثبت",
 "%s shared the folder %s with you" => "%sپوشه %s را با شما به اشتراک گذاشت",
 "%s shared the file %s with you" => "%sفایل %s را با شما به اشتراک گذاشت",
 "Download" => "دانلود",

apps/files_sharing/l10n/fi_FI.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Tämä jako on suojattu salasanalla",
 "The password is wrong. Try again." => "Väärä salasana. Yritä uudelleen.",
 "Password" => "Salasana",
-"Submit" => "Lähetä",
 "Sorry, this link doesn’t seem to work anymore." => "Valitettavasti linkki ei vaikuta enää toimivan.",
 "Reasons might be:" => "Mahdollisia syitä:",
 "the item was removed" => "kohde poistettiin",

apps/files_sharing/l10n/fr.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Ce partage est protégé par un mot de passe",
 "The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.",
 "Password" => "Mot de passe",
-"Submit" => "Envoyer",
 "Sorry, this link doesn’t seem to work anymore." => "Désolé, mais le lien semble ne plus fonctionner.",
 "Reasons might be:" => "Les raisons peuvent être :",
 "the item was removed" => "l'item a été supprimé",

apps/files_sharing/l10n/gl.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Esta compartición está protexida con contrasinal",
 "The password is wrong. Try again." => "O contrasinal é incorrecto. Ténteo de novo.",
 "Password" => "Contrasinal",
-"Submit" => "Enviar",
 "Sorry, this link doesn’t seem to work anymore." => "Semella que esta ligazón non funciona.",
 "Reasons might be:" => "As razóns poderían ser:",
 "the item was removed" => "o elemento foi retirado",

apps/files_sharing/l10n/he.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "סיסמא",
-"Submit" => "שליחה",
 "%s shared the folder %s with you" => "%s שיתף עמך את התיקייה %s",
 "%s shared the file %s with you" => "%s שיתף עמך את הקובץ %s",
 "Download" => "הורדה",

apps/files_sharing/l10n/hr.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Lozinka",
-"Submit" => "Pošalji",
 "Download" => "Preuzimanje",
 "Upload" => "Učitaj",
 "Cancel upload" => "Prekini upload"

apps/files_sharing/l10n/hu_HU.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "A megadott jelszó nem megfelelő. Próbálja újra!",
 "Password" => "Jelszó",
-"Submit" => "Elküld",
 "Sorry, this link doesn’t seem to work anymore." => "Sajnos úgy tűnik, ez a link már nem működik.",
 "Reasons might be:" => "Ennek az oka a következő lehet:",
 "the item was removed" => "az állományt időközben eltávolították",

apps/files_sharing/l10n/hy.php

@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Submit" => "Հաստատել",
 "Download" => "Բեռնել"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";

apps/files_sharing/l10n/ia.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Contrasigno",
-"Submit" => "Submitter",
 "Download" => "Discargar",
 "Upload" => "Incargar"
 );

apps/files_sharing/l10n/id.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Sandi",
-"Submit" => "Kirim",
 "%s shared the folder %s with you" => "%s membagikan folder %s dengan Anda",
 "%s shared the file %s with you" => "%s membagikan file %s dengan Anda",
 "Download" => "Unduh",

apps/files_sharing/l10n/is.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Lykilorð",
-"Submit" => "Senda",
 "%s shared the folder %s with you" => "%s deildi möppunni %s með þér",
 "%s shared the file %s with you" => "%s deildi skránni %s með þér",
 "Download" => "Niðurhal",

apps/files_sharing/l10n/it.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Questa condivione è protetta da password",
 "The password is wrong. Try again." => "La password è errata. Prova ancora.",
 "Password" => "Password",
-"Submit" => "Invia",
 "Sorry, this link doesn’t seem to work anymore." => "Spiacenti, questo collegamento sembra non essere più attivo.",
 "Reasons might be:" => "I motivi potrebbero essere:",
 "the item was removed" => "l'elemento è stato rimosso",

apps/files_sharing/l10n/ja_JP.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "この共有はパスワードで保護されています",
 "The password is wrong. Try again." => "パスワードが間違っています。再試行してください。",
 "Password" => "パスワード",
-"Submit" => "送信",
 "Sorry, this link doesn’t seem to work anymore." => "申し訳ございません。このリンクはもう利用できません。",
 "Reasons might be:" => "理由は以下の通りと考えられます：",
 "the item was removed" => "アイテムが削除されました",

apps/files_sharing/l10n/ka_GE.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "პაროლი",
-"Submit" => "გაგზავნა",
 "%s shared the folder %s with you" => "%s–მა გაგიზიარათ ფოლდერი %s",
 "%s shared the file %s with you" => "%s–მა გაგიზიარათ ფაილი %s",
 "Download" => "ჩამოტვირთვა",

apps/files_sharing/l10n/ko.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "비밀번호가 틀립니다. 다시 입력해주세요.",
 "Password" => "암호",
-"Submit" => "제출",
 "Sorry, this link doesn’t seem to work anymore." => "죄송합니다만 이 링크는 더이상 작동되지 않습니다.",
 "Reasons might be:" => "이유는 다음과 같을 수 있습니다:",
 "the item was removed" => "이 항목은 삭제되었습니다",

apps/files_sharing/l10n/ku_IQ.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "وشەی تێپەربو",
-"Submit" => "ناردن",
 "%s shared the folder %s with you" => "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ",
 "%s shared the file %s with you" => "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ",
 "Download" => "داگرتن",

apps/files_sharing/l10n/lb.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
 "Password" => "Passwuert",
-"Submit" => "Fortschécken",
 "%s shared the folder %s with you" => "%s huet den Dossier %s mad der gedeelt",
 "%s shared the file %s with you" => "%s deelt den Fichier %s mad dir",
 "Download" => "Download",

apps/files_sharing/l10n/lt_LT.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Netinka slaptažodis: Bandykite dar kartą.",
 "Password" => "Slaptažodis",
-"Submit" => "Išsaugoti",
 "Sorry, this link doesn’t seem to work anymore." => "Atleiskite, panašu, kad nuoroda yra neveiksni.",
 "Reasons might be:" => "Galimos priežastys:",
 "the item was removed" => "elementas buvo pašalintas",

apps/files_sharing/l10n/lv.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Parole",
-"Submit" => "Iesniegt",
 "%s shared the folder %s with you" => "%s ar jums dalījās ar mapi %s",
 "%s shared the file %s with you" => "%s ar jums dalījās ar datni %s",
 "Download" => "Lejupielādēt",

apps/files_sharing/l10n/mk.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Лозинка",
-"Submit" => "Прати",
 "%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
 "%s shared the file %s with you" => "%s ја сподели датотеката %s со Вас",
 "Download" => "Преземи",

apps/files_sharing/l10n/ms_MY.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Kata laluan",
-"Submit" => "Hantar",
 "Download" => "Muat turun",
 "Upload" => "Muat naik",
 "Cancel upload" => "Batal muat naik"

apps/files_sharing/l10n/my_MM.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "စကားဝှက်",
-"Submit" => "ထည့်သွင်းမည်",
 "Download" => "ဒေါင်းလုတ်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";

apps/files_sharing/l10n/nb_NO.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Passordet er feil. Prøv på nytt.",
 "Password" => "Passord",
-"Submit" => "Send inn",
 "%s shared the folder %s with you" => "%s delte mappen %s med deg",
 "%s shared the file %s with you" => "%s delte filen %s med deg",
 "Download" => "Last ned",

apps/files_sharing/l10n/nl.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Deze share is met een wachtwoord beveiligd",
 "The password is wrong. Try again." => "Wachtwoord ongeldig. Probeer het nogmaals.",
 "Password" => "Wachtwoord",
-"Submit" => "Verzenden",
 "Sorry, this link doesn’t seem to work anymore." => "Sorry, deze link lijkt niet meer in gebruik te zijn.",
 "Reasons might be:" => "Redenen kunnen zijn:",
 "the item was removed" => "bestand was verwijderd",

apps/files_sharing/l10n/nn_NO.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Passordet er gale. Prøv igjen.",
 "Password" => "Passord",
-"Submit" => "Send",
 "Sorry, this link doesn’t seem to work anymore." => "Orsak, denne lenkja fungerer visst ikkje lenger.",
 "Reasons might be:" => "Moglege grunnar:",
 "the item was removed" => "fila/mappa er fjerna",

apps/files_sharing/l10n/oc.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "Senhal",
-"Submit" => "Sosmetre",
 "Download" => "Avalcarga",
 "Upload" => "Amontcarga",
 "Cancel upload" => " Anulla l'amontcargar"

apps/files_sharing/l10n/pl.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "To hasło jest niewłaściwe. Spróbuj ponownie.",
 "Password" => "Hasło",
-"Submit" => "Wyślij",
 "Sorry, this link doesn’t seem to work anymore." => "Przepraszamy ale wygląda na to, że ten link już nie działa.",
 "Reasons might be:" => "Możliwe powody:",
 "the item was removed" => "element został usunięty",

apps/files_sharing/l10n/pt_BR.php

@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Este compartilhamento esta protegido por senha",
 "The password is wrong. Try again." => "Senha incorreta. Tente novamente.",
 "Password" => "Senha",
-"Submit" => "Submeter",
 "Sorry, this link doesn’t seem to work anymore." => "Desculpe, este link parece não mais  funcionar.",
 "Reasons might be:" => "As razões podem ser:",
 "the item was removed" => "o item foi removido",

apps/files_sharing/l10n/pt_PT.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Password errada, por favor tente de novo",
 "Password" => "Password",
-"Submit" => "Submeter",
 "Sorry, this link doesn’t seem to work anymore." => "Desculpe, mas este link parece não estar a funcionar.",
 "Reasons might be:" => "As razões poderão ser:",
 "the item was removed" => "O item foi removido",

apps/files_sharing/l10n/ro.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Parola este incorectă. Încercaţi din nou.",
 "Password" => "Parolă",
-"Submit" => "Trimite",
 "%s shared the folder %s with you" => "%s a partajat directorul %s cu tine",
 "%s shared the file %s with you" => "%s a partajat fișierul %s cu tine",
 "Download" => "Descarcă",

apps/files_sharing/l10n/ru.php

@@ -2,7 +2,6 @@
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.",
 "Password" => "Пароль",
-"Submit" => "Отправить",
 "Sorry, this link doesn’t seem to work anymore." => "К сожалению, эта ссылка, похоже не будет работать больше.",
 "Reasons might be:" => "Причиной может быть:",
 "the item was removed" => "объект был удалён",

apps/files_sharing/l10n/si_LK.php

@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Password" => "මුර පදය",
-"Submit" => "යොමු කරන්න",
 "%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
 "%s shared the file %s with you" => "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය",
 "Download" => "බාන්න",